makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17010] Queue notifications and use flush to send them

Browse source 
PHPBB3-17010
This commit is contained in:
Marc Alexander 2022-09-19 20:34:42 +02:00
parent be21479b2a
commit af29f388da
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/phpbb/notification/method/webpush.php
View file

@ -185,6 +185,7 @@ class webpush extends \phpbb\notification\method\messenger_base
$web_push = new \Minishlink\WebPush\WebPush($auth); $web_push = new \Minishlink\WebPush\WebPush($auth);
$number_of_notifications = 0;
// Time to go through the queue and send emails // Time to go through the queue and send emails
/** @var type_interface $notification */ /** @var type_interface $notification */
foreach ($this->queue as $notification) foreach ($this->queue as $notification)
@ -222,9 +223,8 @@ class webpush extends \phpbb\notification\method\messenger_base
], ],
'contentEncoding' => !empty($subscription['encoding']) ? $subscription['encoding'] : null, 'contentEncoding' => !empty($subscription['encoding']) ? $subscription['encoding'] : null,
]); ]);
//$web_push->queueNotification($push_subscription, $json_data); $web_push->queueNotification($push_subscription, $json_data);
$foo = $web_push->sendOneNotification($push_subscription, $json_data); $number_of_notifications++;
$meh = 2;
} }
catch (\ErrorException $exception) catch (\ErrorException $exception)
{ {
@ -235,6 +235,21 @@ class webpush extends \phpbb\notification\method\messenger_base
} }
// @todo: Try offloading to after request // @todo: Try offloading to after request
try
{
foreach ($web_push->flush($number_of_notifications) as $report)
{
if (!$report->isSuccess())
{
// @todo: log errors / remove subscription
}
}
}
catch (\ErrorException $exception)
{
// @todo: write to log
}
// We're done, empty the queue // We're done, empty the queue
$this->empty_queue(); $this->empty_queue();