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 1d057a233fef83587d8b30cd0b819d1845ca0989..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]);
@@ -3004,10 +3004,15 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
        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['friendica_owner'] = $quoted_status['friendica_author'] = $quoted_status["user"] = api_get_user($a, $quoted_item["author-id"]);
+                       $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
@@ -3017,9 +3022,14 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 
        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
@@ -3030,15 +3040,13 @@ 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['friendica_author'];
+               $status['friendica_author'] = $retweeted_status['user'];
                $status['retweeted_status'] = $retweeted_status;
        } elseif (!empty($quoted_status)) {
                $root_status = api_convert_item($item);