From 034f57337477e681c10bf318f22f70cb30062bed Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 24 Nov 2015 21:03:06 +0100 Subject: [PATCH] Bugfix: Bookmarks doesn't federate well. --- include/ostatus.php | 15 +++++++++++++-- include/pubsubpublish.php | 11 +++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/ostatus.php b/include/ostatus.php index 875e1527e..006a3be92 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1304,8 +1304,19 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) { $title = sprintf("New comment by %s", $owner["nick"]); } - xml_add_element($doc, $entry, "activity:object-type", $item["object-type"]); - xml_add_element($doc, $entry, "id", $item["uri"]); //tag:fresh.federati.net,2015-11-22:noticeId=324796:objectType=note + // To use the object-type "bookmark" we have to implement these elements: + // + // http://activitystrea.ms/schema/1.0/bookmark + // Historic Rocket Landing + // Nur ein Testbeitrag. + // + // + // + // 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); + xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "title", $title); if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 8ac468c31..d27beea3d 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -18,13 +18,12 @@ function handle_pubsubhubbub() { $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); $headers = array("Content-type: application/atom+xml", - sprintf("Link: <%s>;rel=hub," . - "<%s>;rel=self", - $a->get_baseurl() . '/pubsubhubbub', - $rr['topic']), - "X-Hub-Signature: sha1=" . $hmac_sig); + sprintf("Link: <%s>;rel=hub,<%s>;rel=self", + $a->get_baseurl().'/pubsubhubbub', + $rr['topic']), + "X-Hub-Signature: sha1=".$hmac_sig); - logger('POST '. print_r($headers, true)."\n".$params, LOGGER_DEBUG); + logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); post_url($rr['callback_url'], $params, $headers); $ret = $a->get_curl_code();