Merge pull request #7200 from annando/tag-process

Process incoming tag add requests

diff --combined src/Protocol/ActivityPub/Processor.php
index fd84f494e2d597f172269b64e5790d1a5e4c420a,a5f6607edcadda62f1d77fd5c7fb797e8955839e..9eb1506a2878deba0a71064205f189732960087d
--- 1/src/Protocol/ActivityPub/Processor.php
--- 2/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@@ -198,6 -198,43 +198,43 @@@ class Processo
                Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
        }
  
+       /**
+        * Prepare the item array for an activity
+        *
+        * @param array $activity Activity array
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function addTag($activity)
+       {
+               if (empty($activity['object_content']) || empty($activity['object_id'])) {
+                       return;
+               }
+ 
+               foreach ($activity['receiver'] as $receiver) {
+                       $item = Item::selectFirst(['id', 'tag', 'origin', 'author-link'], ['uri' => $activity['target_id'], 'uid' => $receiver]);
+                       if (!DBA::isResult($item)) {
+                               // We don't fetch missing content for this purpose
+                               continue;
+                       }
+ 
+                       if (($item['author-link'] != $activity['actor']) && !$item['origin']) {
+                               Logger::info('Not origin, not from the author, skipping update', ['id' => $item['id'], 'author' => $item['author-link'], 'actor' => $activity['actor']]);
+                               continue;
+                       }
+ 
+                       // To-Do:
+                       // - Check if "blocktag" is set
+                       // - Check if actor is a contact
+ 
+                       if (!stristr($item['tag'], trim($activity['object_content']))) {
+                               $tag = $item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $activity['object_id'] . ']'. $activity['object_content'] . '[/url]';
+                               Item::update(['tag' => $tag], ['id' => $item['id']]);
+                               Logger::info('Tagged item', ['id' => $item['id'], 'tag' => $activity['object_content'], 'uri' => $activity['target_id'], 'actor' => $activity['actor']]);
+                       }
+               }
+       }
+ 
        /**
         * Prepare the item array for an activity
         *
@@@ -530,7 -567,7 +567,7 @@@
                        DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
                        $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
                } else {
 -                      $contact = false;
 +                      $contact = [];
                }
  
                $item = ['author-id' => Contact::getIdForURL($activity['actor']),
@@@ -541,11 -578,7 +578,11 @@@
                // Ensure that the contact has got the right network type
                self::switchContact($item['author-id']);
  
 -              Contact::addRelationship($owner, $contact, $item, '', false, $note);
 +              $result = Contact::addRelationship($owner, $contact, $item, false, $note);
 +              if ($result === true) {
 +                      ActivityPub\Transmitter::sendContactAccept($item['author-link'], $item['author-id'], $owner['uid']);
 +              }
 +
                $cid = Contact::getIdForURL($activity['actor'], $uid);
                if (empty($cid)) {
                        return;