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

always distribute to inbox of author immediately

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-18 07:11:20 -05:00
parent b6e5d4ecc3
commit c2ba764535
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
classes/Notice.php
View File

@ -681,7 +681,20 @@ class Notice extends Memcached_DataObject
{ {
$ni = $this->whoGets($groups, $recipients); $ni = $this->whoGets($groups, $recipients);
Inbox::bulkInsert($this->id, array_keys($ni)); $ids = array_keys($ni);
// We remove the author (if they're a local user),
// since we'll have already done this in distribute()
$i = array_search($this->profile_id, $ids);
if ($i !== false) {
unset($ids[$i]);
}
// Bulk insert
Inbox::bulkInsert($this->id, $ids);
return; return;
} }
@ -1487,6 +1500,14 @@ class Notice extends Memcached_DataObject
function distribute() function distribute()
{ {
// We always insert for the author so they don't
// have to wait
$user = User::staticGet('id', $this->profile_id);
if (!empty($user)) {
Inbox::insertNotice($user->id, $this->id);
}
if (common_config('queue', 'inboxes')) { if (common_config('queue', 'inboxes')) {
// If there's a failure, we want to _force_ // If there's a failure, we want to _force_
// distribution at this point. // distribution at this point.