Concentrating functionality

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 92678e59c99d12973ef6fa963e6ad3a90dbec579..60f29f41515c5e0b91c218c55ef0215fa9a01398 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -359,7 +359,7 @@ class Processor
                                        return false;
                                }
 
-                               $content = self::removeImplicitMentionsFromBody($content, self::getImplicitMentionList($parent));
+                               $content = self::removeImplicitMentionsFromBody($content, $parent);
                        }
                        $item['content-warning'] = HTML::toBBCode($activity['summary']);
                        $item['body'] = $content;
@@ -969,10 +969,6 @@ class Processor
         */
        private static function getImplicitMentionList(array $parent)
        {
-               if (DI::config()->get('system', 'disable_implicit_mentions')) {
-                       return [];
-               }
-
                $parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 
                $parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
@@ -1006,15 +1002,17 @@ class Processor
         * Strips from the body prepended implicit mentions
         *
         * @param string $body
-        * @param array $potential_mentions
+        * @param array $parent
         * @return string
         */
-       private static function removeImplicitMentionsFromBody($body, array $potential_mentions)
+       private static function removeImplicitMentionsFromBody(string $body, array $parent)
        {
                if (DI::config()->get('system', 'disable_implicit_mentions')) {
                        return $body;
                }
 
+               $potential_mentions = self::getImplicitMentionList($parent);
+
                $kept_mentions = [];
 
                // Extract one prepended mention at a time from the body