From 3b2ae5c4a978ef2e6e104f6827c12c8d1481dd02 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 1 May 2020 06:01:22 +0000
Subject: [PATCH] function names changed

---
 include/conversation.php                 | 2 +-
 src/Model/Item.php                       | 2 +-
 src/Model/Tag.php                        | 6 +++---
 src/Object/Post.php                      | 4 ++--
 src/Protocol/ActivityPub/Processor.php   | 2 +-
 src/Protocol/ActivityPub/Transmitter.php | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 5d08fd6928..a4fe9c00e3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -526,7 +526,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 					$profile_name = $item['author-link'];
 				}
 
-				$tags = Tag::populateTagsFromItem($item);
+				$tags = Tag::populateFromItem($item);
 
 				$author = ['uid' => 0, 'id' => $item['author-id'],
 					'network' => $item['author-network'], 'url' => $item['author-link']];
diff --git a/src/Model/Item.php b/src/Model/Item.php
index b75abc6ca8..1096c22131 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3563,7 +3563,7 @@ class Item
 			return $ev;
 		}
 
-		$tags = Tag::populateTagsFromItem($item);
+		$tags = Tag::populateFromItem($item);
 
 		$item['tags'] = $tags['tags'];
 		$item['hashtags'] = $tags['hashtags'];
diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index 7e894aca9b..ef962b582c 100644
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -316,7 +316,7 @@ class Tag
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function ArrayFromURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION, self::EXCLUSIVE_MENTION])
+	public static function getByURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION, self::EXCLUSIVE_MENTION])
 	{
 		$condition = ['uri-id' => $uri_id, 'type' => $type];
 		$tags = DBA::select('tag-view', ['type', 'name', 'url'], $condition);
@@ -333,7 +333,7 @@ class Tag
 		return $tag_list;
 	}
 
-		/**
+	/**
 	 * Sorts an item's tags into mentions, hashtags and other tags. Generate personalized URLs by user and modify the
 	 * provided item's body with them.
 	 *
@@ -342,7 +342,7 @@ class Tag
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function populateTagsFromItem(&$item)
+	public static function populateFromItem(&$item)
 	{
 		$return = [
 			'tags' => [],
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 99ab357bc0..8488df000f 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -390,7 +390,7 @@ class Post
 			$buttons["like"] = false;
 		}
 
-		$tags = Tag::populateTagsFromItem($item);
+		$tags = Tag::populateFromItem($item);
 
 		$ago = Temporal::getRelativeDate($item['created']);
 		$ago_received = Temporal::getRelativeDate($item['received']);
@@ -872,7 +872,7 @@ class Post
 			$text = '';
 		}
 
-		$terms = Tag::ArrayFromURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
+		$terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 		foreach ($terms as $term) {
 			$profile = Contact::getDetailsByURL($term['url']);
 			if (!empty($profile['addr']) && ((($profile['contact-type'] ?? '') ?: Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 80b2b0dbab..43343f1e6b 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1015,7 +1015,7 @@ class Processor
 			return [];
 		}
 
-		$parent_terms = Tag::ArrayFromURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
+		$parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 
 		$parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
 
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index fd91dca16a..82bda11698 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -407,7 +407,7 @@ class Transmitter
 			$actor_profile = APContact::getByURL($item['author-link']);
 		}
 
-		$terms = Tag::ArrayFromURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
+		$terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 
 		if ($item['private'] != Item::PRIVATE) {
 			// Directly mention the original author upon a quoted reshare.
@@ -1009,7 +1009,7 @@ class Transmitter
 	{
 		$tags = [];
 
-		$terms = Tag::ArrayFromURIId($item['uri-id'], [Tag::HASHTAG, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
+		$terms = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 		foreach ($terms as $term) {
 			if ($term['type'] == Tag::HASHTAG) {
 				$url = DI::baseUrl() . '/search?tag=' . urlencode($term['term']);