CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-03 19:53:33 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-topics-controller

Browse source
This commit is contained in:
Prateek Banga 2023-10-13 14:52:02 +05:30
commit 4a44fb3330
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/api/messaging.php
View file

@ -1662,7 +1662,7 @@ App::get('/v1/messaging/messages/:messageId')
$response->dynamic($message, Response::MODEL_MESSAGE); $response->dynamic($message, Response::MODEL_MESSAGE);
}); });
App::post('/v1/messaging/messages/email/:messageId') App::patch('/v1/messaging/messages/email/:messageId')
->desc('Update an email.') ->desc('Update an email.')
->groups(['api', 'messaging']) ->groups(['api', 'messaging'])
->label('audits.event', 'messages.update') ->label('audits.event', 'messages.update')
@ -1734,6 +1734,5 @@ App::post('/v1/messaging/messages/email/:messageId')
} }
$response $response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($message, Response::MODEL_MESSAGE); ->dynamic($message, Response::MODEL_MESSAGE);
}); });

10
app/workers/messaging.php
View file

@ -100,9 +100,10 @@ class MessagingV1 extends Worker
$maxBatchSize = $adapter->getMaxMessagesPerRequest(); $maxBatchSize = $adapter->getMaxMessagesPerRequest();
$batches = \array_chunk($identifiers, $maxBatchSize); $batches = \array_chunk($identifiers, $maxBatchSize);
$batchIndex = 0;
$results = batch(\array_map(function ($batch) use ($message, $provider, $adapter) { $results = batch(\array_map(function ($batch) use ($message, $provider, $adapter, $batchIndex) {
return function () use ($batch, $message, $provider, $adapter) { return function () use ($batch, $message, $provider, $adapter, $batchIndex) {
$deliveredTo = 0; $deliveredTo = 0;
$deliveryErrors = []; $deliveryErrors = [];
$messageData = clone $message; $messageData = clone $message;
@ -117,10 +118,9 @@ class MessagingV1 extends Worker
$adapter->send($data); $adapter->send($data);
$deliveredTo += \count($batch); $deliveredTo += \count($batch);
} catch (\Exception $e) { } catch (\Exception $e) {
foreach ($batch as $identifier) { $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
$deliveryErrors[] = 'Failed to send message to target' . $identifier . ': ' . $e->getMessage();
}
} finally { } finally {
$batchIndex++;
return [ return [
'deliveredTo' => $deliveredTo, 'deliveredTo' => $deliveredTo,
'deliveryErrors' => $deliveryErrors, 'deliveryErrors' => $deliveryErrors,