Merge pull request #7078 from nupplaphil/task/mod_fetch

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index ef2c05936f38b7dfcb5d450839e5172fd07dae95..f360dc4116762b916dc0932120f21116ba331f9e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -364,7 +364,7 @@ function api_call(App $a)
                Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call']);
                throw new NotImplementedException();
        } catch (HTTPException $e) {
-               header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
+               header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
                return api_error($type, $e);
        }
 }
@@ -384,7 +384,7 @@ function api_error($type, $e)
        /// @TODO:  https://dev.twitter.com/overview/api/response-codes
 
        $error = ["error" => $error,
-                       "code" => $e->httpcode . " " . $e->httpdesc,
+                       "code" => $e->getCode() . " " . $e->httpdesc,
                        "request" => $a->query_string];
 
        $return = api_format_data('status', $type, ['status' => $error]);
@@ -2981,21 +2981,55 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
        }
 
        $retweeted_item = [];
+       $quoted_item = [];
 
-       $announce = api_get_announce($item);
-       if (!empty($announce) && ($item['owner-id'] == $item['author-id'])) {
-               $retweeted_item = $item;
-               $item = $announce;
-               $status['friendica_owner'] = api_get_user($a, $announce['author-id']);
-       } elseif ($item["id"] == $item["parent"]) {
+       if ($item["id"] == $item["parent"]) {
+               $body = $item['body'];
                $retweeted_item = api_share_as_retweet($item);
+               if ($body != $item['body']) {
+                       $quoted_item = $retweeted_item;
+                       $retweeted_item = [];
+               }
+       }
+
+       if (empty($retweeted_item) && ($item['owner-id'] == $item['author-id'])) {
+               $announce = api_get_announce($item);
+               if (!empty($announce)) {
+                       $retweeted_item = $item;
+                       $item = $announce;
+                       $status['friendica_owner'] = api_get_user($a, $announce['author-id']);
+               }
+       }
+
+       if (!empty($quoted_item)) {
+               $conv_quoted = api_convert_item($quoted_item);
+               $quoted_status = $status;
+               unset($quoted_status['friendica_author']);
+               unset($quoted_status['friendica_owner']);
+               unset($quoted_status['friendica_activities']);
+               unset($quoted_status['friendica_private']);
+               unset($quoted_status['statusnet_conversation_id']);
+               $quoted_status['text'] = $conv_quoted['text'];
+               $quoted_status['statusnet_html'] = $conv_quoted['html'];
+               try {
+                       $quoted_status["user"] = api_get_user($a, $quoted_item["author-id"]);
+               } catch (BadRequestException $e) {
+                       // user not found. should be found?
+                       /// @todo check if the user should be always found
+                       $quoted_status["user"] = [];
+               }
        }
 
        if (!empty($retweeted_item)) {
                $retweeted_status = $status;
+               unset($retweeted_status['friendica_author']);
+               unset($retweeted_status['friendica_owner']);
+               unset($retweeted_status['friendica_activities']);
+               unset($retweeted_status['friendica_private']);
+               unset($retweeted_status['statusnet_conversation_id']);
                $status['user'] = $status['friendica_owner'];
                try {
-                       $retweeted_status['friendica_author'] = $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
+                       $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
                } catch (BadRequestException $e) {
                        // user not found. should be found?
                        /// @todo check if the user should be always found
@@ -3006,11 +3040,20 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 
                $retweeted_status['text'] = $rt_converted["text"];
                $retweeted_status['statusnet_html'] = $rt_converted["html"];
-               $retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type);
                $retweeted_status['created_at'] =  api_date($retweeted_item['created']);
-               $retweeted_status['friendica_owner'] = $retweeted_status['friendica_author'];
+
+               if (!empty($quoted_status)) {
+                       $retweeted_status['quoted_status'] = $quoted_status;
+               }
+
+               $status['friendica_author'] = $retweeted_status['user'];
                $status['retweeted_status'] = $retweeted_status;
-               $status['friendica_author'] = $retweeted_status['friendica_author'];
+       } elseif (!empty($quoted_status)) {
+               $root_status = api_convert_item($item);
+
+               $status['text'] = $root_status["text"];
+               $status['statusnet_html'] = $root_status["html"];
+               $status['quoted_status'] = $quoted_status;
        }
 
        // "uid" and "self" are only needed for some internal stuff, so remove it from here
@@ -5117,7 +5160,12 @@ function api_share_as_retweet(&$item)
                $posted = $matches[1];
        }
 
-       $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $body);
+       $pre_body = trim(preg_replace("/(.*?)\[share.*?\]\s?.*?\s?\[\/share\]\s?/ism", "$1", $body));
+       if ($pre_body != '') {
+               $item['body'] = $pre_body;
+       }
+
+       $shared_body = trim(preg_replace("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $body));
 
        if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) {
                return false;