GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

send a salmon slap to mentioned person when we reply to a notice

This commit is contained in:
Evan Prodromou 2010-09-01 14:35:43 -04:00
parent 8f06e3b281
commit c82b1cda82
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/OStatus/actions/usersalmon.php
View File

@ -71,6 +71,7 @@ class UsersalmonAction extends SalmonAction
// Notice must either be a) in reply to a notice by this user // Notice must either be a) in reply to a notice by this user
// or b) to the attention of this user // or b) to the attention of this user
// or c) in reply to a notice to the attention of this user
$context = $this->activity->context; $context = $this->activity->context;
@ -79,8 +80,9 @@ class UsersalmonAction extends SalmonAction
if (empty($notice)) { if (empty($notice)) {
throw new ClientException("In reply to unknown notice"); throw new ClientException("In reply to unknown notice");
} }
if ($notice->profile_id != $this->user->id) { if ($notice->profile_id != $this->user->id &&
throw new ClientException("In reply to a notice not by this user"); !in_array($notice->getReplies(), $this->user->id)) {
throw new ClientException("In reply to a notice not by this user and not mentioning this user");
} }
} else if (!empty($context->attention)) { } else if (!empty($context->attention)) {
if (!in_array($this->user->uri, $context->attention) && if (!in_array($this->user->uri, $context->attention) &&

13
plugins/OStatus/lib/ostatusqueuehandler.php
View File

@ -67,6 +67,17 @@ class OStatusQueueHandler extends QueueHandler
} }
} }
if (!empty($this->notice->reply_to)) {
$replyTo = Notice::staticGet('id', $this->notice->reply_to);
if (!empty($replyTo)) {
foreach($replyTo->getReplies() as $profile_id) {
$oprofile = Ostatus_profile::staticGet('profile_id', $profile_id);
if ($oprofile) {
$this->pingReply($oprofile);
}
}
}
}
return true; return true;
} }
@ -161,7 +172,7 @@ class OStatusQueueHandler extends QueueHandler
* Queue up direct feed update pushes to subscribers on our internal hub. * Queue up direct feed update pushes to subscribers on our internal hub.
* If there are a large number of subscriber sites, intermediate bulk * If there are a large number of subscriber sites, intermediate bulk
* distribution triggers may be queued. * distribution triggers may be queued.
* *
* @param string $atom update feed, containing only new/changed items * @param string $atom update feed, containing only new/changed items
* @param HubSub $sub open query of subscribers * @param HubSub $sub open query of subscribers
*/ */