function names changed

diff --git a/include/conversation.php b/include/conversation.php
index 5d08fd6928d00d534d9696be1a92af44a079b33f..a4fe9c00e397a7f6053990ed2997a589b5248330 100644 (file)
--- 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 b75abc6ca88c9f75d3d136de1257755cc230ec22..1096c221316bf84fb4283a0d1058056af3707d98 100644 (file)
--- 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 7e894aca9b9a19fcfdddc632ca617432bf703d9a..ef962b582cc8be70e6d0396e3387d22bffe6a525 100644 (file)
--- 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 99ab357bc0085e9cfe2ebb9c0b5a0fd48500a916..8488df000f5aa3d65d6ed72a498417c934f1e7c6 100644 (file)
--- 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 80b2b0dbab74207925dbc9b014933655dc890443..43343f1e6bb0f0ed66acedaa4646bdf1e5de36d4 100644 (file)
--- 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 fd91dca16a6376c608d878246d332ba5ec0c7ea0..82bda11698e56901beb953fb3d527455975f5c1d 100644 (file)
--- 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']);