From 81b609562e2a5d0fef876653a6933581b35003e9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 9 Jun 2015 23:53:53 +0200 Subject: [PATCH] Fetch the hub adress while parsing OStatus messages. --- include/ostatus.php | 9 +++++++++ include/ostatus_conversation.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/ostatus.php b/include/ostatus.php index 41499a2c3f..f57b148172 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -84,6 +84,15 @@ function ostatus_import($xml,$importer,&$contact, &$hub) { $xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0"); $xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/"); + $gub = ""; + $hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes; + if (is_object($hub_attributes)) + foreach($hub_attributes AS $hub_attribute) + if ($hub_attribute->name == "href") { + $hub = $hub_attribute->textContent; + logger("Found hub ".$hub, LOGGER_DEBUG); + } + $header = array(); $header["uid"] = $importer["uid"]; $header["network"] = NETWORK_OSTATUS; diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php index 9642ae1dbf..f897a058a3 100644 --- a/include/ostatus_conversation.php +++ b/include/ostatus_conversation.php @@ -246,7 +246,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio $arr["author-name"] = $arr["owner-name"]; $arr["author-link"] = $actor; $arr["author-avatar"] = $single_conv->actor->image->url; - $arr["body"] = html2bbcode($single_conv->content); + $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->content)); if (isset($single_conv->status_net->notice_info->source)) $arr["app"] = strip_tags($single_conv->status_net->notice_info->source);