mirror of
https://github.com/flarum/framework.git
synced 2024-11-25 07:17:34 +08:00
Notification one-per-user limit should work between instances
This commit is contained in:
parent
6d57f902b3
commit
5b54a122c9
|
@ -17,14 +17,14 @@ class NotificationSyncer
|
|||
*
|
||||
* @var bool
|
||||
*/
|
||||
protected $onePerUser = false;
|
||||
protected static $onePerUser = false;
|
||||
|
||||
/**
|
||||
* An internal list of user IDs that notifications have been sent to.
|
||||
*
|
||||
* @var int[]
|
||||
*/
|
||||
protected $sentTo = [];
|
||||
protected static $sentTo = [];
|
||||
|
||||
/**
|
||||
* @var NotificationRepository
|
||||
|
@ -80,9 +80,9 @@ class NotificationSyncer
|
|||
if ($existing) {
|
||||
$toUndelete[] = $existing->id;
|
||||
$toDelete->forget($toDelete->search($existing));
|
||||
} elseif (! $this->onePerUser || ! in_array($user->id, $this->sentTo)) {
|
||||
} elseif (! static::$onePerUser || ! in_array($user->id, static::$sentTo)) {
|
||||
$newRecipients[] = $user;
|
||||
$this->sentTo[] = $user->id;
|
||||
static::$sentTo[] = $user->id;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -136,12 +136,12 @@ class NotificationSyncer
|
|||
*/
|
||||
public function onePerUser(callable $callback)
|
||||
{
|
||||
$this->sentTo = [];
|
||||
$this->onePerUser = true;
|
||||
static::$sentTo = [];
|
||||
static::$onePerUser = true;
|
||||
|
||||
$callback();
|
||||
|
||||
$this->onePerUser = false;
|
||||
static::$onePerUser = false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -169,7 +169,7 @@ class NotificationSyncer
|
|||
);
|
||||
|
||||
if ($blueprint instanceof MailableBlueprint) {
|
||||
$this->mailNotifications($blueprint);
|
||||
$this->mailNotifications($blueprint, $recipients);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user