X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=f00f682978ed5d25ebb272fa334bd310956dfdb3;hb=30a77cc10a21728efdca48e6cd3cb04586b1df23;hp=b798a605f91eb9a609dee34335949eafaff5847b;hpb=01b02dbcaa8532f965389375e961d9c47d74eeec;p=friendica.git diff --git a/include/ostatus.php b/include/ostatus.php index b798a605f9..f00f682978 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -161,6 +161,7 @@ class ostatus { } $contact["generation"] = 2; + $contact["hide"] = false; // OStatus contacts are never hidden $contact["photo"] = $author["author-avatar"]; update_gcontact($contact); } @@ -466,7 +467,7 @@ class ostatus { } // Is it a repeated post? - if ($repeat_of != "") { + if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) { $activityobjects = $xpath->query('activity:object', $entry)->item(0); if (is_object($activityobjects)) { @@ -492,6 +493,7 @@ class ostatus { $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue; $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue; + $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue; $orig_contact = $contact; $orig_author = self::fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false); @@ -501,6 +503,7 @@ class ostatus { $item["author-avatar"] = $orig_author["author-avatar"]; $item["body"] = add_page_info_to_body(html2bbcode($orig_body)); $item["created"] = $orig_created; + $item["edited"] = $orig_edited; $item["uri"] = $orig_uri; $item["plink"] = $orig_link; @@ -593,21 +596,25 @@ class ostatus { $last = get_config('system','ostatus_last_poll'); $poll_interval = intval(get_config('system','ostatus_poll_interval')); - if(! $poll_interval) - $poll_interval = OSTATUS_DEFAULT_POLL_INTERVAL; + if (!$poll_interval) { + $poll_interval = self::OSTATUS_DEFAULT_POLL_INTERVAL; + } // Don't poll if the interval is set negative - if (($poll_interval < 0) AND !$override) + if (($poll_interval < 0) AND !$override) { return; + } if (!$mentions) { $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe')); - if (!$poll_timeframe) - $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME; + if (!$poll_timeframe) { + $poll_timeframe = self::OSTATUS_DEFAULT_POLL_TIMEFRAME; + } } else { $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe')); - if (!$poll_timeframe) - $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS; + if (!$poll_timeframe) { + $poll_timeframe = self::OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS; + } } @@ -623,15 +630,16 @@ class ostatus { $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60)); - if ($mentions) + if ($mentions) { $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term` STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid` WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention` GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start)); - else + } else { $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start)); + } foreach ($conversations AS $conversation) { self::completion($conversation['url'], $conversation['uid']); @@ -691,6 +699,7 @@ class ostatus { } } + $contact["hide"] = false; // OStatus contacts are never hidden update_gcontact($contact); } @@ -802,11 +811,20 @@ class ostatus { } // Get the parent + $parents = q("SELECT `item`.`id`, `item`.`parent`, `item`.`uri`, `item`.`contact-id`, `item`.`type`, + `item`.`verb`, `item`.`visible` FROM `term` + STRAIGHT_JOIN `item` AS `thritem` ON `thritem`.`parent` = `term`.`oid` + STRAIGHT_JOIN `item` ON `item`.`parent` = `thritem`.`parent` + WHERE `term`.`uid` = %d AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`url` = '%s'", + intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url)); + +/* 2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement + $parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN (SELECT `parent` FROM `item` WHERE `id` IN (SELECT `oid` FROM `term` WHERE `uid` = %d AND `otype` = %d AND `type` = %d AND `url` = '%s'))", intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url)); - +*/ if ($parents) $parent = $parents[0]; elseif (count($item) > 0) { @@ -1548,10 +1566,13 @@ class ostatus { if ($xml) return $xml; - if ($item["verb"] == ACTIVITY_LIKE) + if ($item["verb"] == ACTIVITY_LIKE) { return self::like_entry($doc, $item, $owner, $toplevel); - else + } elseif (in_array($item["verb"], array(ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"))) { + return self::follow_entry($doc, $item, $owner, $toplevel); + } else { return self::note_entry($doc, $item, $owner, $toplevel); + } } /** @@ -1727,6 +1748,113 @@ class ostatus { return $entry; } + /** + * @brief Adds the person object element to the XML document + * + * @param object $doc XML document + * @param array $owner Contact data of the poster + * @param array $contact Contact data of the target + * + * @return object author element + */ + private function add_person_object($doc, $owner, $contact) { + + $object = $doc->createElement("activity:object"); + xml::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON); + + if ($contact['network'] == NETWORK_PHANTOM) { + xml::add_element($doc, $object, "id", $contact['url']); + return $object; + } + + xml::add_element($doc, $object, "id", $contact["alias"]); + xml::add_element($doc, $object, "title", $contact["nick"]); + + $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]); + xml::add_element($doc, $object, "link", "", $attributes); + + $attributes = array( + "rel" => "avatar", + "type" => "image/jpeg", // To-Do? + "media:width" => 175, + "media:height" => 175, + "href" => $contact["photo"]); + xml::add_element($doc, $object, "link", "", $attributes); + + xml::add_element($doc, $object, "poco:preferredUsername", $contact["nick"]); + xml::add_element($doc, $object, "poco:displayName", $contact["name"]); + + if (trim($contact["location"]) != "") { + $element = $doc->createElement("poco:address"); + xml::add_element($doc, $element, "poco:formatted", $contact["location"]); + $object->appendChild($element); + } + + return $object; + } + + /** + * @brief Adds a follow/unfollow entry element + * + * @param object $doc XML document + * @param array $item Data of the follow/unfollow message + * @param array $owner Contact data of the poster + * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)? + * + * @return object Entry element + */ + private function follow_entry($doc, $item, $owner, $toplevel) { + + $item["id"] = $item["parent"] = 0; + $item["created"] = $item["edited"] = date("c"); + $item["private"] = true; + + $contact = Probe::uri($item['follow']); + + if ($contact['alias'] == '') { + $contact['alias'] = $contact["url"]; + } else { + $item['follow'] = $contact['alias']; + } + + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", + intval($owner['uid']), dbesc(normalise_link($contact["url"]))); + + if (dbm::is_result($r)) { + $connect_id = $r[0]['id']; + } else { + $connect_id = 0; + } + + if ($item['verb'] == ACTIVITY_FOLLOW) { + $message = t('%s is now following %s.'); + $title = t('following'); + $action = "subscription"; + } else { + $message = t('%s stopped following %s.'); + $title = t('stopped following'); + $action = "unfollow"; + } + + $item["uri"] = $item['parent-uri'] = $item['thr-parent'] = + 'tag:'.get_app()->get_hostname(). + ','.date('Y-m-d').':'.$action.':'.$owner['uid']. + ':person:'.$connect_id.':'.$item['created']; + + $item["body"] = sprintf($message, $owner["nick"], $contact["nick"]); + + self::entry_header($doc, $entry, $owner, $toplevel); + + self::entry_content($doc, $entry, $item, $owner, $title); + + $object = self::add_person_object($doc, $owner, $contact); + $entry->appendChild($object); + + self::entry_footer($doc, $entry, $item, $owner); + + return $entry; + } + /** * @brief Adds a regular entry element * @@ -1819,7 +1947,7 @@ class ostatus { xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => App::get_baseurl()."/display/".$item["guid"])); - if ($complete) + if ($complete AND ($item["id"] > 0)) xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); xml::add_element($doc, $entry, "activity:verb", $verb); @@ -1868,9 +1996,11 @@ class ostatus { } } - xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", - "href" => App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"])); - xml::add_element($doc, $entry, "ostatus:conversation", App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]); + if (intval($item["parent"]) > 0) { + $conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]; + xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation)); + xml::add_element($doc, $entry, "ostatus:conversation", $conversation); + } $tags = item_getfeedtags($item); @@ -1916,7 +2046,7 @@ class ostatus { self::get_attachment($doc, $entry, $item); - if ($complete) { + if ($complete AND ($item["id"] > 0)) { $app = $item["app"]; if ($app == "") $app = "web"; @@ -1957,9 +2087,23 @@ class ostatus { $last_update = 'now -30 days'; $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); - - $items = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id` FROM `item` - INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` + $authorid = get_contact($owner["url"], 0); + + $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) + STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` + WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND + `item`.`author-id` = %d AND `item`.`created` > '%s' AND + NOT `item`.`deleted` AND NOT `item`.`private` AND + `thread`.`network` IN ('%s', '%s') + ORDER BY `item`.`created` DESC LIMIT 300", + intval($owner["uid"]), intval($owner["id"]), + intval($authorid), dbesc($check_date), + dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN)); + +/* 2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement + + $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` + STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid` 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` = '' @@ -1967,7 +2111,7 @@ class ostatus { 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 + ORDER BY `item`.`id` DESC LIMIT 0, 300", intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN), //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS), @@ -1977,7 +2121,7 @@ class ostatus { dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])), dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])) ); - +*/ $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true;