CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat-message-scheduling' into feat-maintenance-delete-expired-targets

Browse source
This commit is contained in:
Jake Barnby 2024-01-17 15:02:14 +13:00
parent 4cc6d4161d a4134d1af1
commit ad40e0a3c5
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Appwrite/Platform/Tasks/ScheduleMessages.php
View file

@ -38,7 +38,7 @@ class ScheduleMessages extends ScheduleBase
}
$now = DateTime::now();
$scheduledAt = DateTime::formatTz($schedule['scheduledAt']);
$scheduledAt = DateTime::formatTz($schedule['schedule']);
if ($scheduledAt > $now) {
continue;

22
src/Appwrite/Platform/Workers/Messaging.php
View file

@ -97,7 +97,7 @@ class Messaging extends Action
if (\count($topicIds) > 0) {
$topics = $dbForProject->find('topics', [
Query::equal('$id', $topicIds),
Query::limit($topicIds)
Query::limit(\count($topicIds)),
]);
foreach ($topics as $topic) {
$targets = \array_filter($topic->getAttribute('targets'), fn(Document $target) =>
@ -109,7 +109,7 @@ class Messaging extends Action
if (\count($userIds) > 0) {
$users = $dbForProject->find('users', [
Query::equal('$id', $userIds),
Query::limit($userIds)
Query::limit(\count($userIds)),
]);
foreach ($users as $user) {
$targets = \array_filter($user->getAttribute('targets'), fn(Document $target) =>
@ -121,14 +121,18 @@ class Messaging extends Action
if (\count($targetIds) > 0) {
$targets = $dbForProject->find('targets', [
Query::equal('$id', $targetIds),
Query::limit($targetIds)
Query::limit(\count($targetIds)),
]);
$recipients = \array_merge($recipients, $targets);
}
if (empty($recipients)) {
Console::error('No valid recipients found.');
return;
$dbForProject->updateDocument('messages', $message->getId(), $message->setAttributes([
'status' => 'failed',
'deliveryErrors' => ['No valid recipients found.']
]));
throw new \Exception('No valid recipients found.');
}
$fallback = $dbForProject->findOne('providers', [
@ -137,8 +141,12 @@ class Messaging extends Action
]);
if ($fallback === false || $fallback->isEmpty()) {
Console::error('No fallback provider found.');
return;
$dbForProject->updateDocument('messages', $message->getId(), $message->setAttributes([
'status' => 'failed',
'deliveryErrors' => ['No fallback provider found.']
]));
throw new \Exception('No fallback provider found.');
}
/**