From b3619d3ae12f346c2182c576af71637f38ed37d5 Mon Sep 17 00:00:00 2001 From: Benedikt Ziemons Date: Thu, 21 Jul 2022 13:39:24 +0200 Subject: [PATCH] Exclude unresolvable tickets Ticket's Matrix rooms could be missing for whatever reason. Errors are still logged. --- lib/Service/TicketService.php | 6 +++++- src/Ticket.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Service/TicketService.php b/lib/Service/TicketService.php index b96fada..106b139 100644 --- a/lib/Service/TicketService.php +++ b/lib/Service/TicketService.php @@ -50,7 +50,11 @@ class TicketService { public function findAll(string $userId): array { $dbTickets = $this->ticketMapper->findAllForUser($this->getOrCreateUser($userId)); - return array_map(function ($ticket) { return $this->resolveTicket($ticket); }, $dbTickets); + return array_filter(array_map(function ($ticket) { + return $this->resolveTicket($ticket); + }, $dbTickets), function ($resolvedTicket) { + return $resolvedTicket['status'] !== "error"; + }); } /** diff --git a/src/Ticket.vue b/src/Ticket.vue index 7635e9a..49eca11 100644 --- a/src/Ticket.vue +++ b/src/Ticket.vue @@ -56,7 +56,7 @@ export default { elementWebFrame.src = 'about:blank' elementWebFrame.onload = function() { const textElement = elementWebFrame.contentDocument.createElement('strong') - textElement.innerText = 'Textchat nicht verfügbar. Es ist noch kein Helfer zugewiesen.' + textElement.innerText = 'Textchat nicht verfügbar. Es ist noch kein(e) Helfer*in zugewiesen.' elementWebFrame.contentDocument.body.appendChild(textElement) elementWebFrame.onload = undefined }