nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into show-reshared

Browse source
This commit is contained in:
Michael 2020-08-23 13:33:50 +00:00
parent 0e4d3fe9e5 1e7cc06f51
commit 129b690b9a
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Item.php
View file

@ -2716,9 +2716,7 @@ class Item
Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id); 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 Item::performActivity($item_id, 'announce', $uid);
// See also "createActivityFromItem"
//Item::performActivity($item_id, 'announce', $uid);
return false; return false;
} }

16
src/Protocol/ActivityPub/Transmitter.php
View file

@ -914,21 +914,6 @@ class Transmitter
return false; 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 // 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'])) { if (!empty($item['forum_mode'])) {
$author = Contact::getById($item['author-id'], ['nurl']); $author = Contact::getById($item['author-id'], ['nurl']);
@ -939,7 +924,6 @@ class Transmitter
} }
} }
} }
*/
if (empty($type)) { if (empty($type)) {
$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB]; $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];