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

Merge pull request #2297 from annando/1601-ostatus 

OStatus: Do not notify on "likes" - update only OStatus contacts
This commit is contained in:
fabrixxm 2016-01-27 11:06:51 +01:00
parent f18679053b 828cec27dd
commit bcc9588732
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/ostatus.php
View File

@ -176,10 +176,13 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS)); dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
} }
/// @todo Add the "addr" field // Only update the global contact if it is an OStatus contact
$contact["generation"] = 2; if ($contact["network"] == NETWORK_OSTATUS) {
$contact["photo"] = $author["author-avatar"]; /// @todo Add the "addr" field
update_gcontact($contact); $contact["generation"] = 2;
$contact["photo"] = $author["author-avatar"];
update_gcontact($contact);
}
} }
return($author); return($author);
@ -560,7 +563,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
logger("Item was stored with id ".$item_id, LOGGER_DEBUG); logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
$item["id"] = $item_id; $item["id"] = $item_id;
if ($mention) { if ($mention AND in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE))) {
$u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($item['uid'])); $u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($item['uid']));
$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id)); $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id));