From 08fb662b4a7b9c94a5882b0c6f47ed463dfb0ba2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 2 Apr 2016 00:24:56 +0200 Subject: [PATCH 1/4] OStatus: Salmon now works with "likes"/The alias is stored now as well --- include/notifier.php | 16 +++++++++++++++- include/ostatus.php | 13 +++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 18a617ac2..ffbb22e7b 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -229,7 +229,7 @@ function notifier_run(&$argv, &$argc){ $parent = $items[0]; - $thr_parent = q("SELECT `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", + $thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", dbesc($target_item["thr-parent"]), intval($target_item["uid"])); logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG); @@ -390,6 +390,20 @@ function notifier_run(&$argv, &$argc){ logger('Some parent is OStatus for '.$target_item["guid"], LOGGER_DEBUG); + // Send a salmon to the parent author + $probed_contact = probe_url($thr_parent[0]['author-link']); + if ($probed_contact["notify"] != "") { + logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + + // Send a salmon to the parent owner + $probed_contact = probe_url($thr_parent[0]['owner-link']); + if ($probed_contact["notify"] != "") { + logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]); + $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; + } + // Send a salmon notification to every person we mentioned in the post $arr = explode(',',$target_item['tag']); foreach($arr as $x) { diff --git a/include/ostatus.php b/include/ostatus.php index e31b4474d..4775e2ccb 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -44,8 +44,7 @@ class ostatus { $author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue; $author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue; - // Preserve the value - $authorlink = $author["author-link"]; + $aliaslink = $author["author-link"]; $alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes; if (is_object($alternate)) @@ -55,7 +54,7 @@ class ostatus { $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'", intval($importer["uid"]), dbesc(normalise_link($author["author-link"])), - dbesc(normalise_link($authorlink)), dbesc(NETWORK_STATUSNET)); + dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET)); if ($r) { $contact = $r[0]; $author["contact-id"] = $r[0]["id"]; @@ -117,12 +116,14 @@ class ostatus { if ($value != "") $contact["location"] = $value; - if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR ($contact["location"] != $r[0]["location"])) { + if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR + ($contact["alias"] != $r[0]["alias"]) OR ($contact["location"] != $r[0]["location"])) { logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG); - q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d", - dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]), + q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `alias` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d", + dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["alias"]), + dbesc($contact["about"]), dbesc($contact["location"]), dbesc(datetime_convert()), intval($contact["id"])); poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"], From fd965b046aa12bad60330c4c5655dd21a325f998 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 2 Apr 2016 14:10:40 +0200 Subject: [PATCH 2/4] Update contact data for uid=0 at feed import --- include/ostatus.php | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 4775e2ccb..d6e2e1773 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -90,13 +90,20 @@ class ostatus { // Only update the contacts if it is an OStatus contact if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) { + // Update contact data - $value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue; - if ($value != "") - $contact["notify"] = $value; + // This query doesn't seem to work + // $value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue; + // if ($value != "") + // $contact["notify"] = $value; - $value = $xpath->evaluate('atom:author/uri/text()', $context)->item(0)->nodeValue; + // This query doesn't seem to work as well - I hate these queries + // $value = $xpath->query("atom:link[@rel='self' and @type='application/atom+xml']", $context)->item(0)->nodeValue; + // if ($value != "") + // $contact["poll"] = $value; + + $value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue; if ($value != "") $contact["alias"] = $value; @@ -136,6 +143,24 @@ class ostatus { update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]); } + // Ensure that we are having this contact (with uid=0) + $cid = get_contact($author["author-link"], 0); + + if ($cid) { + // Update it with the current values + q("UPDATE `contact` SET `url` = '%s', `name` = '%s', `nick` = '%s', `alias` = '%s', + `about` = '%s', `location` = '%s', `notify` = '%s', `poll` = '%s', + `success_update` = '%s', `last-update` = '%s' + WHERE `id` = %d", + dbesc($author["author-link"]), dbesc($contact["name"]), dbesc($contact["nick"]), + dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]), + dbesc($contact["notify"]), dbesc($contact["poll"]), + dbesc(datetime_convert()), dbesc(datetime_convert()), intval($cid)); + + // Update the avatar + update_contact_avatar($author["author-avatar"], 0, $cid); + } + $contact["generation"] = 2; $contact["photo"] = $author["author-avatar"]; update_gcontact($contact); @@ -1586,8 +1611,10 @@ class ostatus { if (!isset($contact["poll"])) { $data = probe_url($url); - $contact["alias"] = $data["alias"]; $contact["poll"] = $data["poll"]; + + if (!$contact["alias"]) + $contact["alias"] = $data["alias"]; } if (!isset($contact["alias"])) From b4b62493e6f43ed85d9c9cecabf118814db8d454 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 2 Apr 2016 15:41:55 +0200 Subject: [PATCH 3/4] Bugfix: The nickname vanished/better way to fetch the alias --- include/Scrape.php | 21 +++++++++++++++------ include/cron.php | 3 +++ include/feed.php | 5 ++++- mod/noscrape.php | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index 9913f360d..ac95c0d5d 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -23,13 +23,15 @@ function scrape_dfrn($url, $dont_probe = false) { if (is_array($noscrapedata)) { if ($noscrapedata["nick"] != "") return($noscrapedata); + else + unset($noscrapedata["nick"]); } else $noscrapedata = array(); } $s = fetch_url($url); - if(! $s) + if (!$s) return $ret; if (!$dont_probe) { @@ -703,6 +705,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { if (($vcard["nick"] == "") AND ($data["header"]["author-nick"] != "")) $vcard["nick"] = $data["header"]["author-nick"]; + if (($network == NETWORK_OSTATUS) AND ($data["header"]["author-id"] != "")) + $alias = $data["header"]["author-id"]; + if(!$profile AND ($data["header"]["author-link"] != "") AND !in_array($network, array("", NETWORK_FEED))) $profile = $data["header"]["author-link"]; } @@ -844,13 +849,17 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { /// The biggest problem is the avatar picture that could have a reduced image size. /// It should only be updated if the existing picture isn't existing anymore. if (($result['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND - $result["addr"] AND $result["name"] AND $result["nick"]) - q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s', - `success_update` = '%s' WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0", - dbesc($result["addr"]), - dbesc($result["alias"]), + $result["name"] AND $result["nick"] AND $result["url"] AND $result["addr"] AND $result["poll"]) + q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s', + `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s' + WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0", dbesc($result["name"]), dbesc($result["nick"]), + dbesc($result["url"]), + dbesc($result["addr"]), + dbesc($result["notify"]), + dbesc($result["poll"]), + dbesc($result["alias"]), dbesc(datetime_convert()), dbesc(normalise_link($result['url'])) ); diff --git a/include/cron.php b/include/cron.php index a2482ff30..e2f410280 100644 --- a/include/cron.php +++ b/include/cron.php @@ -405,6 +405,9 @@ function cron_repair_database() { // This call is very "cheap" so we can do it at any time without a problem q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0"); + // There was an issue where the nick vanishes from the contact table + q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''"); + /// @todo /// - remove thread entries without item /// - remove sign entries without item diff --git a/include/feed.php b/include/feed.php index 04cfba75a..293de3cc9 100644 --- a/include/feed.php +++ b/include/feed.php @@ -54,8 +54,10 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($attributes->name == "href") $author["author-link"] = $attributes->textContent; + $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue; + if ($author["author-link"] == "") - $author["author-link"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue; + $author["author-link"] = $author["author-id"]; if ($author["author-link"] == "") { $self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes; @@ -127,6 +129,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { // This is no field in the item table. So we have to unset it. unset($author["author-nick"]); + unset($author["author-id"]); } $header = array(); diff --git a/mod/noscrape.php b/mod/noscrape.php index 1f7105b76..4be1a740c 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -28,7 +28,7 @@ function noscrape_init(&$a) { $json_info = array( 'fn' => $a->profile['name'], 'addr' => $a->profile['addr'], - 'nick' => $a->user['nickname'], + 'nick' => $which, 'key' => $a->profile['pubkey'], 'homepage' => $a->get_baseurl()."/profile/{$which}", 'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY), From 68b88c038426bfbe97010f2b85a4675fd49d299f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 2 Apr 2016 15:49:57 +0200 Subject: [PATCH 4/4] Notify and poll aren't fetched at the moment --- include/ostatus.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index d6e2e1773..bf14536f9 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -149,12 +149,11 @@ class ostatus { if ($cid) { // Update it with the current values q("UPDATE `contact` SET `url` = '%s', `name` = '%s', `nick` = '%s', `alias` = '%s', - `about` = '%s', `location` = '%s', `notify` = '%s', `poll` = '%s', + `about` = '%s', `location` = '%s', `success_update` = '%s', `last-update` = '%s' WHERE `id` = %d", dbesc($author["author-link"]), dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]), - dbesc($contact["notify"]), dbesc($contact["poll"]), dbesc(datetime_convert()), dbesc(datetime_convert()), intval($cid)); // Update the avatar