From af573b4901abb9ae2620b3358b2da02e4cdf8328 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Wed, 12 Sep 2018 19:04:01 +0200 Subject: [PATCH] fix message showing --- resources/components/fold.html | 2 +- resources/ts/components/messages.ts | 2 +- src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php | 9 ++++++--- .../ZtmGdansk/ZtmGdanskMessageTypeClassifier.php | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/components/fold.html b/resources/components/fold.html index 540b679..033e008 100644 --- a/resources/components/fold.html +++ b/resources/components/fold.html @@ -1,4 +1,4 @@ -
+
diff --git a/resources/ts/components/messages.ts b/resources/ts/components/messages.ts index 996236b..5042d23 100644 --- a/resources/ts/components/messages.ts +++ b/resources/ts/components/messages.ts @@ -22,7 +22,7 @@ export class MessagesComponent extends Vue { this.messages = await response.json(); } - this.$emit('updated', this.messages); + this.$emit('update', this.messages); } public icon(message: Message) { diff --git a/src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php b/src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php index 4da037c..1999211 100644 --- a/src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php +++ b/src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php @@ -40,10 +40,13 @@ class ZtmGdanskMessageRepository implements MessageRepository 'validTo' => new Carbon($message['endDate']), ]); - $message->setType($this->classifier->classify($message)); + if ($type = $this->classifier->classify($message)) { + $message->setType($type); + return $message; + } - return $message; - }); + return null; + })->filter()->values(); } public function getForStop(Stop $stop): Collection diff --git a/src/Provider/ZtmGdansk/ZtmGdanskMessageTypeClassifier.php b/src/Provider/ZtmGdansk/ZtmGdanskMessageTypeClassifier.php index ca67c54..862d73c 100644 --- a/src/Provider/ZtmGdansk/ZtmGdanskMessageTypeClassifier.php +++ b/src/Provider/ZtmGdansk/ZtmGdanskMessageTypeClassifier.php @@ -13,7 +13,7 @@ class ZtmGdanskMessageTypeClassifier return Message::TYPE_BREAKDOWN; case preg_match('#gdansk.pl/powietrze#i', $message->getMessage()): - return Message::TYPE_INFO; + return false; // spam default: return Message::TYPE_UNKNOWN;