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

Merge pull request #2300 from annando/1601-gcontact-guessing 

gcontact-id now depends on the owner, not the author of a post
This commit is contained in:
fabrixxm 2016-01-29 05:27:58 +01:00
parent fdb864157d a93d35bfda
commit 863d49ccd0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/items.php
View File

@ -972,7 +972,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// The contact-id should be set before "item_store" was called - but there seems to be some issues // The contact-id should be set before "item_store" was called - but there seems to be some issues
if ($arr["contact-id"] == 0) { if ($arr["contact-id"] == 0) {
// First we are looking for a suitable contact that matches with the author of the post // First we are looking for a suitable contact that matches with the author of the post
$arr["contact-id"] = get_contact($arr['author-link'], $uid); // This is done only for comments (See below explanation at "gcontact-id")
if($arr['parent-uri'] != $arr['uri'])
$arr["contact-id"] = get_contact($arr['author-link'], $uid);
// If not present then maybe the owner was found // If not present then maybe the owner was found
if ($arr["contact-id"] == 0) if ($arr["contact-id"] == 0)
@ -984,12 +986,20 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
if ($r) if ($r)
$arr["contact-id"] = $r[0]["id"]; $arr["contact-id"] = $r[0]["id"];
} }
logger("Contact-id was missing for post ".$arr["guid"]." - now set to ".$arr["contact-id"], LOGGER_DEBUG); logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
} }
if ($arr["gcontact-id"] == 0) if ($arr["gcontact-id"] == 0) {
$arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], // The gcontact should mostly behave like the contact. But is is supposed to be global for the system.
"photo" => $arr['author-avatar'], "name" => $arr['author-name'])); // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner.
// On comments the author is the better choice.
if($arr['parent-uri'] === $arr['uri'])
$arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'],
"photo" => $arr['owner-avatar'], "name" => $arr['owner-name']));
else
$arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'],
"photo" => $arr['author-avatar'], "name" => $arr['author-name']));
}
if ($arr['guid'] != "") { if ($arr['guid'] != "") {
// Checking if there is already an item with the same guid // Checking if there is already an item with the same guid