keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6898 from annando/issue-6537

Browse source 
Issue 6537: Transmit the real author of a post in a dedicated API field
This commit is contained in:
Philipp 2019-03-17 21:48:36 +01:00 committed by GitHub
commit ab61a7a902
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/api.md
View file

@ -654,6 +654,7 @@ Returned status object is conform to GNU Social/Twitter api.
Friendica adds some addictional fields: Friendica adds some addictional fields:
- author: a user object, it's the author of the item. In case of a reshare for legacy reasons the "user" field doesn't show the real author. This field always contains the real author of a post.
- owner: a user object, it's the owner of the item. - owner: a user object, it's the owner of the item.
- private: boolean, true if the item is marked as private - private: boolean, true if the item is marked as private
- activities: map with activities related to the item. Every activity is a list of user objects. - activities: map with activities related to the item. Every activity is a list of user objects.
@ -667,6 +668,9 @@ JSON:
[ [
{ {
// ... // ...
'friendica_author' : {
// user object
},
'friendica_owner' : { 'friendica_owner' : {
// user object // user object
}, },

10
include/api.php
View file

@ -775,15 +775,17 @@ function api_item_get_user(App $a, $item)
{ {
$status_user = api_get_user($a, defaults($item, 'author-id', null)); $status_user = api_get_user($a, defaults($item, 'author-id', null));
$author_user = $status_user;
$status_user["protected"] = defaults($item, 'private', 0); $status_user["protected"] = defaults($item, 'private', 0);
if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) { if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
$owner_user = api_get_user($a, defaults($item, 'owner-id', null)); $owner_user = api_get_user($a, defaults($item, 'owner-id', null));
} else { } else {
$owner_user = $status_user; $owner_user = $author_user;
} }
return ([$status_user, $owner_user]); return ([$status_user, $author_user, $owner_user]);
} }
/** /**
@ -2988,7 +2990,7 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
foreach ((array)$r as $item) { foreach ((array)$r as $item) {
localize_item($item); localize_item($item);
list($status_user, $owner_user) = api_item_get_user($a, $item); list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
// Look if the posts are matching if they should be filtered by user id // Look if the posts are matching if they should be filtered by user id
if ($filter_user && ($status_user["id"] != $user_info["id"])) { if ($filter_user && ($status_user["id"] != $user_info["id"])) {
@ -3020,6 +3022,7 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
$geo => null, $geo => null,
'favorited' => $item['starred'] ? true : false, 'favorited' => $item['starred'] ? true : false,
'user' => $status_user, 'user' => $status_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,
@ -3063,6 +3066,7 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
$retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type); $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']);
$status['retweeted_status'] = $retweeted_status; $status['retweeted_status'] = $retweeted_status;
$status['friendica_author'] = $retweeted_status['friendica_author'];
} }
} }