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

Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete

Browse source
This commit is contained in:
Michael 2019-07-31 14:11:06 +00:00
parent 0696026380 b8a336cc0d
commit b377906b77
2 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Model/Item.php
View file

@ -1234,35 +1234,18 @@ class Item extends BaseObject
private static function contactId($item) private static function contactId($item)
{ {
$contact_id = (int)$item["contact-id"]; if (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
return $item['author-id'];
if (!empty($contact_id)) { } elseif (!empty($item['contact-id'])) {
return $contact_id; return $item['contact-id'];
} } else {
Logger::log('Missing contact-id. Called by: '.System::callstack(), Logger::DEBUG);
/*
* First we are looking for a suitable contact that matches with the author of the post
* This is done only for comments
*/
if ($item['parent-uri'] != $item['uri']) {
$contact_id = Contact::getIdForURL($item['author-link'], $item['uid']); $contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
} if (!empty($contact_id)) {
return $contact_id;
// If not present then maybe the owner was found
if ($contact_id == 0) {
$contact_id = Contact::getIdForURL($item['owner-link'], $item['uid']);
}
// Still missing? Then use the "self" contact of the current user
if ($contact_id == 0) {
$self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
if (DBA::isResult($self)) {
$contact_id = $self["id"];
} }
} }
Logger::log("Contact-id was missing for post ".$item['guid']." from user id ".$item['uid']." - now set to ".$contact_id, Logger::DEBUG);
return $contact_id; return $item['author-id'];
} }
// This function will finally cover most of the preparation functionality in mod/item.php // This function will finally cover most of the preparation functionality in mod/item.php
@ -1480,9 +1463,6 @@ class Item extends BaseObject
$item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid'])); $item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
$item["contact-id"] = self::contactId($item);
$default = ['url' => $item['author-link'], 'name' => $item['author-name'], $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
'photo' => $item['author-avatar'], 'network' => $item['network']]; 'photo' => $item['author-avatar'], 'network' => $item['network']];
@ -1538,6 +1518,9 @@ class Item extends BaseObject
unset($item['causer-id']); unset($item['causer-id']);
unset($item['causer-link']); unset($item['causer-link']);
// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
$item['contact-id'] = self::contactId($item);
if ($item['network'] == Protocol::PHANTOM) { if ($item['network'] == Protocol::PHANTOM) {
$item['network'] = Protocol::DFRN; $item['network'] = Protocol::DFRN;
Logger::notice('Missing network, setting to {network}.', [ Logger::notice('Missing network, setting to {network}.', [

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

@ -419,8 +419,8 @@ class Processor
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true); $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
} }
if (($receiver != 0) && empty($item['contact-id'])) { if (empty($item['contact-id'])) {
$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true); $item['contact-id'] = $item['author-id'];
} }
if (!empty($activity['directmessage'])) { if (!empty($activity['directmessage'])) {