const OSTATUS_DEFAULT_POLL_TIMEFRAME = 1440; // given in minutes
const OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS = 14400; // given in minutes
+ /**
+ * @brief Mix two paths together to possibly fix missing parts
+ *
+ * @param string $avatar Path to the avatar
+ * @param string $base Another path that is hopefully complete
+ *
+ * @return string fixed avatar path
+ */
+ public static function fix_avatar($avatar, $base) {
+ $base_parts = parse_url($base);
+
+ // Remove all parts that could create a problem
+ unset($base_parts['path']);
+ unset($base_parts['query']);
+ unset($base_parts['fragment']);
+
+ $avatar_parts = parse_url($avatar);
+
+ // Now we mix them
+ $parts = array_merge($base_parts, $avatar_parts);
+
+ // And put them together again
+ $scheme = isset($parts['scheme']) ? $parts['scheme'] . '://' : '';
+ $host = isset($parts['host']) ? $parts['host'] : '';
+ $port = isset($parts['port']) ? ':' . $parts['port'] : '';
+ $path = isset($parts['path']) ? $parts['path'] : '';
+ $query = isset($parts['query']) ? '?' . $parts['query'] : '';
+ $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
+
+ $fixed = $scheme.$host.$port.$path.$query.$fragment;
+
+ logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
+
+ return $fixed;
+ }
+
/**
* @brief Fetches author data
*
* @param bool $onlyfetch Only fetch the header without updating the contact entries
*
* @return array Array of author related entries for the item
- * @todo Add type-hints
*/
private function fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
- /// @TODO One statment is enough ...
$author = array();
$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
$author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue;
$aliaslink = $author["author-link"];
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
- if (is_object($alternate)) {
- /// @TODO foreach () may only later work on objects that have iterator interface implemented, please check this
- foreach ($alternate AS $attributes) {
- if ($attributes->name == "href") {
+ if (is_object($alternate))
+ foreach($alternate AS $attributes)
+ if ($attributes->name == "href")
$author["author-link"] = $attributes->textContent;
- }
- }
- }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["author-link"])),
dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET));
- if (dbm::is_result($r)) {
+ if ($r) {
$contact = $r[0];
$author["contact-id"] = $r[0]["id"];
- } else {
+ } else
$author["contact-id"] = $contact["id"];
- }
$avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
- foreach ($avatars AS $avatar) {
+ foreach($avatars AS $avatar) {
$href = "";
$width = 0;
- foreach ($avatar->attributes AS $attributes) {
- if ($attributes->name == "href") {
+ foreach($avatar->attributes AS $attributes) {
+ if ($attributes->name == "href")
$href = $attributes->textContent;
- }
- if ($attributes->name == "width") {
+ if ($attributes->name == "width")
$width = $attributes->textContent;
- }
}
- if (($width > 0) AND ($href != "")) {
+ if (($width > 0) AND ($href != ""))
$avatarlist[$width] = $href;
- }
}
if (count($avatarlist) > 0) {
krsort($avatarlist);
- $author["author-avatar"] = current($avatarlist);
+ $author["author-avatar"] = self::fix_avatar(current($avatarlist), $author["author-link"]);
}
$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
- if ($displayname != "") {
+ if ($displayname != "")
$author["author-name"] = $displayname;
- }
$author["owner-name"] = $author["author-name"];
$author["owner-link"] = $author["author-link"];
$author["owner-avatar"] = $author["author-avatar"];
// Only update the contacts if it is an OStatus contact
- if (dbm::is_result($r) AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
+ if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
// Update contact data
// $contact["poll"] = $value;
$value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
- if ($value != "") {
+ if ($value != "")
$contact["alias"] = $value;
- }
$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
- if ($value != "") {
+ if ($value != "")
$contact["name"] = $value;
- }
$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
- if ($value != "") {
+ if ($value != "")
$contact["nick"] = $value;
- }
$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
- if ($value != "") {
+ if ($value != "")
$contact["about"] = html2bbcode($value);
- }
$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
- if ($value != "") {
+ if ($value != "")
$contact["location"] = $value;
- }
if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR
($contact["alias"] != $r[0]["alias"]) OR ($contact["location"] != $r[0]["location"])) {
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["alias"]),
dbesc($contact["about"]), dbesc($contact["location"]),
dbesc(datetime_convert()), intval($contact["id"]));
-
- poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
- "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
}
if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) {
$contact["generation"] = 2;
$contact["hide"] = false; // OStatus contacts are never hidden
$contact["photo"] = $author["author-avatar"];
- update_gcontact($contact);
+ $gcid = update_gcontact($contact);
+
+ link_gcontact($gcid, $contact["uid"], $contact["id"]);
}
return($author);
* @param array $importer user record of the importing user
*
* @return array Array of author related entries for the item
- * @todo add type-hints
*/
public static function salmon_author($xml, $importer) {
- if ($xml == "") {
+ if ($xml == "")
return;
- }
$doc = new DOMDocument();
- $doc->loadXML($xml);
+ @$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
}
}
+ /**
+ * @brief Read attributes from element
+ *
+ * @param object $element Element object
+ *
+ * @return array attributes
+ */
+ private static function read_attributes($element) {
+ $attribute = array();
+
+ foreach ($element->attributes AS $attributes) {
+ $attribute[$attributes->name] = $attributes->textContent;
+ }
+
+ return $attribute;
+ }
+
/**
* @brief Imports an XML string containing OStatus elements
*
* @param array $importer user record of the importing user
* @param $contact
* @param array $hub Called by reference, returns the fetched hub data
- * @todo Add missing-type hint + determine type for $contact
*/
public static function import($xml,$importer,&$contact, &$hub) {
/// @todo this function is too long. It has to be split in many parts
if ($xml == "") {
return;
}
-
//$tempfile = tempnam(get_temppath(), "import");
//file_put_contents($tempfile, $xml);
$doc = new DOMDocument();
- $doc->loadXML($xml);
+ @$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', NAMESPACE_ATOM1);
}
}
}
-
- /// @TODO One statement is enough ...
$header = array();
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_OSTATUS;
} else {
$entries = $xpath->query('/atom:entry');
}
-
$conversation = "";
$conversationlist = array();
$item_id = 0;
// Reverse the order of the entries
$entrylist = array();
- foreach ($entries AS $entry)
+ foreach ($entries AS $entry) {
$entrylist[] = $entry;
-
+ }
foreach (array_reverse($entrylist) AS $entry) {
$mention = false;
} else {
$author = self::fetchauthor($xpath, $entry, $importer, $contact, false);
}
-
$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
if ($value != "") {
$nickname = $value;
} else {
$nickname = $author["author-name"];
}
-
$item = array_merge($header, $author);
// Now get the item
$item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue));
$item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+ $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
+
+ // Mastodon Content Warning
+ if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) {
+ $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+
+ $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]';
+ }
if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
}
-
$item["object"] = $xml;
- $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
/// @TODO
/// Delete a message
- if ($item["verb"] == "qvitter-delete-notice") {
+ if ($item["verb"] == "qvitter-delete-notice" || $item["verb"] == ACTIVITY_DELETE) {
// ignore "Delete" messages (by now)
logger("Ignore delete message ".print_r($item, true));
continue;
if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE))) {
logger("Unhandled verb ".$item["verb"]." ".print_r($item, true));
}
-
$item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
$item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
$conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
}
$georsspoint = $xpath->query('georss:point', $entry);
- if ($georsspoint)
+ if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue;
-
+ }
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
foreach ($categories AS $category) {
- foreach ($category->attributes AS $attributes)
+ foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if (strlen($item["tag"]))
+ if(strlen($item["tag"])) {
$item["tag"] .= ',';
+ }
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
}
+ }
}
}
$links = $xpath->query('atom:link', $entry);
if ($links) {
- $rel = "";
- $href = "";
- $type = "";
- $length = "0";
- $title = "";
foreach ($links AS $link) {
- foreach ($link->attributes AS $attributes) {
- if ($attributes->name == "href")
- $href = $attributes->textContent;
- if ($attributes->name == "rel")
- $rel = $attributes->textContent;
- if ($attributes->name == "type")
- $type = $attributes->textContent;
- if ($attributes->name == "length")
- $length = $attributes->textContent;
- if ($attributes->name == "title")
- $title = $attributes->textContent;
- }
- if (($rel != "") AND ($href != "")) {
- switch($rel) {
+ $attribute = self::read_attributes($link);
+
+ if (($attribute['rel'] != "") AND ($attribute['href'] != "")) {
+ switch ($attribute['rel']) {
case "alternate":
- $item["plink"] = $href;
+ $item["plink"] = $attribute['href'];
if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
- ($item["object-type"] == ACTIVITY_OBJ_EVENT))
- $item["body"] .= add_page_info($href);
+ ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+ $item["body"] .= add_page_info($attribute['href']);
+ }
break;
case "ostatus:conversation":
- $conversation = $href;
+ $conversation = $attribute['href'];
break;
case "enclosure":
- $enclosure = $href;
- if (strlen($item["attach"]))
+ $enclosure = $attribute['href'];
+ if (strlen($item["attach"])) {
$item["attach"] .= ',';
-
- $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+ }
+ if (!isset($attribute['length'])) {
+ $attribute['length'] = "0";
+ }
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
break;
case "related":
if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
- if (!isset($item["parent-uri"]))
- $item["parent-uri"] = $href;
-
- if ($related == "")
- $related = $href;
- } else
- $item["body"] .= add_page_info($href);
+ if (!isset($item["parent-uri"])) {
+ $item["parent-uri"] = $attribute['href'];
+ }
+ if ($related == "") {
+ $related = $attribute['href'];
+ }
+ } else {
+ $item["body"] .= add_page_info($attribute['href']);
+ }
break;
case "self":
- $self = $href;
+ $self = $attribute['href'];
break;
case "mentioned":
// Notification check
- if ($importer["nurl"] == normalise_link($href))
+ if ($importer["nurl"] == normalise_link($attribute['href'])) {
$mention = true;
+ }
break;
}
}
if (!isset($orig_uri)) {
$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
}
-
$orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
if ($orig_links AND ($orig_links->length > 0)) {
foreach ($orig_links->item(0)->attributes AS $attributes) {
}
}
}
-
if (!isset($orig_link)) {
$orig_link = $xpath->query("atom:link[@rel='alternate']", $activityobjects)->item(0)->nodeValue;
}
-
if (!isset($orig_link)) {
$orig_link = self::convert_href($orig_uri);
}
-
$orig_body = $xpath->query('activity:object/atom:content/text()', $activityobjects)->item(0)->nodeValue;
-
if (!isset($orig_body)) {
$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;
$item["author-name"] = $orig_author["author-name"];
$item["author-link"] = $orig_author["author-link"];
$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;
+
+ if (!isset($item["plink"])) {
+ $item["plink"] = $orig_link;
+ }
$item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
$item["object-type"] = $xpath->query('activity:object/activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
-
if (!isset($item["object-type"])) {
$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
}
+
+ $enclosures = $xpath->query("atom:link[@rel='alternate']", $activityobjects);
+ if ($enclosures) {
+ foreach ($enclosures AS $link) {
+ $attribute = self::read_attributes($link);
+ if ($href != "") {
+ $enclosure = $attribute['href'];
+ if (strlen($item["attach"])) {
+ $item["attach"] .= ',';
+ }
+ if (!isset($attribute['length'])) {
+ $attribute['length'] = "0";
+ }
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+ }
+ }
+ }
}
}
intval($importer["uid"]), dbesc($item["parent-uri"]));
}
}
-
if (dbm::is_result($r)) {
$item["type"] = 'remote-comment';
$item["gravity"] = GRAVITY_COMMENT;
} else {
$item["parent-uri"] = $item["uri"];
}
-
$item_id = self::completion($conversation, $importer["uid"], $item, $self);
if (!$item_id) {
public static function convert_href($href) {
$elements = explode(":",$href);
- if ((count($elements) <= 2) OR ($elements[0] != "tag")) {
+ if ((count($elements) <= 2) OR ($elements[0] != "tag"))
return $href;
- }
$server = explode(",", $elements[1]);
$conversation = explode("=", $elements[2]);
- if ((count($elements) == 4) AND ($elements[2] == "post")) {
+ if ((count($elements) == 4) AND ($elements[2] == "post"))
return "http://".$server[0]."/notice/".$elements[3];
- }
- if ((count($conversation) != 2) OR ($conversation[1] =="")) {
+ if ((count($conversation) != 2) OR ($conversation[1] ==""))
return $href;
- }
- if ($elements[3] == "objectType=thread") {
+ if ($elements[3] == "objectType=thread")
return "http://".$server[0]."/conversation/".$conversation[1];
- } else {
+ else
return "http://".$server[0]."/notice/".$conversation[1];
- }
return $href;
}
$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));
+ GROUP BY `term`.`url`, `term`.`uid`, `term`.`oid`, `term`.`term` ORDER BY `term`.`term` DESC", dbesc($start));
} 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));
+ GROUP BY `url`, `uid`, `oid`, `term` ORDER BY `term` DESC", dbesc($start));
}
foreach ($conversations AS $conversation) {
* @brief Updates the gcontact table with actor data from the conversation
*
* @param object $actor The actor object that contains the contact data
- * @todo Add type-hint
*/
private function conv_fetch_actor($actor) {
// We set the generation to "3" since the data here is not as reliable as the data we get on other occasions
$contact = array("network" => NETWORK_OSTATUS, "generation" => 3);
- if (isset($actor->url)) {
+ if (isset($actor->url))
$contact["url"] = $actor->url;
- }
- if (isset($actor->displayName)) {
+ if (isset($actor->displayName))
$contact["name"] = $actor->displayName;
- }
- if (isset($actor->portablecontacts_net->displayName)) {
+ if (isset($actor->portablecontacts_net->displayName))
$contact["name"] = $actor->portablecontacts_net->displayName;
- }
- if (isset($actor->portablecontacts_net->preferredUsername)) {
+ if (isset($actor->portablecontacts_net->preferredUsername))
$contact["nick"] = $actor->portablecontacts_net->preferredUsername;
- }
- if (isset($actor->id)) {
+ if (isset($actor->id))
$contact["alias"] = $actor->id;
- }
- if (isset($actor->summary)) {
+ if (isset($actor->summary))
$contact["about"] = $actor->summary;
- }
- if (isset($actor->portablecontacts_net->note)) {
+ if (isset($actor->portablecontacts_net->note))
$contact["about"] = $actor->portablecontacts_net->note;
- }
- if (isset($actor->portablecontacts_net->addresses->formatted)) {
+ if (isset($actor->portablecontacts_net->addresses->formatted))
$contact["location"] = $actor->portablecontacts_net->addresses->formatted;
- }
- if (isset($actor->image->url)) {
+ if (isset($actor->image->url))
$contact["photo"] = $actor->image->url;
- }
- if (isset($actor->image->width)) {
+ if (isset($actor->image->width))
$avatarwidth = $actor->image->width;
- }
if (is_array($actor->status_net->avatarLinks))
foreach ($actor->status_net->avatarLinks AS $avatar) {
if ($conversation_id != "") {
$elements = explode(":", $conversation_id);
- if ((count($elements) <= 2) OR ($elements[0] != "tag")) {
+ if ((count($elements) <= 2) OR ($elements[0] != "tag"))
return $conversation_id;
- }
}
- if ($self == "") {
+ if ($self == "")
return "";
- }
$json = str_replace(".atom", ".json", $self);
$raw = fetch_url($json);
- if ($raw == "") {
+ if ($raw == "")
return "";
- }
$data = json_decode($raw);
- if (!is_object($data)) {
+ if (!is_object($data))
return "";
- }
$conversation_id = $data->statusnet_conversation_id;
$contact = q("SELECT `id`, `rel`, `network` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
$uid, normalise_link($actor), NETWORK_STATUSNET);
- if (!dbm::is_result($contact)) {
+ if (!$contact)
$contact = q("SELECT `id`, `rel`, `network` FROM `contact` WHERE `uid` = %d AND `alias` IN ('%s', '%s') AND `network` != '%s'",
$uid, $actor, normalise_link($actor), NETWORK_STATUSNET);
- }
- if (dbm::is_result($contact)) {
+ if ($contact) {
logger("Found contact for url ".$actor, LOGGER_DEBUG);
$details["contact_id"] = $contact[0]["id"];
$details["network"] = $contact[0]["network"];
* @param array $item Data of the item that is to be posted
*
* @return integer The item id of the posted item array
- * @todo Add type-hints
*/
private function completion($conversation_url, $uid, $item = array(), $self = "") {
/// @todo This function is totally ugly and has to be rewritten totally
+ // Import all threads or only threads that were started by our followers?
+ $all_threads = !get_config('system','ostatus_full_threads');
+
$item_stored = -1;
$conversation_url = self::fetch_conversation($self, $conversation_url);
// Don't do a completion on liked content
if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR
($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) {
- $item_stored = item_store($item, true);
- return($item_stored);
+ $item_stored = item_store($item, $all_threads);
+ return $item_stored;
}
// Get the parent
(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 (dbm::is_result($parents)) {
+ if ($parents)
$parent = $parents[0];
- } elseif (count($item) > 0) {
+ elseif (count($item) > 0) {
$parent = $item;
$parent["type"] = "remote";
$parent["verb"] = ACTIVITY_POST;
} else {
// Preset the parent
$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid);
- if (!dbm::is_result($r)) {
+ if (!$r)
return(-2);
- }
- /// @TODO one statement is enough ...
$parent = array();
$parent["id"] = 0;
$parent["parent"] = 0;
} elseif (!$conv_arr["success"] AND (substr($conv, 0, 8) == "https://")) {
$conv = str_replace("https://", "http://", $conv);
$conv_as = fetch_url($conv."?page=".$pageno);
- } else {
+ } else
$conv_as = $conv_arr["body"];
- }
$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
$conv_as = json_decode($conv_as);
$no_of_items = sizeof($items);
- if (is_array($conv_as->items)) {
- foreach ($conv_as->items AS $single_item) {
+ if (@is_array($conv_as->items))
+ foreach ($conv_as->items AS $single_item)
$items[$single_item->id] = $single_item;
- }
- }
- if ($no_of_items == sizeof($items)) {
+ if ($no_of_items == sizeof($items))
break;
- }
$pageno++;
if (!sizeof($items)) {
if (count($item) > 0) {
- $item_stored = item_store($item, true);
+ $item_stored = item_store($item, $all_threads);
if ($item_stored) {
logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
}
return($item_stored);
- } else {
+ } else
return(-3);
- }
}
$items = array_reverse($items);
$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
-
- if (!dbm::is_result($r)) {
- logger("Failed query, uid=" . intval($uid) ." in " . __FUNCTION__);
- killme();
- }
-
$importer = $r[0];
$new_parent = true;
$mention = false;
- if (isset($single_conv->object->id)) {
+ if (isset($single_conv->object->id))
$single_conv->id = $single_conv->object->id;
- }
$plink = self::convert_href($single_conv->id);
- if (isset($single_conv->object->url)) {
+ if (isset($single_conv->object->url))
$plink = self::convert_href($single_conv->object->url);
- }
- if (!isset($single_conv->id)) {
+ if (@!$single_conv->id)
continue;
- }
logger("Got id ".$single_conv->id, LOGGER_DEBUG);
(SELECT `parent` FROM `item`
WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s')) LIMIT 1",
intval($uid), dbesc($first_id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
- if (dbm::is_result($new_parents)) {
+ if ($new_parents) {
if ($new_parents[0]["parent"] == $parent["parent"]) {
// Option 2: This post is already present inside our thread - but not as thread starter
logger("Option 2: uri present in our thread: ".$first_id, LOGGER_DEBUG);
if (isset($single_conv->context->inReplyTo->id)) {
$parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
intval($uid), dbesc($single_conv->context->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
- if (dbm::is_result($parent_exists)) {
+ if ($parent_exists)
$parent_uri = $single_conv->context->inReplyTo->id;
- }
}
// This is the current way
if (isset($single_conv->object->inReplyTo->id)) {
$parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
intval($uid), dbesc($single_conv->object->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
- if (dbm::is_result($parent_exists)) {
+ if ($parent_exists)
$parent_uri = $single_conv->object->inReplyTo->id;
- }
}
$message_exists = q("SELECT `id`, `parent`, `uri` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
continue;
}
- if (is_array($single_conv->to)) {
- foreach ($single_conv->to AS $to) {
- if ($importer["nurl"] == normalise_link($to->id)) {
+ if (is_array($single_conv->to))
+ foreach($single_conv->to AS $to)
+ if ($importer["nurl"] == normalise_link($to->id))
$mention = true;
- }
- }
- }
$actor = $single_conv->actor->id;
- if (isset($single_conv->actor->url)) {
+ if (isset($single_conv->actor->url))
$actor = $single_conv->actor->url;
- }
$details = self::get_actor_details($actor, $uid, $parent["contact-id"]);
continue;
}
- /// @TODO One statment is okay (until if () )
$arr = array();
$arr["network"] = $details["network"];
$arr["uri"] = $single_conv->id;
$arr["created"] = $single_conv->published;
$arr["edited"] = $single_conv->published;
$arr["owner-name"] = $single_conv->actor->displayName;
-
- if ($arr["owner-name"] == '') {
+ if ($arr["owner-name"] == '')
$arr["owner-name"] = $single_conv->actor->contact->displayName;
- }
- if ($arr["owner-name"] == '') {
+ if ($arr["owner-name"] == '')
$arr["owner-name"] = $single_conv->actor->portablecontacts_net->displayName;
- }
$arr["owner-link"] = $actor;
- $arr["owner-avatar"] = $single_conv->actor->image->url;
+ $arr["owner-avatar"] = self::fix_avatar($single_conv->actor->image->url, $arr["owner-link"]);
+
$arr["author-name"] = $arr["owner-name"];
- $arr["author-link"] = $actor;
- $arr["author-avatar"] = $single_conv->actor->image->url;
+ $arr["author-link"] = $arr["owner-link"];
+ $arr["author-avatar"] = $arr["owner-avatar"];
$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->content));
- if (isset($single_conv->status_net->notice_info->source)) {
+ if (isset($single_conv->status_net->notice_info->source))
$arr["app"] = strip_tags($single_conv->status_net->notice_info->source);
- } elseif (isset($single_conv->statusnet->notice_info->source)) {
+ elseif (isset($single_conv->statusnet->notice_info->source))
$arr["app"] = strip_tags($single_conv->statusnet->notice_info->source);
- } elseif (isset($single_conv->statusnet_notice_info->source)) {
+ elseif (isset($single_conv->statusnet_notice_info->source))
$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
- } elseif (isset($single_conv->provider->displayName)) {
+ elseif (isset($single_conv->provider->displayName))
$arr["app"] = $single_conv->provider->displayName;
- } else {
+ else
$arr["app"] = "OStatus";
- }
+
$arr["object"] = json_encode($single_conv);
$arr["verb"] = $parent["verb"];
// Is it a reshared item?
if (isset($single_conv->verb) AND ($single_conv->verb == "share") AND isset($single_conv->object)) {
- if (is_array($single_conv->object)) {
+ if (is_array($single_conv->object))
$single_conv->object = $single_conv->object[0];
- }
logger("Found reshared item ".$single_conv->object->id);
// $single_conv->object->context->conversation;
- if (isset($single_conv->object->object->id)) {
+ if (isset($single_conv->object->object->id))
$arr["uri"] = $single_conv->object->object->id;
- } else {
+ else
$arr["uri"] = $single_conv->object->id;
- }
- if (isset($single_conv->object->object->url)) {
+ if (isset($single_conv->object->object->url))
$plink = self::convert_href($single_conv->object->object->url);
- } else {
+ else
$plink = self::convert_href($single_conv->object->url);
- }
- if (isset($single_conv->object->object->content)) {
+ if (isset($single_conv->object->object->content))
$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->object->content));
- } else {
+ else
$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->content));
- }
$arr["plink"] = $plink;
if ($arr["owner-name"] == '') {
$arr["author-name"] = $single_conv->object->actor->contact->displayName;
}
-
$arr["author-link"] = $single_conv->object->actor->url;
- $arr["author-avatar"] = $single_conv->object->actor->image->url;
+ $arr["author-avatar"] = self::fix_avatar($single_conv->object->actor->image->url, $arr["author-link"]);
$arr["app"] = $single_conv->object->provider->displayName."#";
//$arr["verb"] = $single_conv->object->verb;
$arr["coord"] = trim($single_conv->object->location->lat." ".$single_conv->object->location->lon);
}
- if ($arr["location"] == "") {
+ if ($arr["location"] == "")
unset($arr["location"]);
- }
- if ($arr["coord"] == "") {
+ if ($arr["coord"] == "")
unset($arr["coord"]);
- }
// Copy fields from given item array
if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] == $single_conv->id))) {
$copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar",
"gravity", "body", "object-type", "object", "verb", "created", "edited", "coord", "tag",
"title", "attach", "app", "type", "location", "contact-id", "uri");
- foreach ($copy_fields AS $field) {
- if (isset($item[$field])) {
+ foreach ($copy_fields AS $field)
+ if (isset($item[$field]))
$arr[$field] = $item[$field];
- }
- }
}
logger('setting new parent to id '.$newitem);
$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval($uid), intval($newitem));
- if (dbm::is_result($new_parents)) {
+ if ($new_parents)
$parent = $new_parents[0];
- }
}
}
}
}
- $item_stored = item_store($item, true);
+ $item_stored = item_store($item, $all_threads);
if ($item_stored) {
logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
self::store_conversation($item_stored, $conversation_url);
$conversation_url = self::convert_href($conversation_url);
$messages = q("SELECT `uid`, `parent`, `created`, `received`, `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
-
- if (!dbm::is_result($messages)) {
+ if (!$messages)
return;
- }
-
$message = $messages[0];
// Store conversation url if not done before
$conversation = q("SELECT `url` FROM `term` WHERE `uid` = %d AND `oid` = %d AND `otype` = %d AND `type` = %d",
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION));
- if (!dbm::is_result($conversation)) {
+ if (!$conversation) {
$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`, `created`, `received`, `guid`) VALUES (%d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s')",
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION),
dbesc($message["created"]), dbesc($conversation_url), dbesc($message["created"]), dbesc($message["received"]), dbesc($message["guid"]));
* @param array $item The item array of thw post
*
* @return string The guid if the post is a reshare
- * @todo Add type-hints
*/
private 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) {
+ if (strpos($body, "[share") > 0)
return("");
- }
// Does it end with a share?
- if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+ 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) {
+ if ($body == $attributes)
return(false);
- }
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if ($matches[1] != "")
$guid = $matches[1];
- }
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if ($matches[1] != "")
$guid = $matches[1];
- }
return $guid;
}
$siteinfo = get_attached_data($body);
if (($siteinfo["type"] == "photo")) {
- if (isset($siteinfo["preview"])) {
+ if (isset($siteinfo["preview"]))
$preview = $siteinfo["preview"];
- } else {
+ else
$preview = $siteinfo["image"];
- }
// Is it a remote picture? Then make a smaller preview here
$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
$preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
$preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
- if (isset($siteinfo["url"])) {
+ if (isset($siteinfo["url"]))
$url = $siteinfo["url"];
- } else {
+ else
$url = $siteinfo["image"];
- }
$body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
}
* @param array $owner Contact data of the poster
*
* @return object header root element
- * @todo Add type-hints
*/
private function add_header($doc, $owner) {
*
* @param object $doc XML document
* @param object $root XML root element where the hub links are added
- * @todo Add type-hints
*/
public static function hublinks($doc, $root) {
$hub = get_config('system','huburl');
$hubxml = '';
- if (strlen($hub)) {
+ if(strlen($hub)) {
$hubs = explode(',', $hub);
- if (count($hubs)) {
- foreach ($hubs as $h) {
+ if(count($hubs)) {
+ foreach($hubs as $h) {
$h = trim($h);
- if (! strlen($h)) {
+ if(! strlen($h))
continue;
- }
- if ($h === '[internal]') {
+ if ($h === '[internal]')
$h = App::get_baseurl() . '/pubsubhubbub';
- }
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
}
}
* @param object $doc XML document
* @param object $root XML root element where the hub links are added
* @param array $item Data of the item that is to be posted
- * @todo Add type-hints
*/
private function get_attachment($doc, $root, $item) {
$o = "";
$arr = explode('[/attach],',$item['attach']);
- if (count($arr)) {
- foreach ($arr as $r) {
+ if(count($arr)) {
+ foreach($arr as $r) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
- if ($cnt) {
+ if($cnt) {
$attributes = array("rel" => "enclosure",
"href" => $matches[1],
"type" => $matches[3]);
- if (intval($matches[2])) {
+ if(intval($matches[2]))
$attributes["length"] = intval($matches[2]);
- }
- if (trim($matches[4]) != "") {
+ if(trim($matches[4]) != "")
$attributes["title"] = trim($matches[4]);
- }
xml::add_element($doc, $root, "link", "", $attributes);
}
* @param array $owner Contact data of the poster
*
* @return object author element
- * @todo Add type-hints
*/
private function add_author($doc, $owner) {
- $profile = null;
$r = q("SELECT `homepage` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
- if (dbm::is_result($r)) {
+ if ($r)
$profile = $r[0];
- }
$author = $doc->createElement("author");
xml::add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
* @param array $item Data of the item that is to be posted
*
* @return string activity
- * @todo Add type-hints
*/
function construct_verb($item) {
- if ($item['verb']) {
+ if ($item['verb'])
return $item['verb'];
- }
return ACTIVITY_POST;
}
* @param array $item Data of the item that is to be posted
*
* @return string Object type
- * @todo Add type-hints
*/
function construct_objecttype($item) {
- if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT))) {
+ if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT)))
return $item['object-type'];
- };
return ACTIVITY_OBJ_NOTE;
}
* @param array $contact Array of the contact that is added
*
* @return object Source element
- * @todo Add type-hints
*/
private function source_entry($doc, $contact) {
$source = $doc->createElement("source");
* @param array $owner Contact data of the poster
*
* @return array Contact array
- * @todo Add array type-hint for $owner
*/
private function contact_entry($url, $owner) {
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
dbesc(normalise_link($url)), intval($owner["uid"]));
- if (dbm::is_result($r)) {
+ if ($r) {
$contact = $r[0];
$contact["uid"] = -1;
- } else {
+ }
+
+ if (!$r) {
$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($url)));
- if (dbm::is_result($r)) {
+ if ($r) {
$contact = $r[0];
$contact["uid"] = -1;
$contact["success_update"] = $contact["updated"];
}
}
- if (!dbm::is_result($r)) {
- $contact = $owner;
- }
+ if (!$r)
+ $contact = owner;
if (!isset($contact["poll"])) {
$data = probe_url($url);
$contact["poll"] = $data["poll"];
- if (!$contact["alias"]) {
+ if (!$contact["alias"])
$contact["alias"] = $data["alias"];
- }
}
- if (!isset($contact["alias"])) {
+ if (!isset($contact["alias"]))
$contact["alias"] = $contact["url"];
- }
return $contact;
}
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
- * @todo Add type-hints
*/
private function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) {
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
intval($owner["uid"]), dbesc($repeated_guid),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
-
- if (!dbm::is_result($r)) {
+ if ($r)
+ $repeated_item = $r[0];
+ else
return false;
- }
-
- $repeated_item = $r[0];
$contact = self::contact_entry($repeated_item['author-link'], $owner);
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element with "like"
- * @todo Add type-hints
*/
private function like_entry($doc, $item, $owner, $toplevel) {
* @param array $contact Contact data of the target
*
* @return object author element
- * @todo Add type-hints
*/
private function add_person_object($doc, $owner, $contact) {
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
- * @todo Add type-hints
*/
private function follow_entry($doc, $item, $owner, $toplevel) {
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return object Entry element
- * @todo Add type-hints
*/
private function note_entry($doc, $item, $owner, $toplevel) {
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
* @return string The title for the element
- * @todo Add type-hints
*/
private function entry_header($doc, &$entry, $owner, $toplevel) {
/// @todo Check if this title stuff is really needed (I guess not)
* @param string $title Title for the post
* @param string $verb The activity verb
* @param bool $complete Add the "status_net" element?
- * @todo Add type-hints
*/
private function entry_content($doc, $entry, $item, $owner, $title, $verb = "", $complete = true) {
- if ($verb == "") {
+ if ($verb == "")
$verb = self::construct_verb($item);
- }
xml::add_element($doc, $entry, "id", $item["uri"]);
xml::add_element($doc, $entry, "title", $title);
$body = self::format_picture_post($item['body']);
- if ($item['title'] != "") {
+ if ($item['title'] != "")
$body = "[b]".$item['title']."[/b]\n\n".$body;
- }
$body = bbcode($body, false, false, 7);
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param $complete
- * @todo Add type-hints
*/
private function entry_footer($doc, $entry, $item, $owner, $complete = true) {
$mentioned = array();
- if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+ if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) {
$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']);
$thrparent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
intval($owner["uid"]),
dbesc($parent_item));
- if (dbm::is_result($thrparent)) {
+ if ($thrparent) {
$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
}
$tags = item_getfeedtags($item);
- if (count($tags)) {
- foreach ($tags as $t) {
- if ($t[0] == "@") {
+ if(count($tags))
+ foreach($tags as $t)
+ if ($t[0] == "@")
$mentioned[$t[1]] = $t[1];
- }
- }
- }
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
$newmentions = array();
$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"]) {
+ 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 {
+ else
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
- }
}
if (!$item["private"]) {
"href" => "http://activityschema.org/collection/public"));
}
- if (count($tags)) {
- foreach ($tags as $t) {
- if ($t[0] != "@") {
+ if(count($tags))
+ foreach($tags as $t)
+ if ($t[0] != "@")
xml::add_element($doc, $entry, "category", "", array("term" => $t[2]));
- }
- }
- }
self::get_attachment($doc, $entry, $item);
$owner = $r[0];
- if (!strlen($last_update))
+ if(!strlen($last_update))
$last_update = 'now -30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
projects / friendica.git / blobdiff