mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5866 from annando/ap-cleanup

Browse source 
AP: Avoid a misleading log entry / unneeded field removed
This commit is contained in:
Hypolite Petovan 2018-10-09 16:06:58 -04:00 committed by GitHub
parent 83dca0018d 0994aaf875
commit c9f1857c4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,12 +196,15 @@ class Processor
$item['network'] = Protocol::ACTIVITYPUB; $item['network'] = Protocol::ACTIVITYPUB;
$item['private'] = !in_array(0, $activity['receiver']); $item['private'] = !in_array(0, $activity['receiver']);
$item['author-link'] = $activity['author'];
$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true); $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
if (empty($activity['thread-completion'])) { if (empty($activity['thread-completion'])) {
$item['owner-link'] = $activity['actor'];
$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
} else { } else {
logger('Ignoring actor because of thread completion.', LOGGER_DEBUG); logger('Ignoring actor because of thread completion.', LOGGER_DEBUG);
$item['owner-link'] = $item['author-link'];
$item['owner-id'] = $item['author-id']; $item['owner-id'] = $item['author-id'];
} }

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

@ -778,7 +778,6 @@ class Transmitter
$data['url'] = $item['plink']; $data['url'] = $item['plink'];
$data['attributedTo'] = $item['author-link']; $data['attributedTo'] = $item['author-link'];
$data['actor'] = $item['author-link'];
$data['sensitive'] = self::isSensitive($item['id']); $data['sensitive'] = self::isSensitive($item['id']);
$data['context'] = self::fetchContextURLForItem($item); $data['context'] = self::fetchContextURLForItem($item);