aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-17 21:53:35 -0700
committerfriendica <info@friendica.com>2013-07-17 21:53:35 -0700
commit94e87c0a84c8ecb2fc26015bc8894ca0ca6cbf02 (patch)
tree608fbd39af527cd81c1530e501c051e16579f903
parentfc265a8e3a1c6b2f5098b6e9b8243492b706222f (diff)
downloadvolse-hubzilla-94e87c0a84c8ecb2fc26015bc8894ca0ca6cbf02.tar.gz
volse-hubzilla-94e87c0a84c8ecb2fc26015bc8894ca0ca6cbf02.tar.bz2
volse-hubzilla-94e87c0a84c8ecb2fc26015bc8894ca0ca6cbf02.zip
update friends/followers API so Friendica Android client won't choke
-rw-r--r--include/api.php10
-rw-r--r--install/database.sql1
2 files changed, 5 insertions, 6 deletions
diff --git a/include/api.php b/include/api.php
index 50ecbd570..c79ac4a9b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1644,11 +1644,11 @@ require_once('include/photos.php');
// This won't work if either of you send your stream to everybody on the network
if($qtype == 'friends')
- $sql_extra = sprintf(" AND ( their_perms & %d ) and ( my_perms & %d ) ", intval(PERMS_W_STREAM), intval(PERMS_W_STREAM));
+ $sql_extra = sprintf(" AND ( abook_their_perms & %d ) and ( abook_my_perms & %d ) ", intval(PERMS_W_STREAM), intval(PERMS_W_STREAM));
if($qtype == 'followers')
- $sql_extra = sprintf(" AND ( my_perms & %d ) and not ( their_perms & %d ) ", intval(PERMS_W_STREAM), intval(PERMS_W_STREAM));
+ $sql_extra = sprintf(" AND ( abook_my_perms & %d ) and not ( abook_their_perms & %d ) ", intval(PERMS_W_STREAM), intval(PERMS_W_STREAM));
- $r = q("SELECT id FROM abook where abook_flags = 0 and abook_channel = %d $sql_extra",
+ $r = q("SELECT abook_xchan FROM abook where abook_flags = 0 and abook_channel = %d $sql_extra",
intval(api_user())
);
@@ -1657,14 +1657,14 @@ require_once('include/photos.php');
header("Content-type: application/xml");
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<ids>' . "\r\n";
foreach($r as $rr)
- echo '<id>' . $rr['id'] . '</id>' . "\r\n";
+ echo '<id>' . $rr['abook_xchan'] . '</id>' . "\r\n";
echo '</ids>' . "\r\n";
killme();
}
elseif($type === 'json') {
$ret = array();
header("Content-type: application/json");
- foreach($r as $rr) $ret[] = $rr['id'];
+ foreach($r as $rr) $ret[] = $rr['abook_xchan'];
echo json_encode($ret);
killme();
}
diff --git a/install/database.sql b/install/database.sql
index acafabde8..1226f1cd1 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -186,7 +186,6 @@ CREATE TABLE IF NOT EXISTS `channel` (
KEY `channel_account_id` (`channel_account_id`),
KEY `channel_primary` (`channel_primary`),
KEY `channel_name` (`channel_name`),
- KEY `channel_address` (`channel_address`),
KEY `channel_timezone` (`channel_timezone`),
KEY `channel_location` (`channel_location`),
KEY `channel_theme` (`channel_theme`),