nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7039 from annando/api-reshare-quote

Browse source 
API: Reshares and Quotes should now work in any combination
This commit is contained in:
Hypolite Petovan 2019-04-24 18:28:20 -04:00 committed by GitHub
commit 9bc87e408f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
include/api.php
View file

@ -2981,21 +2981,55 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
} }
$retweeted_item = []; $retweeted_item = [];
$quoted_item = [];
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); $announce = api_get_announce($item);
if (!empty($announce) && ($item['owner-id'] == $item['author-id'])) { if (!empty($announce)) {
$retweeted_item = $item; $retweeted_item = $item;
$item = $announce; $item = $announce;
$status['friendica_owner'] = api_get_user($a, $announce['author-id']); $status['friendica_owner'] = api_get_user($a, $announce['author-id']);
} elseif ($item["id"] == $item["parent"]) { }
$retweeted_item = api_share_as_retweet($item); }
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)) { if (!empty($retweeted_item)) {
$retweeted_status = $status; $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']; $status['user'] = $status['friendica_owner'];
try { 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) { } catch (BadRequestException $e) {
// user not found. should be found? // user not found. should be found?
/// @todo check if the user should be always 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['text'] = $rt_converted["text"];
$retweeted_status['statusnet_html'] = $rt_converted["html"]; $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['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['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 // "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]; $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 == "")) { if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) {
return false; return false;