harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add author info to like activity object for localisation

Browse Source
This commit is contained in:
friendica
2012-11-06 03:26:55 -08:00
parent 417d1080d4
commit 9050faa487
1 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mod/like.php
View File

@@ -60,7 +60,16 @@ function like_content(&$a) {
dbesc($item['owner_xchan']) dbesc($item['owner_xchan'])
); );
if($r) if($r)
$remote_owner = $r[0]; $thread_owner = $r[0];
else
killme();
$r = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($item['author_xchan'])
);
if($r)
$item_owner = $r[0];
else else
killme(); killme();
@@ -77,7 +86,7 @@ function like_content(&$a) {
// if(! count($r)) // if(! count($r))
// return; // return;
// if(! $r[0]['self']) // if(! $r[0]['self'])
// $remote_owner = $r[0]; // $thread_owner = $r[0];
// } // }
// this represents the post owner on this system. // this represents the post owner on this system.
@@ -94,8 +103,8 @@ function like_content(&$a) {
// return; // return;
// } // }
// if(! $remote_owner) // if(! $thread_owner)
// $remote_owner = $owner; // $thread_owner = $owner;
// This represents the person posting // This represents the person posting
@@ -119,7 +128,7 @@ function like_content(&$a) {
$r = q("SELECT * FROM item WHERE verb = '%s' AND item_restrict = 0 $r = q("SELECT * FROM item WHERE verb = '%s' AND item_restrict = 0
AND owner_xchan = '%s' AND ( parent = %d OR thr_parent = '%s') LIMIT 1", AND owner_xchan = '%s' AND ( parent = %d OR thr_parent = '%s') LIMIT 1",
dbesc($activity), dbesc($activity),
dbesc($remote_owner['xchan_hash']), dbesc($thread_owner['xchan_hash']),
intval($item_id), intval($item_id),
dbesc($item['uri']) dbesc($item['uri'])
); );
@@ -151,11 +160,20 @@ function like_content(&$a) {
$body = $item['body']; $body = $item['body'];
$obj = json_encode(array( $obj = json_encode(array(
'type' => $objtype, 'type' => $objtype,
'id' => $item['uri'], 'id' => $item['uri'],
'link' => $links, 'link' => $links,
'title' => $item['title'], 'title' => $item['title'],
'content' => $item['body'] 'content' => $item['body'],
'author' => array(
'name' => $item_author['xchan_name'],
'address' => $item_author['xchan_addr'],
'guid' => $item_author['xchan_guid'],
'guid_sig' => $item_author['xchan_guid_sig'],
'link' => array(
array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']),
array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])),
),
)); ));
if($verb === 'like') if($verb === 'like')
@@ -179,24 +197,24 @@ function like_content(&$a) {
$arr['parent'] = $item['id']; $arr['parent'] = $item['id'];
$arr['parent_uri'] = $item['uri']; $arr['parent_uri'] = $item['uri'];
$arr['thr_parent'] = $item['uri']; $arr['thr_parent'] = $item['uri'];
$arr['owner_xchan'] = $remote_owner['xchan_hash']; $arr['owner_xchan'] = $thread_owner['xchan_hash'];
$arr['author_xchan'] = $observer['xchan_hash']; $arr['author_xchan'] = $observer['xchan_hash'];
$ulink = '[url=' . $remote_owner['xchan_url'] . ']' . $remote_owner['xchan_name'] . '[/url]'; $ulink = '[url=' . $item_owner['xchan_url'] . ']' . $item_owner['xchan_name'] . '[/url]';
$alink = '[url=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/url]'; $alink = '[url=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/url]';
$plink = '[url=' . $a->get_baseurl() . '/display/' . $item['uri'] . ']' . $post_type . '[/url]'; $plink = '[url=' . $a->get_baseurl() . '/display/' . $item['uri'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity; $arr['verb'] = $activity;
$arr['obj_type'] = $objtype; $arr['obj_type'] = $objtype;
$arr['object'] = $obj; $arr['object'] = $obj;
$arr['allow_cid'] = $item['allow_cid'];
$arr['allow_gid'] = $item['allow_gid'];
$arr['deny_cid'] = $item['deny_cid'];
$arr['deny_gid'] = $item['deny_gid'];
$arr['allow_cid'] = $item['allow_cid'];
$arr['allow_gid'] = $item['allow_gid'];
$arr['deny_cid'] = $item['deny_cid'];
$arr['deny_gid'] = $item['deny_gid'];
$post_id = item_store($arr); $post_id = item_store($arr);