summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-06-22 16:28:06 -0700
committerZach Copley <zach@status.net>2010-06-22 16:28:06 -0700
commit1eec7f779fc85b530907ea31deceadb2a30d7614 (patch)
tree16750d5fa88a8dcc160a15a9fc92375563a488cd /lib
parent1852eae36f9ed9a57d37f2048dfbf2257c7eccb4 (diff)
- Add profile_info tag to Atom author
- Normalize xmlns:statusnet links in the API
Diffstat (limited to 'lib')
-rw-r--r--lib/apiaction.php2
-rw-r--r--lib/atomnoticefeed.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 7cc473d51..226481778 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -208,11 +208,13 @@ class ApiAction extends Action
// Is the requesting user following this user?
$twitter_user['following'] = false;
+ $twitter_user['statusnet:blocking'] = false;
$twitter_user['notifications'] = false;
if (isset($this->auth_user)) {
$twitter_user['following'] = $this->auth_user->isSubscribed($profile);
+ $twitter_user['statusnet:blocking'] = $this->auth_user->hasBlocked($profile);
// Notifications on?
$sub = Subscription::pkeyGet(array('subscriber' =>
diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php
index ef44de4b6..6ed803ce4 100644
--- a/lib/atomnoticefeed.php
+++ b/lib/atomnoticefeed.php
@@ -95,7 +95,7 @@ class AtomNoticeFeed extends Atom10Feed
$this->addNamespace(
'statusnet',
- 'http://status.net/ont/'
+ 'http://status.net/schema/api/1/'
);
}