X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=f360dc4116762b916dc0932120f21116ba331f9e;hb=5e3a55915d7fdd554d711b2b5b619552a492c090;hp=292068b511e8866f9f6967622c73106080e823c9;hpb=9693a7472ee7eff93f5f04d5b7eef7722006f08f;p=friendica.git diff --git a/include/api.php b/include/api.php index 292068b511..f360dc4116 100644 --- 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]); @@ -953,9 +953,9 @@ function api_account_verify_credentials($type) // - Adding last status if (!$skip_status) { - $last_status = api_get_last_status($user_info['pid'], $user_info['uid'], $type); - if ($last_status) { - $user_info['status'] = $last_status; + $item = api_get_last_status($user_info['pid'], $user_info['uid']); + if ($item) { + $user_info['status'] = api_format_item($item, $type); } } @@ -1265,11 +1265,10 @@ function api_status_show($type, $item_id) * * @param int $ownerId Public contact Id * @param int $uid User Id - * @param string $type Return format (atom, rss, xml, json) * @return array * @throws Exception */ -function api_get_last_status($ownerId, $uid, $type = 'json') +function api_get_last_status($ownerId, $uid) { $condition = [ 'owner-id' => $ownerId, @@ -1280,9 +1279,7 @@ function api_get_last_status($ownerId, $uid, $type = 'json') $item = api_get_item($condition); - $status_info = api_format_item($item, $type); - - return $status_info; + return $item; } /** @@ -1294,7 +1291,7 @@ function api_get_last_status($ownerId, $uid, $type = 'json') */ function api_get_item(array $condition) { - $item = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]); + $item = Item::selectFirst(Item::DISPLAY_FIELDLIST, $condition, ['order' => ['id' => true]]); return $item; } @@ -1317,9 +1314,9 @@ function api_users_show($type) $user_info = api_get_user($a); - $lastStatus = api_get_last_status($user_info['pid'], $user_info['uid'], $type); - if ($lastStatus) { - $user_info['status'] = $lastStatus; + $item = api_get_last_status($user_info['pid'], $user_info['uid']); + if ($item) { + $user_info['status'] = api_format_item($item, $type); } // "uid" and "self" are only needed for some internal stuff, so remove it from here @@ -1593,7 +1590,7 @@ function api_statuses_home_timeline($type) Item::update(['unseen' => false], ['unseen' => true, 'id' => $idarray]); } } - + bindComments($ret); $data = ['status' => $ret]; @@ -2904,7 +2901,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso continue; } - $status = api_format_item($item, $type, $status_user, $owner_user); + $status = api_format_item($item, $type, $status_user, $author_user, $owner_user); $ret[] = $status; } @@ -2916,6 +2913,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso * @param array $item Item record * @param string $type Return format (atom, rss, xml, json) * @param array $status_user User record of the item author, can be provided by api_item_get_user() + * @param array $author_user User record of the item author, can be provided by api_item_get_user() * @param array $owner_user User record of the item owner, can be provided by api_item_get_user() * @return array API-formatted status * @throws BadRequestException @@ -2923,12 +2921,12 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso * @throws InternalServerErrorException * @throws UnauthorizedException */ -function api_format_item($item, $type = "json", $status_user = null, $owner_user = null) +function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null) { $a = \Friendica\BaseObject::getApp(); - if (empty($status_user) || empty($owner_user)) { - list($status_user, $owner_user) = api_item_get_user($a, $item); + if (empty($status_user) || empty($author_user) || empty($owner_user)) { + list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item); } localize_item($item); @@ -2959,7 +2957,7 @@ function api_format_item($item, $type = "json", $status_user = null, $owner_user 'favorited' => $item['starred'] ? true : false, 'user' => $status_user, 'friendica_author' => $author_user, - 'friendica_owner' => $owner_user, + 'friendica_owner' => $owner_user, 'friendica_private' => $item['private'] == 1, //'entities' => NULL, 'statusnet_html' => $converted["html"], @@ -2982,27 +2980,80 @@ function api_format_item($item, $type = "json", $status_user = null, $owner_user $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')'); } + $retweeted_item = []; + $quoted_item = []; + if ($item["id"] == $item["parent"]) { + $body = $item['body']; $retweeted_item = api_share_as_retweet($item); - if ($retweeted_item !== false) { - $retweeted_status = $status; - $status['user'] = $status['friendica_owner']; - try { - $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 - $retweeted_status["user"] = []; - } + if ($body != $item['body']) { + $quoted_item = $retweeted_item; + $retweeted_item = []; + } + } - $rt_converted = api_convert_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']); + } + } - $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']); - $status['retweeted_status'] = $retweeted_status; - $status['friendica_author'] = $retweeted_status['friendica_author'];} + 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["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 + $retweeted_status["user"] = []; + } + + $rt_converted = api_convert_item($retweeted_item); + + $retweeted_status['text'] = $rt_converted["text"]; + $retweeted_status['statusnet_html'] = $rt_converted["html"]; + $retweeted_status['created_at'] = api_date($retweeted_item['created']); + + if (!empty($quoted_status)) { + $retweeted_status['quoted_status'] = $quoted_status; + } + + $status['friendica_author'] = $retweeted_status['user']; + $status['retweeted_status'] = $retweeted_status; + } 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 @@ -4980,6 +5031,40 @@ function api_friendica_remoteauth() } api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true); +/** + * Return an item with announcer data if it had been announced + * + * @param array $item Item array + * @return array Item array with announce data + */ +function api_get_announce($item) +{ + // Quit if the item already has got a different owner and author + if ($item['owner-id'] != $item['author-id']) { + return []; + } + + // Don't change original or Diaspora posts + if ($item['origin'] || in_array($item['network'], [Protocol::DIASPORA])) { + return []; + } + + // Quit if we do now the original author and it had been a post from a native network + if (!empty($item['contact-uid']) && in_array($item['network'], Protocol::NATIVE_SUPPORT)) { + return []; + } + + $fields = ['author-id', 'author-name', 'author-link', 'author-avatar']; + $activity = Item::activityToIndex(ACTIVITY2_ANNOUNCE); + $condition = ['parent-uri' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY, 'uid' => [0, $item['uid']], 'activity' => $activity]; + $announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['created' => true]]); + if (!DBA::isResult($announce)) { + return []; + } + + return array_merge($item, $announce); +} + /** * @brief Return the item shared, if the item contains only the [share] tag * @@ -5075,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;