Merge pull request #2297 from annando/1601-ostatus
OStatus: Do not notify on "likes" - update only OStatus contacts
This commit is contained in:
commit
bcc9588732
|
@ -176,11 +176,14 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
|
|||
dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
|
||||
}
|
||||
|
||||
// Only update the global contact if it is an OStatus contact
|
||||
if ($contact["network"] == NETWORK_OSTATUS) {
|
||||
/// @todo Add the "addr" field
|
||||
$contact["generation"] = 2;
|
||||
$contact["photo"] = $author["author-avatar"];
|
||||
update_gcontact($contact);
|
||||
}
|
||||
}
|
||||
|
||||
return($author);
|
||||
}
|
||||
|
@ -560,7 +563,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
|
|||
logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
|
||||
$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']));
|
||||
$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id));
|
||||
|
||||
|
|
Loading…
Reference in a new issue