Put salmon slaps in queues before pushing user Atom feed

This commit is contained in:
Mikael Nordfeldth 2016-01-10 00:29:32 +01:00
parent 67801a5566
commit 42dff2742a

View File

@ -60,12 +60,6 @@ class OStatusQueueHandler extends QueueHandler
return true; return true;
} }
if ($notice->isLocal()) {
// Notices generated on remote sites will have already
// been pushed to user's subscribers by their origin sites.
$this->pushUser();
}
foreach ($notice->getAttentionProfiles() as $target) { foreach ($notice->getAttentionProfiles() as $target) {
common_debug("OSTATUS [{$this->notice->getID()}]: Attention target profile {$target->getNickname()} ({$target->getID()})"); common_debug("OSTATUS [{$this->notice->getID()}]: Attention target profile {$target->getNickname()} ({$target->getID()})");
if ($target->isGroup()) { if ($target->isGroup()) {
@ -100,6 +94,10 @@ class OStatusQueueHandler extends QueueHandler
} }
if ($notice->isLocal()) { if ($notice->isLocal()) {
// Notices generated on remote sites will have already
// been pushed to user's subscribers by their origin sites.
$this->pushUser();
try { try {
$parent = $this->notice->getParent(); $parent = $this->notice->getParent();
foreach($parent->getAttentionProfiles() as $related) { foreach($parent->getAttentionProfiles() as $related) {