Merge remote-tracking branch 'upstream/develop' into 1601-dfrn

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index f17e0c05adcb1a4782c5b351fb8b0c79c3ab7a65..b8fa1dd815bd364253168e7f383c0c589562f00f 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -20,7 +20,7 @@ require_once('mod/share.php');
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
 
-function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0, $forpubsub = false) {
+function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
 
        $sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@@ -121,18 +121,8 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
        else
                $sort = 'ASC';
 
-       // Include answers to status.net posts in pubsub feeds
-       if($forpubsub) {
-               $sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-                               LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`";
-               $visibility = sprintf("AND (`item`.`parent` = `item`.`id`) OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s')))",
-                                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS));
-               $date_field = "`received`";
-               $sql_order = "`item`.`received` DESC";
-       } else {
-               $date_field = "`changed`";
-               $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
-       }
+       $date_field = "`changed`";
+       $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
 
        if(! strlen($last_update))
                $last_update = 'now -30 days';
@@ -466,17 +456,6 @@ function get_atom_elements($feed, $item, $contact = array()) {
        $res['body'] = unxmlify($item->get_content());
        $res['plink'] = unxmlify($item->get_link(0));
 
-       if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND strstr($res['plink'], ".app.net/")) {
-               logger("get_atom_elements: detected app.net posting: ".print_r($res, true), LOGGER_DEBUG);
-               $res['title'] = "";
-               $res['body'] = nl2br($res['body']);
-       }
-
-       // removing the content of the title if its identically to the body
-       // This helps with auto generated titles e.g. from tumblr
-       if (title_is_body($res["title"], $res["body"]))
-               $res['title'] = "";
-
        if($res['plink'])
                $base_url = implode('/', array_slice(explode('/',$res['plink']),0,3));
        else
@@ -854,62 +833,6 @@ function get_atom_elements($feed, $item, $contact = array()) {
                $res['target'] .= '</target>' . "\n";
        }
 
-       // This is some experimental stuff. By now retweets are shown with "RT:"
-       // But: There is data so that the message could be shown similar to native retweets
-       // There is some better way to parse this array - but it didn't worked for me.
-       $child = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://activitystrea.ms/spec/1.0/"][object][0]["child"];
-       if (is_array($child)) {
-               logger('get_atom_elements: Looking for status.net repeated message');
-
-               $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"];
-               $orig_id = ostatus_convert_href($child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"]);
-               $author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10];
-               $uri = $author["uri"][0]["data"];
-               $name = $author["name"][0]["data"];
-               $avatar = @array_shift($author["link"][2]["attribs"]);
-               $avatar = $avatar["href"];
-
-               if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-                       logger('get_atom_elements: fixing sender of repeated message. '.$orig_id, LOGGER_DEBUG);
-
-                       if (!intval(get_config('system','wall-to-wall_share'))) {
-                               $prefix = share_header($name, $uri, $avatar, "", "", $orig_link);
-
-                               $res["body"] = $prefix.html2bbcode($message)."[/share]";
-                       } else {
-                               $res["owner-name"] = $res["author-name"];
-                               $res["owner-link"] = $res["author-link"];
-                               $res["owner-avatar"] = $res["author-avatar"];
-
-                               $res["author-name"] = $name;
-                               $res["author-link"] = $uri;
-                               $res["author-avatar"] = $avatar;
-
-                               $res["body"] = html2bbcode($message);
-                       }
-               }
-       }
-
-       if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND $contact['fetch_further_information']) {
-               $preview = "";
-
-               // Handle enclosures and treat them as preview picture
-               if (isset($attach))
-                       foreach ($attach AS $attachment)
-                               if ($attachment->type == "image/jpeg")
-                                       $preview = $attachment->link;
-
-               $res["body"] = $res["title"].add_page_info($res['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
-               $res["tag"] = add_page_keywords($res['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
-               $res["title"] = "";
-               $res["object-type"] = ACTIVITY_OBJ_BOOKMARK;
-               unset($res["attach"]);
-       } elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_OSTATUS))
-               $res["body"] = add_page_info_to_body($res["body"]);
-       elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND strstr($res['plink'], ".app.net/")) {
-               $res["body"] = add_page_info_to_body($res["body"]);
-       }
-
        $arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
 
        call_hooks('parse_atom', $arr);
@@ -3067,6 +2990,9 @@ function item_is_remote_self($contact, &$datarray) {
 }
 
 function local_delivery($importer,$data) {
+
+       require_once('library/simplepie/simplepie.inc');
+
        $a = get_app();
 
        logger(__function__, LOGGER_TRACE);