We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 9f8d0b36 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x

parents 4eac561c da4ba6a5
...@@ -125,11 +125,18 @@ class OStatusPlugin extends Plugin ...@@ -125,11 +125,18 @@ class OStatusPlugin extends Plugin
*/ */
function onStartEnqueueNotice($notice, &$transports) function onStartEnqueueNotice($notice, &$transports)
{ {
// FIXME: we don't do privacy-controlled OStatus updates yet. if ($notice->isLocal()) {
// once that happens, finer grain of control here. if ($notice->inScope(null)) {
if ($notice->isLocal() && $notice->inScope(null)) { // put our transport first, in case there's any conflict (like OMB)
// put our transport first, in case there's any conflict (like OMB) array_unshift($transports, 'ostatus');
array_unshift($transports, 'ostatus'); $this->log(LOG_INFO, "Notice {$notice->id} queued for OStatus processing");
} else {
// FIXME: we don't do privacy-controlled OStatus updates yet.
// once that happens, finer grain of control here.
$this->log(LOG_NOTICE, "Not queueing notice {$notice->id} for OStatus because of privacy; scope = {$notice->scope}");
}
} else {
$this->log(LOG_NOTICE, "Not queueing notice {$notice->id} for OStatus because it's not local.");
} }
return true; return true;
} }
......
...@@ -51,7 +51,7 @@ class OStatusQueueHandler extends QueueHandler ...@@ -51,7 +51,7 @@ class OStatusQueueHandler extends QueueHandler
assert($notice instanceof Notice); assert($notice instanceof Notice);
$this->notice = $notice; $this->notice = $notice;
$this->user = User::staticGet($notice->profile_id); $this->user = User::staticGet('id', $notice->profile_id);
$this->pushUser(); $this->pushUser();
...@@ -63,6 +63,13 @@ class OStatusQueueHandler extends QueueHandler ...@@ -63,6 +63,13 @@ class OStatusQueueHandler extends QueueHandler
$this->pushGroup($group->id); $this->pushGroup($group->id);
} }
} }
foreach ($notice->getReplies() as $profile_id) {
$oprofile = Ostatus_profile::staticGet('profile_id', $profile_id);
if ($oprofile) {
$this->pingReply($oprofile);
}
}
if (!empty($this->notice->reply_to)) { if (!empty($this->notice->reply_to)) {
$replyTo = Notice::staticGet('id', $this->notice->reply_to); $replyTo = Notice::staticGet('id', $this->notice->reply_to);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment