diff options
author | Zach Copley <zach@status.net> | 2010-02-23 22:36:41 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-02-23 22:36:41 -0800 |
commit | 2f88e78a49b93f266db7d2ecd80efe447139a4e2 (patch) | |
tree | ade8bdd64a085840d37c1e395bc7922cf5346f0b /plugins/OStatus/actions | |
parent | 3a3af6782a82ca3512680a276b76d1d10de47d94 (diff) | |
parent | 2e58802cc9959763f28e2f43c8e0cd0dbe7bcd8e (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: fix group delivery, send reply/group Salmon pings from background.
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r-- | plugins/OStatus/actions/groupsalmon.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 2e4fe9443..29377b5fa 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -46,6 +46,11 @@ class GroupsalmonAction extends SalmonAction $this->clientError(_('No such group.')); } + $oprofile = Ostatus_profile::staticGet('group_id', $id); + if ($oprofile) { + $this->clientError(_m("Can't accept remote posts for a remote group.")); + } + return true; } @@ -74,13 +79,13 @@ class GroupsalmonAction extends SalmonAction throw new ClientException("Not to the attention of anyone."); } else { $uri = common_local_url('groupbyid', array('id' => $this->group->id)); - if (!in_array($context->attention, $uri)) { + if (!in_array($uri, $context->attention)) { throw new ClientException("Not to the attention of this group."); } } $profile = $this->ensureProfile(); - // @fixme save the post + $this->saveNotice(); } /** |