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

Add author_user support to api_format_item

Browse source
This commit is contained in:
Hypolite Petovan 2019-03-23 09:59:52 -04:00
parent 8d28f199a6
commit e60e7a56ac
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/api.php
View file

@ -2904,7 +2904,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
continue; 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; $ret[] = $status;
} }
@ -2916,6 +2916,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
* @param array $item Item record * @param array $item Item record
* @param string $type Return format (atom, rss, xml, json) * @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 $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() * @param array $owner_user User record of the item owner, can be provided by api_item_get_user()
* @return array API-formatted status * @return array API-formatted status
* @throws BadRequestException * @throws BadRequestException
@ -2923,12 +2924,12 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
* @throws InternalServerErrorException * @throws InternalServerErrorException
* @throws UnauthorizedException * @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(); $a = \Friendica\BaseObject::getApp();
if (empty($status_user) || empty($owner_user)) { if (empty($status_user) || empty($author_user) || empty($owner_user)) {
list($status_user, $owner_user) = api_item_get_user($a, $item); list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
} }
localize_item($item); localize_item($item);
@ -2959,7 +2960,7 @@ function api_format_item($item, $type = "json", $status_user = null, $owner_user
'favorited' => $item['starred'] ? true : false, 'favorited' => $item['starred'] ? true : false,
'user' => $status_user, 'user' => $status_user,
'friendica_author' => $author_user, 'friendica_author' => $author_user,
'friendica_owner' => $owner_user, 'friendica_owner' => $owner_user,
'friendica_private' => $item['private'] == 1, 'friendica_private' => $item['private'] == 1,
//'entities' => NULL, //'entities' => NULL,
'statusnet_html' => $converted["html"], 'statusnet_html' => $converted["html"],