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

we didn't need the extra query - everything we require is already in memory

Browse Source
This commit is contained in:
friendica 2014-07-29 19:52:19 -07:00
parent 60e7837f00
commit c8829e7243
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mod/connedit.php
View File

@ -157,12 +157,6 @@ function connedit_post(&$a) {
); );
if(($pr) && (! ($abook_flags & ABOOK_FLAG_HIDDEN)) if(($pr) && (! ($abook_flags & ABOOK_FLAG_HIDDEN))
&& (intval(get_pconfig($channel['channel_id'],'system','post_newfriend')))) { && (intval(get_pconfig($channel['channel_id'],'system','post_newfriend')))) {
$objtype = ACTIVITY_OBJ_PERSON;
$t = q("select * from abook left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_channel = %d limit 1",
intval($a->poi['abook_id']),
intval($channel['channel_id'])
);
if($t) {
$xarr = array(); $xarr = array();
$xarr['verb'] = ACTIVITY_FRIEND; $xarr['verb'] = ACTIVITY_FRIEND;
$xarr['item_flags'] = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP; $xarr['item_flags'] = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
@ -172,31 +166,26 @@ function connedit_post(&$a) {
$xarr['deny_cid'] = $channel['channel_deny_cid']; $xarr['deny_cid'] = $channel['channel_deny_cid'];
$xarr['deny_gid'] = $channel['channel_deny_gid']; $xarr['deny_gid'] = $channel['channel_deny_gid'];
$xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0); $xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0);
$obj = array( $obj = array(
'type' => ACTIVITY_OBJ_PERSON, 'type' => ACTIVITY_OBJ_PERSON,
'title' => $t[0]['xchan_name'], 'title' => $a->poi['xchan_name'],
'id' => $t[0]['xchan_hash'], 'id' => $a->poi['xchan_hash'],
'link' => array( 'link' => array(
array('rel' => 'alternate', 'type' => 'text/html', 'href' => $t[0]['xchan_url']), array('rel' => 'alternate', 'type' => 'text/html', 'href' => $a->poi['xchan_url']),
array('rel' => 'photo', 'type' => $t[0]['xchan_photo_mimetype'], 'href' => $t[0]['xchan_photo_l']) array('rel' => 'photo', 'type' => $a->poi['xchan_photo_mimetype'], 'href' => $a->poi['xchan_photo_l'])
), ),
); );
$xarr['object'] = json_encode($obj); $xarr['object'] = json_encode($obj);
$xarr['obj_type'] = ACTIVITY_OBJ_PERSON; $xarr['obj_type'] = ACTIVITY_OBJ_PERSON;
$xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . $a->poi['xchan_url'] . ']' . $a->poi['xchan_name'] . '[/zrl]';
$xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . $t[0]['xchan_url'] . ']' . $t[0]['xchan_name'] . '[/zrl]'; $xarr['body'] .= "\n\n\n" . '[zrl=' . $a->poi['xchan_url'] . '][zmg=80x80]' . $a->poi['xchan_photo_m'] . '[/zmg][/zrl]';
$xarr['body'] .= "\n\n\n" . '[zrl=' . $t[0]['xchan_url'] . '][zmg=80x80]' . $t[0]['xchan_photo_m'] . '[/zmg][/zrl]';
post_activity_item($xarr); post_activity_item($xarr);
} }
}
// pull in a bit of content if there is any to pull in // pull in a bit of content if there is any to pull in
proc_run('php','include/onepoll.php',$contact_id); proc_run('php','include/onepoll.php',$contact_id);