aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-15 20:21:40 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-15 20:21:40 -0800
commit9b4e6e1ec028d4525635e2b1a25025f7fea0ed88 (patch)
tree6b82e5dd41aa9aef65187d8574e566c5adc385f0 /include
parent46e4d2d5738e0a773b8f595427eaabc64181013d (diff)
downloadvolse-hubzilla-9b4e6e1ec028d4525635e2b1a25025f7fea0ed88.tar.gz
volse-hubzilla-9b4e6e1ec028d4525635e2b1a25025f7fea0ed88.tar.bz2
volse-hubzilla-9b4e6e1ec028d4525635e2b1a25025f7fea0ed88.zip
some more minor api tweaks
Diffstat (limited to 'include')
-rw-r--r--include/api.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/api.php b/include/api.php
index 55c09092c..5c72a2d0c 100644
--- a/include/api.php
+++ b/include/api.php
@@ -251,6 +251,7 @@ require_once('include/api_auth.php');
if (count($uinfo)==0) {
return False;
}
+ $following = false;
if(intval($uinfo[0]['abook_self'])) {
$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`
WHERE `uid` = %d
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'])
);
$countitms = $r[0]['count'];
+ $following = true;
}
else {
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
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'])
);
$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'] : '',
'profile_image_url' => $uinfo[0]['xchan_photo_l'],
'url' => $uinfo[0]['xchan_url'],
-//FIXME
'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'],
'protected' => false,
'friends_count' => intval($countfriends),
@@ -337,7 +341,7 @@ require_once('include/api_auth.php');
'profile_background_tile' => false,
'profile_use_background_image' => false,
'notifications' => false,
- 'following' => false, // #XXX: fix me
+ 'following' => $following,
'verified' => true // #XXX: fix me
);
@@ -417,7 +421,7 @@ require_once('include/api_auth.php');
'utc_offset' => 0, // #XXX: fix me
'time_zone' => '', //$uinfo[0]['timezone'],
'statuses_count' => 0,
- 'following' => 1,
+ 'following' => false,
'statusnet_blocking' => false,
'notifications' => false,
'uid' => 0,