Improve AP support for forums

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 4a73a87a207c39dde1856ad338882d466ef8fadd..28ea01b85bf26f914184ed945c99a710d1ad3910 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2716,9 +2716,7 @@ class Item
 
                Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id);
 
-               /// @todo This code should be activated by the end of the year 2020
-               // See also "createActivityFromItem"
-               //Item::performActivity($item_id, 'announce', $uid);
+               Item::performActivity($item_id, 'announce', $uid);
 
                return false;
        }

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 259c8c225181a5f29cc67ee18f4c09747557bad9..2abc883078097147619676359c7b2063e4290078 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -914,21 +914,6 @@ class Transmitter
                        return false;
                }
 
-               /// @todo This code should be removed by the end of the year 2020
-               if ($item['wall'] && ($item['uri'] == $item['parent-uri'])) {
-                       $owner = User::getOwnerDataById($item['uid']);
-                       if (($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) && ($item['author-link'] != $owner['url'])) {
-                               $type = 'Announce';
-
-                               // Disguise forum posts as reshares. Will later be converted to a real announce
-                               $item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
-                                       $item['plink'], $item['created'], $item['guid']) . $item['body'] . '[/share]';
-                       }
-               }
-
-               /*
-               /// @todo This code should be activated by the end of the year 2020             
-               // See also "tagDeliver";
                // In case of a forum post ensure to return the original post if author and forum are on the same machine
                if (!empty($item['forum_mode'])) {
                        $author = Contact::getById($item['author-id'], ['nurl']);
@@ -939,7 +924,6 @@ class Transmitter
                                }
                        }
                }
-               */
 
                if (empty($type)) {
                        $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];