ProVM/emails
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various updates

Browse Source
This commit is contained in:
Aldarien
2023-06-08 20:49:27 -04:00
parent 3ed5acf75e
commit 9307ba330c
45 changed files with 864 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/common/Controller/Messages.php
View File

@ -1,13 +1,13 @@
<?php
namespace ProVM\Common\Controller;
use Ddeboer\Imap\Exception\MessageDoesNotExistException;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use ProVM\Common\Exception\Request\MissingArgument;
use ProVM\Common\Implement\Controller\Json;
use ProVM\Common\Service\Messages as Service;
use ProVM\Emails\Model\Message;
use function Safe\json_decode;
class Messages
{
@ -19,6 +19,17 @@ class Messages
$messages = array_map(function(Message $message) {
return $message->toArray();
}, $service->getAll($mailbox->getName()));
usort($messages, function($a, $b) {
$d = $a['date_time'] - $b['date_time'];
if ($d->days === 0) {
$f = strcmp($a['from'], $b['from']);
if ($f === 0) {
return strcmp($a['subject'], $b['subject']);
}
return $f;
}
return $d->format('%r%a');
});
$output = [
'mailbox' => $mailbox->toArray(),
'total' => count($messages),
@ -34,6 +45,17 @@ class Messages
}, $service->getValid($mailbox->getName())), function($message) {
return $message !== null;
}));
usort($messages, function($a, $b) {
$d = strcmp($a['date_time'], $b['date_time']);
if ($d === 0) {
$f = strcmp($a['from'], $b['from']);
if ($f === 0) {
return strcmp($a['subject'], $b['subject']);
}
return $f;
}
return $d;
});
$output = [
'mailbox' => $mailbox->toArray(),
'total' => count($messages),
@ -49,7 +71,7 @@ class Messages
public function grab(ServerRequestInterface $request, ResponseInterface $response, Service $service, \ProVM\Common\Service\Attachments $attachmentsService): ResponseInterface
{
$body = $request->getBody();
$json = \Safe\json_decode($body->getContents());
$json = json_decode($body->getContents());
if (!isset($json->mailboxes)) {
throw new MissingArgument('mailboxes', 'array', 'mailboxes names');
}
@ -70,4 +92,4 @@ class Messages
}
return $this->withJson($response, $output);
}
}
}