From bfc0857953d10eec15df807704c3948da962d8ac Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 7 Dec 2015 21:52:42 +0100 Subject: [PATCH 01/15] OStatus: Send even Friendica comments to OStatus --- include/notifier.php | 4 +- include/ostatus.php | 92 +++++++++++++++++++++++++++++++++++++------- include/session.php | 77 +++++++++++++++++++----------------- 3 files changed, 124 insertions(+), 49 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index ec2b666bed..553f2918db 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -303,7 +303,8 @@ function notifier_run(&$argv, &$argc){ $conversant_str = dbesc($parent['contact-id']); $recipients = array($parent['contact-id']); - if (!$target_item['private'] AND $target_item['wall'] AND + //if (!$target_item['private'] AND $target_item['wall'] AND + if (!$target_item['private'] AND (strlen($target_item['allow_cid'].$target_item['allow_gid']. $target_item['deny_cid'].$target_item['deny_gid']) == 0)) $push_notify = true; @@ -329,6 +330,7 @@ function notifier_run(&$argv, &$argc){ if (count($url_recipients)) logger("url_recipients ".print_r($url_recipients,true)); } + logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG); } else { $followup = false; diff --git a/include/ostatus.php b/include/ostatus.php index 932fc1fa9a..34f8eccc51 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -9,6 +9,7 @@ require_once("include/socgraph.php"); require_once("include/Photo.php"); require_once("include/Scrape.php"); require_once("include/follow.php"); +require_once("include/api.php"); require_once("mod/proxy.php"); define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes @@ -1318,10 +1319,13 @@ class="attachment thumbnail" id="attachment-572819" rel="nofollow external">http */ -function ostatus_entry($doc, $item, $owner, $toplevel = false) { +function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) { $a = get_app(); - if (!$toplevel) { + if (!$toplevel AND $repeat) { + $entry = $doc->createElement("activity:object"); + $title = sprintf("New note by %s", $owner["nick"]); + } elseif (!$toplevel) { $entry = $doc->createElement("entry"); $title = sprintf("New note by %s", $owner["nick"]); } else { @@ -1359,7 +1363,11 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { // But: it seems as if it doesn't federate well between the GS servers // So we just set it to "note" to be sure that it reaches their target systems - xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); + if (!$repeat) + xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); + else + xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); + xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "title", $title); @@ -1382,12 +1390,54 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { "href" => $a->get_baseurl()."/display/".$item["guid"])); xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); - xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); + + $repeated_item = $item; + $is_repeat = false; + + if (!$repeat) + $is_repeat = api_share_as_retweet($repeated_item); + + if (!$is_repeat) + xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); + else + xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); + xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); + if ($is_repeat) { + $repeated_owner = array(); + $repeated_owner["name"] = $repeated_item["author-name"]; + $repeated_owner["url"] = $repeated_item["author-link"]; + $repeated_owner["photo"] = normalise_link($repeated_item["author-avatar"]); + $repeated_owner["nick"] = ""; + $repeated_owner["location"] = ""; + $repeated_owner["about"] = ""; + $repeated_owner["uid"] = 0; + + $r =q("SELECT * FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($repeated_item["author-link"])); + if ($r) { + $repeated_owner["nick"] = $r[0]["nick"]; + $repeated_owner["location"] = $r[0]["location"]; + $repeated_owner["about"] = $r[0]["about"]; + } + + $entry_repeat = ostatus_entry($doc, $repeated_item, $repeated_owner, false, true); + $entry->appendChild($entry_repeat); + } elseif ($repeat) { + $profile = array(); + $profile["name"] = $owner["name"]; + $profile["photo"] = $owner["photo"]; + $profile["thumb"] = $owner["photo"]; + $profile["about"] = $owner["about"]; + $author = ostatus_add_author($doc, $owner, $profile); + $entry->appendChild($author); + } + + $mentioned = array(); + if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { - $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"])); + $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $attributes = array( @@ -1400,6 +1450,9 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { "rel" => "related", "href" => $a->get_baseurl()."/display/".$parent[0]["guid"]); xml_add_element($doc, $entry, "link", "", $attributes); + + $mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"]; + $mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"]; } xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", @@ -1411,9 +1464,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { if(count($tags)) foreach($tags as $t) if ($t[0] == "@") - xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_PERSON, - "href" => $t[1])); + $mentioned[$t[1]] = $t[1]; + + foreach ($mentioned AS $mention) + xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", + "ostatus:object-type" => ACTIVITY_OBJ_PERSON, + "href" => $mention)); if (!$item["private"]) xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", @@ -1441,7 +1497,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { if ($app == "") $app = "web"; - xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app)); + + $attributes = array("local_id" => $item["id"], "source" => $app); + if ($is_repeat) + $attributes["repeat_of"] = $item["id"]; + + xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes); return $entry; } @@ -1468,12 +1529,17 @@ function ostatus_feed(&$a, $owner_nick, $last_update) { WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`)) - OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`) - AND (`item`.`owner-link` IN ('%s', '%s')) + OR (`item`.`network` = '%s' AND ((`thread`.`network` IN ('%s', '%s')) OR (`thritem`.`network` IN ('%s', '%s')))) AND `thread`.`mention`) + AND ((`item`.`owner-link` IN ('%s', '%s') AND (`item`.`parent` = `item`.`id`)) + OR (`item`.`author-link` IN ('%s', '%s'))) ORDER BY `item`.`received` DESC LIMIT 0, 300", - intval($owner["uid"]), dbesc($check_date), - dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS), + intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN), + //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS), + //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS), + dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), + dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), + dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])), dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])) ); diff --git a/include/session.php b/include/session.php index 6632b7e89a..dda84e77a8 100644 --- a/include/session.php +++ b/include/session.php @@ -8,62 +8,69 @@ $session_expire = 180000; if(! function_exists('ref_session_open')) { function ref_session_open ($s,$n) { - return true; + return true; }} if(! function_exists('ref_session_read')) { function ref_session_read ($id) { - global $session_exists; - if(x($id)) - $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id)); - if(count($r)) { - $session_exists = true; - return $r[0]['data']; - } else { - logger("no data for session $id", LOGGER_TRACE); - } - return ''; + global $session_exists; + if(x($id)) + $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id)); + + if(count($r)) { + $session_exists = true; + return $r[0]['data']; + } else { + logger("no data for session $id", LOGGER_TRACE); + } + return ''; }} if(! function_exists('ref_session_write')) { function ref_session_write ($id,$data) { - global $session_exists, $session_expire; - if(! $id || ! $data) { - return false; - } + global $session_exists, $session_expire; - $expire = time() + $session_expire; - $default_expire = time() + 300; + if(! $id || ! $data) { + return false; + } - if($session_exists) - $r = q("UPDATE `session` - SET `data` = '%s', `expire` = '%s' - WHERE `sid` = '%s'", - dbesc($data), dbesc($expire), dbesc($id)); - else - $r = q("INSERT INTO `session` - SET `sid` = '%s', `expire` = '%s', `data` = '%s'", - dbesc($id), dbesc($default_expire), dbesc($data)); + $expire = time() + $session_expire; + $default_expire = time() + 300; - return true; + if($session_exists) { + $r = q("UPDATE `session` + SET `data` = '%s' + WHERE `data` != '%s' AND `sid` = '%s'", + dbesc($data), dbesc($data), dbesc($id)); + + $r = q("UPDATE `session` + SET `expire` = '%s' + WHERE `expire` != '%s' AND `sid` = '%s'", + dbesc($expire), dbesc($expire), dbesc($id)); + } else + $r = q("INSERT INTO `session` + SET `sid` = '%s', `expire` = '%s', `data` = '%s'", + dbesc($id), dbesc($default_expire), dbesc($data)); + + return true; }} if(! function_exists('ref_session_close')) { function ref_session_close() { - return true; + return true; }} if(! function_exists('ref_session_destroy')) { function ref_session_destroy ($id) { - q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id)); - return true; + q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id)); + return true; }} if(! function_exists('ref_session_gc')) { function ref_session_gc($expire) { - q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time())); - q("OPTIMIZE TABLE `sess_data`"); - return true; + q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time())); + q("OPTIMIZE TABLE `sess_data`"); + return true; }} $gc_probability = 50; @@ -74,5 +81,5 @@ ini_set('session.cookie_httponly', 1); session_set_save_handler ('ref_session_open', 'ref_session_close', - 'ref_session_read', 'ref_session_write', - 'ref_session_destroy', 'ref_session_gc'); + 'ref_session_read', 'ref_session_write', + 'ref_session_destroy', 'ref_session_gc'); From 88da58ed3eecce8d073e07b92c0d2fe6c1a5b4fd Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 7 Dec 2015 23:06:28 +0100 Subject: [PATCH 02/15] OStatus: Deactivated The resharing until it is tested completely. --- include/ostatus.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 34f8eccc51..59bc3b2fb8 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1322,12 +1322,12 @@ class="attachment thumbnail" id="attachment-572819" rel="nofollow external">http function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) { $a = get_app(); - if (!$toplevel AND $repeat) { - $entry = $doc->createElement("activity:object"); - $title = sprintf("New note by %s", $owner["nick"]); - } elseif (!$toplevel) { + if (!$toplevel AND !$repeat) { $entry = $doc->createElement("entry"); $title = sprintf("New note by %s", $owner["nick"]); + //} elseif (!$toplevel AND $repeat) { + // $entry = $doc->createElement("activity:object"); + // $title = sprintf("New note by %s", $owner["nick"]); } else { $entry = $doc->createElementNS(NS_ATOM, "entry"); @@ -1363,10 +1363,10 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) // But: it seems as if it doesn't federate well between the GS servers // So we just set it to "note" to be sure that it reaches their target systems - if (!$repeat) + //if (!$repeat) xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); - else - xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); + //else + // xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "title", $title); @@ -1391,21 +1391,21 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); - $repeated_item = $item; - $is_repeat = false; + //$repeated_item = $item; + //$is_repeat = false; - if (!$repeat) - $is_repeat = api_share_as_retweet($repeated_item); + //if (!$repeat) + // $is_repeat = api_share_as_retweet($repeated_item); - if (!$is_repeat) + //if (!$is_repeat) xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); - else - xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); + //else + // xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); - if ($is_repeat) { + /*if ($is_repeat) { $repeated_owner = array(); $repeated_owner["name"] = $repeated_item["author-name"]; $repeated_owner["url"] = $repeated_item["author-link"]; @@ -1432,7 +1432,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $profile["about"] = $owner["about"]; $author = ostatus_add_author($doc, $owner, $profile); $entry->appendChild($author); - } + }*/ $mentioned = array(); @@ -1499,8 +1499,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $attributes = array("local_id" => $item["id"], "source" => $app); - if ($is_repeat) - $attributes["repeat_of"] = $item["id"]; + //if ($is_repeat) + // $attributes["repeat_of"] = $item["id"]; xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes); From a2fa791bbd95524ea513ccf2897cb00d2cb878cc Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 7 Dec 2015 23:35:33 +0100 Subject: [PATCH 03/15] Always include the direct parent in the mentions --- include/ostatus.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ostatus.php b/include/ostatus.php index 59bc3b2fb8..58fd1f2b71 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1453,6 +1453,14 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"]; $mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"]; + + $thrparent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `uid` = %d AND `uri` = '%s'", + intval($owner["uid"]), + dbesc($parent_item)); + if ($thrparent) { + $mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"]; + $mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"]; + } } xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", From 45f4af66e76b87b569029a59546d0ed0f5272d4a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 10 Dec 2015 01:10:54 +0100 Subject: [PATCH 04/15] OStatus: Basic support for groups, new function to detect reshared items --- include/ostatus.php | 46 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 58fd1f2b71..73b10bd1d9 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1079,6 +1079,35 @@ function ostatus_store_conversation($itemid, $conversation_url) { } } +function get_reshared_guid($item) { + $body = trim($item["body"]); + + // Skip if it isn't a pure repeated messages + // Does it start with a share? + if (strpos($body, "[share") > 0) + return(""); + + // Does it end with a share? + if (strlen($body) > (strrpos($body, "[/share]") + 8)) + return(""); + + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); + // Skip if there is no shared message in there + if ($body == $attributes) + return(false); + + $guid = ""; + preg_match("/guid='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $guid = $matches[1]; + + preg_match('/guid="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $guid = $matches[1]; + + return $guid; +} + function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) { $element = $doc->createElement($element, xmlify($value)); @@ -1474,10 +1503,19 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) if ($t[0] == "@") $mentioned[$t[1]] = $t[1]; - foreach ($mentioned AS $mention) - xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_PERSON, - "href" => $mention)); + foreach ($mentioned AS $mention) { + $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", + intval($owner["uid"]), + dbesc(normalise_link($mention))); + if ($r[0]["forum"] OR $r[0]["prv"]) + xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", + "ostatus:object-type" => ACTIVITY_OBJ_GROUP, + "href" => $mention)); + else + xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", + "ostatus:object-type" => ACTIVITY_OBJ_PERSON, + "href" => $mention)); + } if (!$item["private"]) xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned", From 6dd39760ac40c9e8b1e6d6775ad86a273b727d7e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 10 Dec 2015 18:16:16 +0100 Subject: [PATCH 05/15] Support for real repeated messages --- include/ostatus.php | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 73b10bd1d9..d915b56cb1 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1354,9 +1354,9 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) if (!$toplevel AND !$repeat) { $entry = $doc->createElement("entry"); $title = sprintf("New note by %s", $owner["nick"]); - //} elseif (!$toplevel AND $repeat) { - // $entry = $doc->createElement("activity:object"); - // $title = sprintf("New note by %s", $owner["nick"]); + } elseif (!$toplevel AND $repeat) { + $entry = $doc->createElement("activity:object"); + $title = sprintf("New note by %s", $owner["nick"]); } else { $entry = $doc->createElementNS(NS_ATOM, "entry"); @@ -1392,10 +1392,10 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) // But: it seems as if it doesn't federate well between the GS servers // So we just set it to "note" to be sure that it reaches their target systems - //if (!$repeat) + if (!$repeat) xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); - //else - // xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); + else + xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "title", $title); @@ -1421,20 +1421,30 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); //$repeated_item = $item; - //$is_repeat = false; + $is_repeat = false; - //if (!$repeat) - // $is_repeat = api_share_as_retweet($repeated_item); +/* if (!$repeat) { + $repeated_guid = get_reshared_guid($item); - //if (!$is_repeat) + if ($repeated_guid != "") { + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + intval($owner["uid"]), dbesc($repeated_guid)); + if ($r) { + $repeated_item = $r[0]; + $is_repeat = true; + } + } + } +*/ + if (!$is_repeat) xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); - //else - // xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); + else + xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); - /*if ($is_repeat) { + if ($is_repeat) { $repeated_owner = array(); $repeated_owner["name"] = $repeated_item["author-name"]; $repeated_owner["url"] = $repeated_item["author-link"]; @@ -1461,7 +1471,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $profile["about"] = $owner["about"]; $author = ostatus_add_author($doc, $owner, $profile); $entry->appendChild($author); - }*/ + } $mentioned = array(); @@ -1545,8 +1555,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $attributes = array("local_id" => $item["id"], "source" => $app); - //if ($is_repeat) - // $attributes["repeat_of"] = $item["id"]; + if ($is_repeat) + $attributes["repeat_of"] = $repeated_item["id"]; xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes); From 02022b62a4201fdfd84fb989cc05084b335944d7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 12 Dec 2015 10:41:42 +0100 Subject: [PATCH 06/15] Some more work to make reshares work. --- include/ostatus.php | 87 +++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index d915b56cb1..cd0ba9bb0e 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1289,13 +1289,13 @@ function ostatus_get_attachment($doc, $root, $item) { } } -function ostatus_add_author($doc, $owner, $profile) { +function ostatus_add_author($doc, $owner, $profile = array()) { $a = get_app(); $author = $doc->createElement("author"); xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); xml_add_element($doc, $author, "uri", $owner["url"]); - xml_add_element($doc, $author, "name", $profile["name"]); + xml_add_element($doc, $author, "name", $owner["name"]); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]); xml_add_element($doc, $author, "link", "", $attributes); @@ -1305,20 +1305,22 @@ function ostatus_add_author($doc, $owner, $profile) { "type" => "image/jpeg", // To-Do? "media:width" => 175, "media:height" => 175, - "href" => $profile["photo"]); + "href" => $owner["photo"]); xml_add_element($doc, $author, "link", "", $attributes); - $attributes = array( - "rel" => "avatar", - "type" => "image/jpeg", // To-Do? - "media:width" => 80, - "media:height" => 80, - "href" => $profile["thumb"]); - xml_add_element($doc, $author, "link", "", $attributes); + if (isset($owner["thumb"])) { + $attributes = array( + "rel" => "avatar", + "type" => "image/jpeg", // To-Do? + "media:width" => 80, + "media:height" => 80, + "href" => $owner["thumb"]); + xml_add_element($doc, $author, "link", "", $attributes); + } xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]); - xml_add_element($doc, $author, "poco:displayName", $profile["name"]); - xml_add_element($doc, $author, "poco:note", $profile["about"]); + xml_add_element($doc, $author, "poco:displayName", $owner["name"]); + xml_add_element($doc, $author, "poco:note", $owner["about"]); if (trim($owner["location"]) != "") { $element = $doc->createElement("poco:address"); @@ -1334,8 +1336,10 @@ function ostatus_add_author($doc, $owner, $profile) { $author->appendChild($urls); } - xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"])); - xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); + if (count($profile)) { + xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"])); + xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); + } return $author; } @@ -1351,6 +1355,21 @@ class="attachment thumbnail" id="attachment-572819" rel="nofollow external">http function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) { $a = get_app(); + $is_repeat = false; + +/* if (!$repeat) { + $repeated_guid = get_reshared_guid($item); + + if ($repeated_guid != "") { + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + intval($owner["uid"]), dbesc($repeated_guid)); + if ($r) { + $repeated_item = $r[0]; + $is_repeat = true; + } + } + } +*/ if (!$toplevel AND !$repeat) { $entry = $doc->createElement("entry"); $title = sprintf("New note by %s", $owner["nick"]); @@ -1368,12 +1387,15 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $entry->setAttribute("xmlns:ostatus", NS_OSTATUS); $entry->setAttribute("xmlns:statusnet", NS_STATUSNET); - $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`", - intval($owner["uid"])); - if (!$r) - return; + if (!$repeat) { + $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`", + intval($owner["uid"])); + if (!$r) + return; - $profile = $r[0]; + $profile = $r[0]; + } + $profile = array(); $author = ostatus_add_author($doc, $owner, $profile); $entry->appendChild($author); @@ -1420,22 +1442,6 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); - //$repeated_item = $item; - $is_repeat = false; - -/* if (!$repeat) { - $repeated_guid = get_reshared_guid($item); - - if ($repeated_guid != "") { - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", - intval($owner["uid"]), dbesc($repeated_guid)); - if ($r) { - $repeated_item = $r[0]; - $is_repeat = true; - } - } - } -*/ if (!$is_repeat) xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); else @@ -1448,8 +1454,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $repeated_owner = array(); $repeated_owner["name"] = $repeated_item["author-name"]; $repeated_owner["url"] = $repeated_item["author-link"]; - $repeated_owner["photo"] = normalise_link($repeated_item["author-avatar"]); - $repeated_owner["nick"] = ""; + $repeated_owner["photo"] = $repeated_item["author-avatar"]; + $repeated_owner["nick"] = $repeated_owner["name"]; $repeated_owner["location"] = ""; $repeated_owner["about"] = ""; $repeated_owner["uid"] = 0; @@ -1464,12 +1470,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $entry_repeat = ostatus_entry($doc, $repeated_item, $repeated_owner, false, true); $entry->appendChild($entry_repeat); } elseif ($repeat) { - $profile = array(); - $profile["name"] = $owner["name"]; - $profile["photo"] = $owner["photo"]; - $profile["thumb"] = $owner["photo"]; - $profile["about"] = $owner["about"]; - $author = ostatus_add_author($doc, $owner, $profile); + $author = ostatus_add_author($doc, $owner); $entry->appendChild($author); } From 169088b24359ce565b1cd34c6f788885776c9260 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 13 Dec 2015 12:12:32 +0100 Subject: [PATCH 07/15] Maybe this solves the slapper problems ... --- include/ostatus.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/ostatus.php b/include/ostatus.php index cd0ba9bb0e..d651fed12b 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1514,6 +1514,15 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) if ($t[0] == "@") $mentioned[$t[1]] = $t[1]; + // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS) + // Not sure if that will really work. + $newmentions = array(); + foreach ($mentioned AS $mention) { + $newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention); + $newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention); + } + $mentioned = $newmentions; + foreach ($mentioned AS $mention) { $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", intval($owner["uid"]), From 15063c8d5bb415113b2bf0b25e2e95cfd7037ef5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 13 Dec 2015 12:15:45 +0100 Subject: [PATCH 08/15] Code cleanup and first steps for a better comment distribition with DFRN and OStatus --- include/delivery.php | 1 - include/notifier.php | 60 +++++++++++++++++++-------------------- include/pubsubpublish.php | 1 - include/salmon.php | 17 ----------- 4 files changed, 30 insertions(+), 49 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index dc02faaba8..49f7efef59 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -393,7 +393,6 @@ function delivery_run(&$argv, &$argc){ if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) $slaps[] = ostatus_salmon($item,$owner); - //$slaps[] = atom_entry($item,'html',null,$owner,true); } logger('notifier: slapdelivery: ' . $contact['name']); diff --git a/include/notifier.php b/include/notifier.php index 553f2918db..f62d72224d 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -302,6 +302,7 @@ function notifier_run(&$argv, &$argc){ $public_message = false; // not public $conversant_str = dbesc($parent['contact-id']); $recipients = array($parent['contact-id']); + $recipients_followup = array($parent['contact-id']); //if (!$target_item['private'] AND $target_item['wall'] AND if (!$target_item['private'] AND @@ -309,26 +310,20 @@ function notifier_run(&$argv, &$argc){ $target_item['deny_cid'].$target_item['deny_gid']) == 0)) $push_notify = true; - // We notify Friendica users in the thread when it is an OStatus thread. - // Hopefully this transfers the messages to the other Friendica servers. (Untested) if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { $push_notify = true; if ($parent["network"] == NETWORK_OSTATUS) { - $r = q("SELECT `author-link` FROM `item` WHERE `parent` = %d AND `author-link` != '%s'", - intval($target_item["parent"]), dbesc($owner['url'])); - foreach($r as $parent_item) { - $probed_contact = probe_url($parent_item["author-link"]); - if (($probed_contact["notify"] != "") AND ($probed_contact["network"] == NETWORK_DFRN)) { - logger('Notify Friendica user '.$probed_contact["url"].': '.$probed_contact["notify"]); - $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; - } - } + // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending`", + intval($uid), + dbesc(NETWORK_DFRN) + ); + if(count($r)) + foreach($r as $rr) + $recipients_followup[] = $rr['id']; } - - if (count($url_recipients)) - logger("url_recipients ".print_r($url_recipients,true)); } logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG); } else { @@ -505,7 +500,7 @@ function notifier_run(&$argv, &$argc){ set_config('system','site_pubkey', $res['pubkey']); } - $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` + $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid); $photos = array(); $ext = Photo::supportedTypes(); @@ -533,19 +528,19 @@ function notifier_run(&$argv, &$argc){ } else { $slap = ostatus_salmon($target_item,$owner); - //$slap = atom_entry($target_item,'html',null,$owner,false); if($followup) { + logger("Section A1: ".$item_id); foreach($items as $item) { // there is only one item if(! $item['parent']) continue; if($item['id'] == $item_id) { logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA); - //$slap = atom_entry($item,'html',null,$owner,false); $atom .= atom_entry($item,'text',null,$owner,false); } } } else { + logger("Section A2: ".$item_id); foreach($items as $item) { if(! $item['parent']) @@ -574,7 +569,6 @@ function notifier_run(&$argv, &$argc){ if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) $slaps[] = ostatus_salmon($item,$owner); - //$slaps[] = atom_entry($item,'html',null,$owner,true); } } } @@ -592,7 +586,7 @@ function notifier_run(&$argv, &$argc){ if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid'])) && (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid'])) && (intval($target_item['pubmail']))) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'", + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'", intval($uid), dbesc(NETWORK_MAIL) ); @@ -604,14 +598,14 @@ function notifier_run(&$argv, &$argc){ } if($followup) - $recip_str = $parent['contact-id']; + $recip_str = implode(', ', $recipients_followup); else $recip_str = implode(', ', $recipients); if ($relocate) $r = $recipients_relocate; else - $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ", + $r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending`", dbesc($recip_str) ); @@ -699,6 +693,7 @@ function notifier_run(&$argv, &$argc){ $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); if(link_compare($basepath,$a->get_baseurl())) { + logger("Section B1: ".$item_id); $nickname = basename($contact['url']); if($contact['issued-id']) @@ -750,6 +745,7 @@ function notifier_run(&$argv, &$argc){ break; } } + logger("Section B2: ".$item_id); logger('notifier: dfrndelivery: ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$atom); @@ -772,6 +768,7 @@ function notifier_run(&$argv, &$argc){ break; if($followup && $contact['notify']) { + logger("Section C1: ".$item_id); logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); @@ -780,6 +777,7 @@ function notifier_run(&$argv, &$argc){ add_to_queue($contact['id'],NETWORK_OSTATUS,$slap); } } else { + logger("Section C2: ".$item_id); // only send salmon if public - e.g. if it's ok to notify // a public hub, it's ok to send a salmon @@ -814,7 +812,7 @@ function notifier_run(&$argv, &$argc){ if($cmd === 'wall-new' || $cmd === 'comment-new') { $it = null; - if($cmd === 'wall-new') + if($cmd === 'wall-new') $it = $items[0]; else { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -894,6 +892,7 @@ function notifier_run(&$argv, &$argc){ break; if($mail) { + logger("Section D1: ".$item_id); diaspora_send_mail($item,$owner,$contact); break; } @@ -905,10 +904,14 @@ function notifier_run(&$argv, &$argc){ // all other public posts processed as public batches further below if($public_message) { - if($followup) + logger("Section D2: ".$item_id); + if($followup) { + logger("Section D3: ".$item_id); diaspora_send_followup($target_item,$owner,$contact, true); + } break; } + logger("Section D4: ".$item_id); if(! $contact['pubkey']) break; @@ -923,22 +926,26 @@ function notifier_run(&$argv, &$argc){ } if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { + logger("Section D5: ".$item_id); // send both top-level retractions and relayable retractions for owner to relay diaspora_send_retraction($target_item,$owner,$contact); break; } elseif($followup) { + logger("Section D6: ".$item_id); // send comments and likes to owner to relay diaspora_send_followup($target_item,$owner,$contact); break; } elseif($target_item['uri'] !== $target_item['parent-uri']) { + logger("Section D7: ".$item_id); // we are the relay - send comments, likes and relayable_retractions // (of comments and likes) to our conversants diaspora_send_relay($target_item,$owner,$contact); break; } elseif(($top_level) && (! $walltowall)) { + logger("Section D8: ".$item_id); // currently no workable solution for sending walltowall diaspora_send_status($target_item,$owner,$contact); break; @@ -946,13 +953,6 @@ function notifier_run(&$argv, &$argc){ break; - case NETWORK_FEED: - case NETWORK_FACEBOOK: - if(get_config('system','dfrn_only')) - break; - case NETWORK_PUMPIO: - if(get_config('system','dfrn_only')) - break; default: break; } diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index d27beea3d5..07972b7a8c 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -13,7 +13,6 @@ function handle_pubsubhubbub() { $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0"); foreach($r as $rr) { - //$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true); $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']); $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); diff --git a/include/salmon.php b/include/salmon.php index a254fe7e97..988c542e2d 100644 --- a/include/salmon.php +++ b/include/salmon.php @@ -78,23 +78,6 @@ function slapper($owner,$url,$slap) { return; } - // add all namespaces to item - -$namespaces = <<< EOT - > -EOT; - - $slap = str_replace('',$namespaces,$slap); - logger('slapper called for '.$url.'. Data: ' . $slap); // create a magic envelope From a1a7bce6035eaa99be8af114e91285963d5afbf6 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 14 Dec 2015 00:39:20 +0100 Subject: [PATCH 09/15] Completely reworked delivery process. --- include/delivery.php | 314 ++++++++++++++++----------- include/notifier.php | 493 +++---------------------------------------- 2 files changed, 222 insertions(+), 585 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index 49f7efef59..4351109abd 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -2,6 +2,8 @@ require_once("boot.php"); require_once('include/queue_fn.php'); require_once('include/html2plain.php'); +require_once("include/Scrape.php"); +require_once('include/diaspora.php'); require_once("include/ostatus.php"); function delivery_run(&$argv, &$argc){ @@ -15,14 +17,13 @@ function delivery_run(&$argv, &$argc){ @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); } require_once("include/session.php"); require_once("include/datetime.php"); require_once('include/items.php'); require_once('include/bbcode.php'); - require_once('include/diaspora.php'); require_once('include/email.php'); load_config('config'); @@ -46,7 +47,7 @@ function delivery_run(&$argv, &$argc){ // Some other process may have delivered this item already. - $r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1", + $r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1", dbesc($cmd), dbesc($item_id), dbesc($contact_id) @@ -68,7 +69,7 @@ function delivery_run(&$argv, &$argc){ // It's ours to deliver. Remove it from the queue. - q("delete from deliverq where cmd = '%s' and item = %d and contact = %d", + q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d", dbesc($cmd), dbesc($item_id), dbesc($contact_id) @@ -78,28 +79,60 @@ function delivery_run(&$argv, &$argc){ continue; $expire = false; + $mail = false; + $fsuggest = false; + $relocate = false; $top_level = false; $recipients = array(); $url_recipients = array(); + $followup = false; $normal_mode = true; $recipients[] = $contact_id; - if($cmd === 'expire') { + if($cmd === 'mail') { + $normal_mode = false; + $mail = true; + $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1", + intval($item_id) + ); + if(! count($message)){ + return; + } + $uid = $message[0]['uid']; + $recipients[] = $message[0]['contact-id']; + $item = $message[0]; + } + elseif($cmd === 'expire') { $normal_mode = false; $expire = true; - $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 + $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE", intval($item_id) ); $uid = $item_id; $item_id = 0; if(! count($items)) - continue; + continue; } - else { + elseif($cmd === 'suggest') { + $normal_mode = false; + $fsuggest = true; + $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1", + intval($item_id) + ); + if(! count($suggest)) + return; + $uid = $suggest[0]['uid']; + $recipients[] = $suggest[0]['cid']; + $item = $suggest[0]; + } elseif($cmd === 'relocate') { + $normal_mode = false; + $relocate = true; + $uid = $item_id; + } else { // find ancestors $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", intval($item_id) @@ -114,12 +147,7 @@ function delivery_run(&$argv, &$argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; - // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up - if(! $parent_id) - continue; - - - $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` + $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", intval($parent_id) ); @@ -134,8 +162,8 @@ function delivery_run(&$argv, &$argc){ if(! in_array($item['contact-id'],$contacts_arr)) $contacts_arr[] = intval($item['contact-id']); if(count($contacts_arr)) { - $str_contacts = implode(',',$contacts_arr); - $icontacts = q("SELECT * FROM `contact` + $str_contacts = implode(',',$contacts_arr); + $icontacts = q("SELECT * FROM `contact` WHERE `id` IN ( $str_contacts ) " ); } @@ -155,10 +183,10 @@ function delivery_run(&$argv, &$argc){ } } - $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, + $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, + `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`, `user`.`prvnets` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) ); @@ -172,13 +200,10 @@ function delivery_run(&$argv, &$argc){ $public_message = true; - // fill this in with a single salmon slap if applicable + if(! ($mail || $fsuggest || $relocate)) { + require_once('include/group.php'); - $slap = ''; - - require_once('include/group.php'); - - $parent = $items[0]; + $parent = $items[0]; // This is IMPORTANT!!!! @@ -198,30 +223,37 @@ function delivery_run(&$argv, &$argc){ // by stringing togther an array of retractions and sending them onward. - $localhost = $a->get_hostname(); - if(strpos($localhost,':')) - $localhost = substr($localhost,0,strpos($localhost,':')); + $localhost = $a->get_hostname(); + if(strpos($localhost,':')) + $localhost = substr($localhost,0,strpos($localhost,':')); - /** - * - * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes - * have been known to cause runaway conditions which affected several servers, along with - * permissions issues. - * - */ + /** + * + * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes + * have been known to cause runaway conditions which affected several servers, along with + * permissions issues. + * + */ - if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { - logger('relay denied for delivery agent.'); + $relay_to_owner = false; - /* no relay allowed for direct contact delivery */ - continue; - } + if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { + $relay_to_owner = true; + } + + if($relay_to_owner) { + logger('followup '.$target_item["guid"], LOGGER_DEBUG); + // local followup to remote post + $followup = true; + } + + if((strlen($parent['allow_cid'])) + || (strlen($parent['allow_gid'])) + || (strlen($parent['deny_cid'])) + || (strlen($parent['deny_gid']))) { + $public_message = false; // private recipients, not public + } - if((strlen($parent['allow_cid'])) - || (strlen($parent['allow_gid'])) - || (strlen($parent['deny_cid'])) - || (strlen($parent['deny_gid']))) { - $public_message = false; // private recipients, not public } $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0", @@ -233,18 +265,16 @@ function delivery_run(&$argv, &$argc){ $hubxml = feed_hublinks(); - logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); - - require_once('include/salmon.php'); - if($contact['self']) continue; $deliver_status = 0; + logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']); + switch($contact['network']) { - case NETWORK_DFRN : + case NETWORK_DFRN: logger('notifier: dfrndelivery: ' . $contact['name']); $feed_template = get_markup_template('atom_feed.tpl'); @@ -276,25 +306,106 @@ function delivery_run(&$argv, &$argc){ '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '1' : '') )); - foreach($items as $item) { - if(! $item['parent']) - continue; + if($mail) { + $public_message = false; // mail is not public - // private emails may be in included in public conversations. Filter them. - if(($public_message) && $item['private'] == 1) - continue; + $body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']); - $item_contact = get_item_contact($item,$icontacts); - if(! $item_contact) - continue; + $atom .= replace_macros($mail_template, array( + '$name' => xmlify($owner['name']), + '$profile_page' => xmlify($owner['url']), + '$thumb' => xmlify($owner['thumb']), + '$item_id' => xmlify($item['uri']), + '$subject' => xmlify($item['title']), + '$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), + '$content' => xmlify($body), + '$parent_id' => xmlify($item['parent-uri']) + )); + } elseif($fsuggest) { + $public_message = false; // suggestions are not public - if($normal_mode) { - if($item_id == $item['id'] || $item['id'] == $item['parent']) - $atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0)); + $sugg_template = get_markup_template('atom_suggest.tpl'); + + $atom .= replace_macros($sugg_template, array( + '$name' => xmlify($item['name']), + '$url' => xmlify($item['url']), + '$photo' => xmlify($item['photo']), + '$request' => xmlify($item['request']), + '$note' => xmlify($item['note']) + )); + + // We don't need this any more + + q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", + intval($item['id']) + ); + } elseif($relocate) { + $public_message = false; // suggestions are not public + + $sugg_template = get_markup_template('atom_relocate.tpl'); + + /* get site pubkey. this could be a new installation with no site keys*/ + $pubkey = get_config('system','site_pubkey'); + if(! $pubkey) { + $res = new_keypair(1024); + set_config('system','site_prvkey', $res['prvkey']); + set_config('system','site_pubkey', $res['pubkey']); } - else - $atom .= atom_entry($item,'text',null,$owner,true); + $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` + WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid); + $photos = array(); + $ext = Photo::supportedTypes(); + foreach($rp as $p){ + $photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; + } + unset($rp, $ext); + + $atom .= replace_macros($sugg_template, array( + '$name' => xmlify($owner['name']), + '$photo' => xmlify($photos[4]), + '$thumb' => xmlify($photos[5]), + '$micro' => xmlify($photos[6]), + '$url' => xmlify($owner['url']), + '$request' => xmlify($owner['request']), + '$confirm' => xmlify($owner['confirm']), + '$notify' => xmlify($owner['notify']), + '$poll' => xmlify($owner['poll']), + '$sitepubkey' => xmlify(get_config('system','site_pubkey')), + //'$pubkey' => xmlify($owner['pubkey']), + //'$prvkey' => xmlify($owner['prvkey']), + )); + unset($photos); + } elseif($followup) { + foreach($items as $item) { // there is only one item + if(! $item['parent']) + continue; + if($item['id'] == $item_id) { + logger('followup: item: ' . print_r($item,true), LOGGER_DATA); + $atom .= atom_entry($item,'text',null,$owner,false); + } + } + } else { + foreach($items as $item) { + if(! $item['parent']) + continue; + + // private emails may be in included in public conversations. Filter them. + if(($public_message) && $item['private'] == 1) + continue; + + $item_contact = get_item_contact($item,$icontacts); + if(! $item_contact) + continue; + + if($normal_mode) { + if($item_id == $item['id'] || $item['id'] == $item['parent']) + $atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0)); + } + else + $atom .= atom_entry($item,'text',null,$owner,true); + + } } $atom .= '' . "\r\n"; @@ -366,54 +477,18 @@ function delivery_run(&$argv, &$argc){ } break; - case NETWORK_OSTATUS : + case NETWORK_OSTATUS: // Do not send to otatus if we are not configured to send to public networks if($owner['prvnets']) break; if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) break; - // only send salmon if public - e.g. if it's ok to notify - // a public hub, it's ok to send a salmon - - if(($public_message) && (! $expire)) { - $slaps = array(); - - foreach($items as $item) { - if(! $item['parent']) - continue; - - // private emails may be in included in public conversations. Filter them. - if(($public_message) && $item['private'] == 1) - continue; - - $item_contact = get_item_contact($item,$icontacts); - if(! $item_contact) - continue; - - if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) - $slaps[] = ostatus_salmon($item,$owner); - } - - logger('notifier: slapdelivery: ' . $contact['name']); - foreach($slaps as $slappy) { - if($contact['notify']) { - if(! was_recently_delayed($contact['id'])) - $deliver_status = slapper($owner,$contact['notify'],$slappy); - else - $deliver_status = (-1); - - if($deliver_status == (-1)) { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy); - } - } - } - } - + // There is currently no code here to distribute anything to OStatus. + // This is done in "notifier.php" (See "url_recipients" and "push_notify") break; - case NETWORK_MAIL : + case NETWORK_MAIL: case NETWORK_MAIL2: if(get_config('system','dfrn_only')) @@ -507,7 +582,7 @@ function delivery_run(&$argv, &$argc){ } break; - case NETWORK_DIASPORA : + case NETWORK_DIASPORA: if($public_message) $loc = 'public batch ' . $contact['batch']; else @@ -515,7 +590,15 @@ function delivery_run(&$argv, &$argc){ logger('delivery: diaspora batch deliver: ' . $loc); - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) + if(get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled'))) + break; + + if($mail) { + diaspora_send_mail($item,$owner,$contact); + break; + } + + if(!$normal_mode) break; if((! $contact['pubkey']) && (! $public_message)) @@ -530,21 +613,23 @@ function delivery_run(&$argv, &$argc){ } } - if(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) { + if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { // top-level retraction logger('delivery: diaspora retract: ' . $loc); diaspora_send_retraction($target_item,$owner,$contact,$public_message); break; - } - elseif($target_item['uri'] !== $target_item['parent-uri']) { + } elseif($followup) { + // send comments and likes to owner to relay + diaspora_send_followup($target_item,$owner,$contact,$public_message); + break; + } elseif($target_item['uri'] !== $target_item['parent-uri']) { // we are the relay - send comments, likes and relayable_retractions to our conversants logger('delivery: diaspora relay: ' . $loc); diaspora_send_relay($target_item,$owner,$contact,$public_message); break; - } - elseif(($top_level) && (! $walltowall)) { + } elseif(($top_level) && (! $walltowall)) { // currently no workable solution for sending walltowall logger('delivery: diaspora status: ' . $loc); diaspora_send_status($target_item,$owner,$contact,$public_message); @@ -555,13 +640,6 @@ function delivery_run(&$argv, &$argc){ break; - case NETWORK_FEED : - case NETWORK_FACEBOOK : - if(get_config('system','dfrn_only')) - break; - case NETWORK_PUMPIO : - if(get_config('system','dfrn_only')) - break; default: break; } diff --git a/include/notifier.php b/include/notifier.php index f62d72224d..0f4e35e4fe 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -5,19 +5,12 @@ require_once('include/html2plain.php'); require_once("include/Scrape.php"); require_once('include/diaspora.php'); require_once("include/ostatus.php"); +require_once('include/salmon.php'); /* * This file was at one time responsible for doing all deliveries, but this caused - * big problems on shared hosting systems, where the process might get killed by the - * hosting provider and nothing would get delivered. - * It now only delivers one message under certain cases, and invokes a queued - * delivery mechanism (include/deliver.php) to deliver individual contacts at - * controlled intervals. - * This has a much better chance of surviving random processes getting killed - * by the hosting provider. - * A lot of this code is duplicated in include/deliver.php until we have time to go back - * and re-structure the delivery procedure based on the obstacles that have been thrown at - * us by hosting providers. + * big problems when the process was killed or stalled during the delivery process. + * It now invokes separate queues that are delivering via delivery.php and pubsubpublish.php. */ /* @@ -162,6 +155,8 @@ function notifier_run(&$argv, &$argc){ $normal_mode = false; $relocate = true; $uid = $item_id; + + $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN); } else { // find ancestors $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", @@ -177,10 +172,6 @@ function notifier_run(&$argv, &$argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; - // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up - if(! $parent_id) - return; - $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", intval($parent_id) @@ -316,6 +307,7 @@ function notifier_run(&$argv, &$argc){ if ($parent["network"] == NETWORK_OSTATUS) { // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments + // Currently it is work at progress $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending`", intval($uid), dbesc(NETWORK_DFRN) @@ -413,7 +405,7 @@ function notifier_run(&$argv, &$argc){ // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')"; } else - $sql_extra = ""; + $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')"; $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra); @@ -421,163 +413,11 @@ function notifier_run(&$argv, &$argc){ $contacts = $r; } - $feed_template = get_markup_template('atom_feed.tpl'); - $mail_template = get_markup_template('atom_mail.tpl'); - - $atom = ''; - $slaps = array(); - - $hubxml = feed_hublinks(); - - $birthday = feed_birthday($owner['uid'],$owner['timezone']); - - if(strlen($birthday)) - $birthday = '' . xmlify($birthday) . ''; - - $atom .= replace_macros($feed_template, array( - '$version' => xmlify(FRIENDICA_VERSION), - '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ), - '$feed_title' => xmlify($owner['name']), - '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) , - '$hub' => $hubxml, - '$salmon' => '', // private feed, we don't use salmon here - '$name' => xmlify($owner['name']), - '$profile_page' => xmlify($owner['url']), - '$photo' => xmlify($owner['photo']), - '$thumb' => xmlify($owner['thumb']), - '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) , - '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) , - '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) , - '$birthday' => $birthday, - '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '1' : '') - - )); - - if($mail) { - $public_message = false; // mail is not public - - $body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']); - - $atom .= replace_macros($mail_template, array( - '$name' => xmlify($owner['name']), - '$profile_page' => xmlify($owner['url']), - '$thumb' => xmlify($owner['thumb']), - '$item_id' => xmlify($item['uri']), - '$subject' => xmlify($item['title']), - '$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), - '$content' => xmlify($body), - '$parent_id' => xmlify($item['parent-uri']) - )); - } elseif($fsuggest) { - $public_message = false; // suggestions are not public - - $sugg_template = get_markup_template('atom_suggest.tpl'); - - $atom .= replace_macros($sugg_template, array( - '$name' => xmlify($item['name']), - '$url' => xmlify($item['url']), - '$photo' => xmlify($item['photo']), - '$request' => xmlify($item['request']), - '$note' => xmlify($item['note']) - )); - - // We don't need this any more - - q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", - intval($item['id']) - ); - - } elseif($relocate) { - $public_message = false; // suggestions are not public - - $sugg_template = get_markup_template('atom_relocate.tpl'); - - /* get site pubkey. this could be a new installation with no site keys*/ - $pubkey = get_config('system','site_pubkey'); - if(! $pubkey) { - $res = new_keypair(1024); - set_config('system','site_prvkey', $res['prvkey']); - set_config('system','site_pubkey', $res['pubkey']); - } - - $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` - WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid); - $photos = array(); - $ext = Photo::supportedTypes(); - foreach($rp as $p){ - $photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; - } - unset($rp, $ext); - - $atom .= replace_macros($sugg_template, array( - '$name' => xmlify($owner['name']), - '$photo' => xmlify($photos[4]), - '$thumb' => xmlify($photos[5]), - '$micro' => xmlify($photos[6]), - '$url' => xmlify($owner['url']), - '$request' => xmlify($owner['request']), - '$confirm' => xmlify($owner['confirm']), - '$notify' => xmlify($owner['notify']), - '$poll' => xmlify($owner['poll']), - '$sitepubkey' => xmlify(get_config('system','site_pubkey')), - //'$pubkey' => xmlify($owner['pubkey']), - //'$prvkey' => xmlify($owner['prvkey']), - )); - $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN); - unset($photos); - } else { - + if (!$normal_mode) + $public_message = false; + else $slap = ostatus_salmon($target_item,$owner); - if($followup) { - logger("Section A1: ".$item_id); - foreach($items as $item) { // there is only one item - if(! $item['parent']) - continue; - if($item['id'] == $item_id) { - logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA); - $atom .= atom_entry($item,'text',null,$owner,false); - } - } - } else { - logger("Section A2: ".$item_id); - foreach($items as $item) { - - if(! $item['parent']) - continue; - - // private emails may be in included in public conversations. Filter them. - - if(($public_message) && $item['private'] == 1) - continue; - - - $contact = get_item_contact($item,$contacts); - - if(! $contact) - continue; - - if($normal_mode) { - - // we only need the current item, but include the parent because without it - // older sites without a corresponding dfrn_notify change may do the wrong thing. - - if($item_id == $item['id'] || $item['id'] == $item['parent']) - $atom .= atom_entry($item,'text',null,$owner,true); - } else - $atom .= atom_entry($item,'text',null,$owner,true); - - if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) - $slaps[] = ostatus_salmon($item,$owner); - } - } - } - $atom .= '' . "\r\n"; - - logger('notifier: ' . $atom, LOGGER_DATA); - - logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); - // If this is a public message and pubmail is set on the parent, include all your email contacts $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); @@ -610,8 +450,6 @@ function notifier_run(&$argv, &$argc){ ); - require_once('include/salmon.php'); - $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); // If we are using the worker we don't need a delivery interval @@ -623,10 +461,10 @@ function notifier_run(&$argv, &$argc){ if(count($r)) { foreach($r as $contact) { - if((! $mail) && (! $fsuggest) && (! $followup) && (!$relocate) && (! $contact['self'])) { + if(!$contact['self']) { if(($contact['network'] === NETWORK_DIASPORA) && ($public_message)) continue; - q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )", + q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)", dbesc($cmd), intval($item_id), intval($contact['id']) @@ -659,309 +497,30 @@ function notifier_run(&$argv, &$argc){ if($contact['self']) continue; - logger("Deliver ".$target_item["guid"]." to ".$contact['url'], LOGGER_DEBUG); + logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); // potentially more than one recipient. Start a new process and space them out a bit. // we will deliver single recipient types of message and email recipients here. - if((! $mail) && (! $fsuggest) && (!$relocate) && (! $followup)) { + $this_batch[] = $contact['id']; - $this_batch[] = $contact['id']; - - if(count($this_batch) == $deliveries_per_process) { - proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); - $this_batch = array(); - if($interval) - @time_sleep_until(microtime(true) + (float) $interval); - } - continue; - } - // be sure to pick up any stragglers - if(count($this_batch)) + if(count($this_batch) >= $deliveries_per_process) { proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); - - - $deliver_status = 0; - - logger("main delivery by notifier: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate"); - - switch($contact['network']) { - case NETWORK_DFRN: - - // perform local delivery if we are on the same site - - $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); - - if(link_compare($basepath,$a->get_baseurl())) { - logger("Section B1: ".$item_id); - - $nickname = basename($contact['url']); - if($contact['issued-id']) - $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id'])); - else - $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id'])); - - $x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, - `contact`.`pubkey` AS `cpubkey`, - `contact`.`prvkey` AS `cprvkey`, - `contact`.`thumb` AS `thumb`, - `contact`.`url` as `url`, - `contact`.`name` as `senderName`, - `user`.* - FROM `contact` - INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` - WHERE `contact`.`blocked` = 0 AND `contact`.`archive` = 0 - AND `contact`.`pending` = 0 - AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' - $sql_extra - AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1", - dbesc(NETWORK_DFRN), - dbesc($nickname) - ); - - if($x && count($x)) { - $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false); - if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) { - q("update contact set writable = 1 where id = %d", - intval($x[0]['id']) - ); - $x[0]['writable'] = 1; - } - - // if contact's ssl policy changed, which we just determined - // is on our own server, update our contact links - - $ssl_policy = get_config('system','ssl_policy'); - fix_contact_ssl_policy($x[0],$ssl_policy); - - // If we are setup as a soapbox we aren't accepting top level posts from this person - - if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) - break; - - require_once('library/simplepie/simplepie.inc'); - logger('mod-delivery: local delivery'); - local_delivery($x[0],$atom); - break; - } - } - logger("Section B2: ".$item_id); - - logger('notifier: dfrndelivery: ' . $contact['name']); - $deliver_status = dfrn_deliver($owner,$contact,$atom); - - logger('notifier: dfrn_delivery returns ' . $deliver_status); - - if($deliver_status == (-1)) { - logger('notifier: delivery failed: queuing message'); - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_DFRN,$atom); - } - break; - case NETWORK_OSTATUS: - - // Do not send to ostatus if we are not configured to send to public networks - if($owner['prvnets']) - break; - - if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) - break; - - if($followup && $contact['notify']) { - logger("Section C1: ".$item_id); - logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']); - $deliver_status = slapper($owner,$contact['notify'],$slap); - - if($deliver_status == (-1)) { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_OSTATUS,$slap); - } - } else { - logger("Section C2: ".$item_id); - - // only send salmon if public - e.g. if it's ok to notify - // a public hub, it's ok to send a salmon - - if((count($slaps)) && ($public_message) && (! $expire)) { - logger('slapdelivery item '.$item_id.' to ' . $contact['name']); - foreach($slaps as $slappy) { - if($contact['notify']) { - $deliver_status = slapper($owner,$contact['notify'],$slappy); - if($deliver_status == (-1)) { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy); - } - } - } - } - } - break; - - case NETWORK_MAIL: - case NETWORK_MAIL2: - - if(get_config('system','dfrn_only')) - break; - - // WARNING: does not currently convert to RFC2047 header encodings, etc. - - $addr = $contact['addr']; - if(! strlen($addr)) - break; - - if($cmd === 'wall-new' || $cmd === 'comment-new') { - - $it = null; - if($cmd === 'wall-new') - $it = $items[0]; - else { - $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($argv[2]), - intval($uid) - ); - if(count($r)) - $it = $r[0]; - } - if(! $it) - break; - - - - $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", - intval($uid) - ); - if(! count($local_user)) - break; - - $reply_to = ''; - $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", - intval($uid) - ); - if($r1 && $r1[0]['reply_to']) - $reply_to = $r1[0]['reply_to']; - - $subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ; - - // only expose our real email address to true friends - if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked'])) - if($reply_to) { - $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; - $headers .= 'Sender: '.$local_user[0]['email']."\n"; - } else - $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n"; - else - $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n"; - - //if($reply_to) - // $headers .= 'Reply-to: ' . $reply_to . "\n"; - - $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n"; - - if($it['uri'] !== $it['parent-uri']) { - $headers .= "References: <".iri2msgid($it["parent-uri"]).">"; - - // If Threading is enabled, write down the correct parent - if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"])) - $headers .= " <".iri2msgid($it["thr-parent"]).">"; - $headers .= "\n"; - - if(!$it['title']) { - $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($it['parent-uri']), - intval($uid)); - - if(count($r) AND ($r[0]['title'] != '')) - $subject = $r[0]['title']; - else { - $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($it['parent-uri']), - intval($uid)); - - if(count($r) AND ($r[0]['title'] != '')) - $subject = $r[0]['title']; - } - } - if(strncasecmp($subject,'RE:',3)) - $subject = 'Re: '.$subject; - } - email_send($addr, $subject, $headers, $it); - } - break; - case NETWORK_DIASPORA: - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled'))) - break; - - if($mail) { - logger("Section D1: ".$item_id); - diaspora_send_mail($item,$owner,$contact); - break; - } - - if(! $normal_mode) - break; - - // special handling for followup to public post - // all other public posts processed as public batches further below - - if($public_message) { - logger("Section D2: ".$item_id); - if($followup) { - logger("Section D3: ".$item_id); - diaspora_send_followup($target_item,$owner,$contact, true); - } - break; - } - logger("Section D4: ".$item_id); - - if(! $contact['pubkey']) - break; - - $unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); - - //don't transmit activities which are not supported by diaspora - foreach($unsupported_activities as $act) { - if(activity_match($target_item['verb'],$act)) { - break 2; - } - } - - if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { - logger("Section D5: ".$item_id); - // send both top-level retractions and relayable retractions for owner to relay - diaspora_send_retraction($target_item,$owner,$contact); - break; - } - elseif($followup) { - logger("Section D6: ".$item_id); - // send comments and likes to owner to relay - diaspora_send_followup($target_item,$owner,$contact); - break; - } - elseif($target_item['uri'] !== $target_item['parent-uri']) { - logger("Section D7: ".$item_id); - // we are the relay - send comments, likes and relayable_retractions - // (of comments and likes) to our conversants - diaspora_send_relay($target_item,$owner,$contact); - break; - } - elseif(($top_level) && (! $walltowall)) { - logger("Section D8: ".$item_id); - // currently no workable solution for sending walltowall - diaspora_send_status($target_item,$owner,$contact); - break; - } - - break; - - default: - break; + $this_batch = array(); + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); } + continue; } + + // be sure to pick up any stragglers + if(count($this_batch)) + proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); } - // send additional slaps to mentioned remote tags (@foo@example.com) + // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts + // They are especially used for notifications to OStatus users that don't follow us. - //if($slap && count($url_recipients) && ($followup || $top_level) && ($public_message || $push_notify) && (! $expire)) { if($slap && count($url_recipients) && ($public_message || $push_notify) && (!$expire)) { if(! get_config('system','dfrn_only')) { foreach($url_recipients as $url) { @@ -1038,7 +597,7 @@ function notifier_run(&$argv, &$argc){ } - + // Notify PuSH subscribers (Used for OStatus distribution of regular posts) if($push_notify AND strlen($hub)) { $hubs = explode(',', $hub); if(count($hubs)) { From bc8f7539004868cd6ab270a7a4a2ac331db3935b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 14 Dec 2015 00:42:36 +0100 Subject: [PATCH 10/15] Only optical stuff --- include/ostatus.php | 41 +++++++++++++++++++-------------------- include/pubsubpublish.php | 3 +++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index d651fed12b..e0e6c2186e 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1080,30 +1080,30 @@ function ostatus_store_conversation($itemid, $conversation_url) { } function get_reshared_guid($item) { - $body = trim($item["body"]); + $body = trim($item["body"]); - // Skip if it isn't a pure repeated messages - // Does it start with a share? - if (strpos($body, "[share") > 0) - return(""); + // Skip if it isn't a pure repeated messages + // Does it start with a share? + if (strpos($body, "[share") > 0) + return(""); - // Does it end with a share? - if (strlen($body) > (strrpos($body, "[/share]") + 8)) - return(""); + // Does it end with a share? + if (strlen($body) > (strrpos($body, "[/share]") + 8)) + return(""); - $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); - // Skip if there is no shared message in there - if ($body == $attributes) - return(false); + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); + // Skip if there is no shared message in there + if ($body == $attributes) + return(false); - $guid = ""; - preg_match("/guid='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $guid = $matches[1]; + $guid = ""; + preg_match("/guid='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $guid = $matches[1]; - preg_match('/guid="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $guid = $matches[1]; + preg_match('/guid="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $guid = $matches[1]; return $guid; } @@ -1501,7 +1501,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"]; $mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"]; } - } + } xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"])); @@ -1515,7 +1515,6 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $mentioned[$t[1]] = $t[1]; // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS) - // Not sure if that will really work. $newmentions = array(); foreach ($mentioned AS $mention) { $newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 07972b7a8c..0ac50aaaa7 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -13,6 +13,9 @@ function handle_pubsubhubbub() { $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0"); foreach($r as $rr) { + + logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG); + $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']); $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); From b9abfd24f08fd5d067eada2a67f0c0d760092db8 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 14 Dec 2015 22:39:52 +0100 Subject: [PATCH 11/15] Rearrangements --- include/notifier.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 0f4e35e4fe..45ccf5e40f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -223,6 +223,8 @@ function notifier_run(&$argv, &$argc){ if(! ($mail || $fsuggest || $relocate)) { + $slap = ostatus_salmon($target_item,$owner); + require_once('include/group.php'); $parent = $items[0]; @@ -267,12 +269,12 @@ function notifier_run(&$argv, &$argc){ $relay_to_owner = false; - if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { + if(!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) { $relay_to_owner = true; } - if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) { + if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) { $relay_to_owner = true; } @@ -411,12 +413,9 @@ function notifier_run(&$argv, &$argc){ if(count($r)) $contacts = $r; - } - if (!$normal_mode) + } else $public_message = false; - else - $slap = ostatus_salmon($target_item,$owner); // If this is a public message and pubmail is set on the parent, include all your email contacts @@ -521,8 +520,8 @@ function notifier_run(&$argv, &$argc){ // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts // They are especially used for notifications to OStatus users that don't follow us. - if($slap && count($url_recipients) && ($public_message || $push_notify) && (!$expire)) { - if(! get_config('system','dfrn_only')) { + if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) { + if(!get_config('system','dfrn_only')) { foreach($url_recipients as $url) { if($url) { logger('notifier: urldelivery: ' . $url); From ca4be3ded39149d21fa5d61bbc4676968ee79579 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 16 Dec 2015 10:47:26 +0100 Subject: [PATCH 12/15] Don't generate a guid shorter than 13 characters --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 19cfd71a8a..9f7a1b2f2e 100644 --- a/boot.php +++ b/boot.php @@ -1248,7 +1248,7 @@ function get_guid($size=16, $prefix = "") { $prefix = substr($prefix, 0, $size - 22); return(str_replace(".", "", uniqid($prefix, true))); } else { - $prefix = substr($prefix, 0, $size - 13); + $prefix = substr($prefix, 0, max($size - 13, 0)); return(uniqid($prefix)); } } From 7ee1eb2978b7e20fabe4a8865e44e96942f55598 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 20 Dec 2015 10:44:03 +0100 Subject: [PATCH 13/15] Code clean up. --- include/ostatus.php | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index e0e6c2186e..09a21b64fa 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1150,13 +1150,6 @@ function ostatus_format_picture_post($body) { function ostatus_add_header($doc, $owner) { $a = get_app(); - $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`", - intval($owner["uid"])); - if (!$r) - return; - - $profile = $r[0]; - $root = $doc->createElementNS(NS_ATOM, 'feed'); $doc->appendChild($root); @@ -1171,12 +1164,12 @@ function ostatus_add_header($doc, $owner) { $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION); xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]); - xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"])); - xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"])); - xml_add_element($doc, $root, "logo", $profile["photo"]); + xml_add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"])); + xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"])); + xml_add_element($doc, $root, "logo", $owner["photo"]); xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME)); - $author = ostatus_add_author($doc, $owner, $profile); + $author = ostatus_add_author($doc, $owner); $root->appendChild($author); $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html"); @@ -1289,9 +1282,13 @@ function ostatus_get_attachment($doc, $root, $item) { } } -function ostatus_add_author($doc, $owner, $profile = array()) { +function ostatus_add_author($doc, $owner) { $a = get_app(); + $r = q("SELECT `homepage` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"])); + if ($r) + $profile = $r[0]; + $author = $doc->createElement("author"); xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); xml_add_element($doc, $author, "uri", $owner["url"]); @@ -1387,17 +1384,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) $entry->setAttribute("xmlns:ostatus", NS_OSTATUS); $entry->setAttribute("xmlns:statusnet", NS_STATUSNET); - if (!$repeat) { - $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`", - intval($owner["uid"])); - if (!$r) - return; - - $profile = $r[0]; - } - $profile = array(); - - $author = ostatus_add_author($doc, $owner, $profile); + $author = ostatus_add_author($doc, $owner); $entry->appendChild($author); $title = sprintf("New comment by %s", $owner["nick"]); From 61956e109828a79c02af77d6d2d63c59096ea387 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 22 Dec 2015 22:11:08 +0100 Subject: [PATCH 14/15] There is now a config value for the session management to not use the database --- include/auth.php | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/include/auth.php b/include/auth.php index 385f9f0cee..318b3d2580 100644 --- a/include/auth.php +++ b/include/auth.php @@ -5,8 +5,11 @@ require_once('include/security.php'); require_once('include/datetime.php'); function nuke_session() { - session_unset(); -/* + if (get_config('system', 'disable_database_session')) { + session_unset(); + return; + } + new_cookie(0); // make sure cookie is deleted on browser close, as a security measure unset($_SESSION['authenticated']); @@ -22,7 +25,7 @@ function nuke_session() { unset($_SESSION['my_address']); unset($_SESSION['addr']); unset($_SESSION['return_url']); -*/ + } @@ -58,13 +61,13 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p $check = get_config('system','paranoia'); // extra paranoia - if the IP changed, log them out if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) { - logger('Session address changed. Paranoid setting in effect, blocking session. ' + logger('Session address changed. Paranoid setting in effect, blocking session. ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); nuke_session(); goaway(z_root()); } - $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` + $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", intval($_SESSION['uid']) ); @@ -125,7 +128,7 @@ else { $openid->identity = $openid_url; $_SESSION['openid'] = $openid_url; $a = get_app(); - $openid->returnUrl = $a->get_baseurl(true) . '/openid'; + $openid->returnUrl = $a->get_baseurl(true) . '/openid'; goaway($openid->authUrl()); } catch (Exception $e) { notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'

'. t('The error message was:').' '.$e->getMessage()); @@ -162,8 +165,8 @@ else { // process normal login request - $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` - FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) + $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` + FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])), @@ -174,7 +177,7 @@ else { } if((! $record) || (! count($record))) { - logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); + logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); notice( t('Login failed.') . EOL ); goaway(z_root()); } @@ -206,14 +209,13 @@ else { } function new_cookie($time) { - $a = get_app(); + if (get_config('system', 'disable_database_session')) + $old_sid = session_id(); - $old_sid = session_id(); session_set_cookie_params($time); - //session_set_cookie_params($time, "/", $a->get_hostname()); - session_regenerate_id(false); - q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); - - logger("Session parameter lifetime: ".$time." - got: ".print_r(session_get_cookie_params(), true), LOGGER_DEBUG); + if (get_config('system', 'disable_database_session')) { + session_regenerate_id(false); + q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); + } } From 5b94c4fe41049533ee74843ff20ecd05f49a994d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 25 Dec 2015 19:57:38 +0100 Subject: [PATCH 15/15] Yes is no and no is yes ... --- include/auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/auth.php b/include/auth.php index 318b3d2580..a5b6432fff 100644 --- a/include/auth.php +++ b/include/auth.php @@ -209,12 +209,12 @@ else { } function new_cookie($time) { - if (get_config('system', 'disable_database_session')) + if (!get_config('system', 'disable_database_session')) $old_sid = session_id(); session_set_cookie_params($time); - if (get_config('system', 'disable_database_session')) { + if (!get_config('system', 'disable_database_session')) { session_regenerate_id(false); q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); }