sforkowany z mirror/friendica
Partly revert coding for compatibility issues
rodzic
1934c149a3
commit
ef7aed5d1f
|
@ -2701,7 +2701,9 @@ class Item
|
|||
|
||||
Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id);
|
||||
|
||||
Item::performActivity($item_id, 'announce', $uid);
|
||||
/// @todo This code should be activated by the end of the year 2020
|
||||
// See also "createActivityFromItem"
|
||||
//Item::performActivity($item_id, 'announce', $uid);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -863,6 +863,21 @@ 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']);
|
||||
|
@ -873,6 +888,7 @@ class Transmitter
|
|||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (empty($type)) {
|
||||
$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
|
||||
|
|
Ładowanie…
Reference in New Issue