Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 12:24:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9655 from MrPetovan/bug/fatal-errors

Browse source 
Fix several occasional fatal errors
This commit is contained in:
Michael Vogel 2020-12-14 22:11:45 +01:00 • committed by GitHub
commit e4228c6218
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,6 +327,10 @@ class Processor
$item['guid'] = $activity['diaspora:guid'] ?: $guid;
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
if (empty($item['uri-id'])) {
Logger::warning('Unable to get a uri-id for an item uri', ['uri' => $item['uri'], 'guid' => $item['guid']]);
return [];
}
$item = self::processContent($activity, $item);
if (empty($item)) {
@ -903,20 +907,15 @@ class Processor
if (!empty($cid)) {
self::switchContact($cid);
DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
} else {
$contact = [];
}
$item = ['author-id' => Contact::getIdForURL($activity['actor']),
'author-link' => $activity['actor']];
$note = Strings::escapeTags(trim($activity['content'] ?? ''));
// Ensure that the contact has got the right network type
self::switchContact($item['author-id']);
$result = Contact::addRelationship($owner, $contact, $item, false, $note);
$result = Contact::addRelationship($owner, [], $item, false, $activity['content'] ?? '');
if ($result === true) {
ActivityPub\Transmitter::sendContactAccept($item['author-link'], $activity['id'], $owner['uid']);
}