some more minor api tweaks
This commit is contained in:
parent
46e4d2d573
commit
9b4e6e1ec0
@ -251,6 +251,7 @@ require_once('include/api_auth.php');
|
|||||||
if (count($uinfo)==0) {
|
if (count($uinfo)==0) {
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
$following = false;
|
||||||
|
|
||||||
if(intval($uinfo[0]['abook_self'])) {
|
if(intval($uinfo[0]['abook_self'])) {
|
||||||
$usr = q("select * from channel where channel_id = %d limit 1",
|
$usr = q("select * from channel where channel_id = %d limit 1",
|
||||||
@ -266,18 +267,22 @@ require_once('include/api_auth.php');
|
|||||||
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
|
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
|
||||||
WHERE `uid` = %d
|
WHERE `uid` = %d
|
||||||
AND item_wall = 1 $item_normal
|
AND item_wall = 1 $item_normal
|
||||||
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
|
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
|
||||||
|
AND item_private = 0 ",
|
||||||
intval($usr[0]['channel_id'])
|
intval($usr[0]['channel_id'])
|
||||||
);
|
);
|
||||||
$countitms = $r[0]['count'];
|
$countitms = $r[0]['count'];
|
||||||
|
$following = true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
|
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
|
||||||
WHERE author_xchan = '%s'
|
WHERE author_xchan = '%s'
|
||||||
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
|
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
|
||||||
|
AND item_private = 0 ",
|
||||||
intval($uinfo[0]['xchan_hash'])
|
intval($uinfo[0]['xchan_hash'])
|
||||||
);
|
);
|
||||||
$countitms = $r[0]['count'];
|
$countitms = $r[0]['count'];
|
||||||
|
$following = (($uinfo[0]['abook_myperms'] & PERMS_R_STREAM) ? true : false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -313,7 +318,6 @@ require_once('include/api_auth.php');
|
|||||||
'location' => ($usr) ? $usr[0]['channel_location'] : '',
|
'location' => ($usr) ? $usr[0]['channel_location'] : '',
|
||||||
'profile_image_url' => $uinfo[0]['xchan_photo_l'],
|
'profile_image_url' => $uinfo[0]['xchan_photo_l'],
|
||||||
'url' => $uinfo[0]['xchan_url'],
|
'url' => $uinfo[0]['xchan_url'],
|
||||||
//FIXME
|
|
||||||
'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'],
|
'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'],
|
||||||
'protected' => false,
|
'protected' => false,
|
||||||
'friends_count' => intval($countfriends),
|
'friends_count' => intval($countfriends),
|
||||||
@ -337,7 +341,7 @@ require_once('include/api_auth.php');
|
|||||||
'profile_background_tile' => false,
|
'profile_background_tile' => false,
|
||||||
'profile_use_background_image' => false,
|
'profile_use_background_image' => false,
|
||||||
'notifications' => false,
|
'notifications' => false,
|
||||||
'following' => false, // #XXX: fix me
|
'following' => $following,
|
||||||
'verified' => true // #XXX: fix me
|
'verified' => true // #XXX: fix me
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -417,7 +421,7 @@ require_once('include/api_auth.php');
|
|||||||
'utc_offset' => 0, // #XXX: fix me
|
'utc_offset' => 0, // #XXX: fix me
|
||||||
'time_zone' => '', //$uinfo[0]['timezone'],
|
'time_zone' => '', //$uinfo[0]['timezone'],
|
||||||
'statuses_count' => 0,
|
'statuses_count' => 0,
|
||||||
'following' => 1,
|
'following' => false,
|
||||||
'statusnet_blocking' => false,
|
'statusnet_blocking' => false,
|
||||||
'notifications' => false,
|
'notifications' => false,
|
||||||
'uid' => 0,
|
'uid' => 0,
|
||||||
|
Reference in New Issue
Block a user