clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9273 from annando/inherit-causer 

We now inherit the causer for completing a thread
This commit is contained in:
Hypolite Petovan 2020-09-25 10:46:28 -04:00 committed by GitHub
parent 60d1630d3a 9ea34370a6
commit 04f993b611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Protocol/ActivityPub/Processor.php
View File

@ -251,11 +251,18 @@ class Processor
$item['isForum'] = false; $item['isForum'] = false;
if (!empty($activity['thread-completion'])) { if (!empty($activity['thread-completion'])) {
// Store the original actor in the "causer" fields to enable the check for ignored or blocked contacts if ($activity['thread-completion'] != $item['owner-id']) {
$item['causer-link'] = $item['owner-link']; $actor = Contact::getById($activity['thread-completion'], ['url']);
$item['causer-id'] = $item['owner-id']; $item['causer-link'] = $actor['url'];
$item['causer-id'] = $activity['thread-completion'];
Logger::info('Use inherited actor as causer.', ['id' => $item['owner-id'], 'activity' => $activity['thread-completion'], 'owner' => $item['owner-link'], 'actor' => $actor['url']]);
} else {
// Store the original actor in the "causer" fields to enable the check for ignored or blocked contacts
$item['causer-link'] = $item['owner-link'];
$item['causer-id'] = $item['owner-id'];
Logger::info('Use actor as causer.', ['id' => $item['owner-id'], 'actor' => $item['owner-link']]);
}
Logger::info('Ignoring actor because of thread completion.', ['actor' => $item['owner-link']]);
$item['owner-link'] = $item['author-link']; $item['owner-link'] = $item['author-link'];
$item['owner-id'] = $item['author-id']; $item['owner-id'] = $item['author-id'];
} else { } else {
@ -530,10 +537,6 @@ class Processor
$item['post-type'] = Item::PT_FETCHED; $item['post-type'] = Item::PT_FETCHED;
} }
if (!empty($activity['from-relay'])) {
$item['causer-id'] = $activity['from-relay'];
}
if ($item['isForum'] ?? false) { if ($item['isForum'] ?? false) {
$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver); $item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver);
} else { } else {
@ -765,8 +768,13 @@ class Processor
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);
$ldactivity['thread-completion'] = true; if (!empty($relay_actor)) {
$ldactivity['from-relay'] = Contact::getIdForURL($relay_actor); $ldactivity['thread-completion'] = $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
} elseif (!empty($child['thread-completion'])) {
$ldactivity['thread-completion'] = $child['thread-completion'];
} else {
$ldactivity['thread-completion'] = Contact::getIdForURL($actor);
}
if (!empty($relay_actor) && !self::acceptIncomingMessage($ldactivity, $object['id'])) { if (!empty($relay_actor) && !self::acceptIncomingMessage($ldactivity, $object['id'])) {
return ''; return '';

2
src/Protocol/ActivityPub/Receiver.php
View File

@ -494,7 +494,7 @@ class Receiver
case 'as:Announce': case 'as:Announce':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
$object_data['thread-completion'] = true; $object_data['thread-completion'] = Contact::getIdForURL($actor);
$item = ActivityPub\Processor::createItem($object_data); $item = ActivityPub\Processor::createItem($object_data);
if (empty($item)) { if (empty($item)) {