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

Merge pull request #7390 from annando/issue-7315

Browse source 
Issue 7315: Set the forum's contact id for forum posts
This commit is contained in:
Philipp 2019-07-16 10:01:17 +02:00 committed by GitHub
commit 1298258f6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Protocol/ActivityPub/Processor.php
View file

@ -373,6 +373,8 @@ class Processor
$item['owner-link'] = $activity['actor']; $item['owner-link'] = $activity['actor'];
$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
$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 // 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-link'] = $item['owner-link'];
@ -381,6 +383,9 @@ class Processor
Logger::info('Ignoring actor because of thread completion.', ['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 {
$actor = APContact::getByURL($item['owner-link'], false);
$isForum = ($actor['type'] == 'Group');
} }
$item['uri'] = $activity['id']; $item['uri'] = $activity['id'];
@ -402,7 +407,14 @@ class Processor
foreach ($activity['receiver'] as $receiver) { foreach ($activity['receiver'] as $receiver) {
$item['uid'] = $receiver; $item['uid'] = $receiver;
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
if ($isForum) {
$item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver, true);
}
if (empty($item['contact-id'])) {
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
}
if (($receiver != 0) && empty($item['contact-id'])) { if (($receiver != 0) && empty($item['contact-id'])) {
$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true); $item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);