Events: support for non-meetups

site/models/event.php

@@ -10,31 +10,55 @@ public function date(): Field
 		return parent::date()->value($this->num() . ' ' . $this->start()->or('18:00:00'));
 	}
 
+	public function icon(): string
+	{
+		if ($this->isMeetup() === true) {
+			return '📍';
+		}
+
+		return '🗓️';
+	}
+
+	public function isMeetup(): bool
+	{
+		return $this->city()->isNotEmpty() === true;
+	}
+
 	public function isUpcoming(): bool
 	{
 		return $this->date()->toTimestamp() >= time();
 	}
 
 	public function shortTitle(): Field
 	{
-		$title = [
-			(string)$this->city()
-		];
+		$title = [];
+
+		if ($this->content()->get('title')->isNotEmpty()) {
+			$title[] = (string)parent::title();
+		}
+
+		if ($this->city()->isNotEmpty()) {
+			$title[] = 'Kirby Meetup ' . $this->city();
+		}
 
 		if ($this->conference()->isNotEmpty()) {
 			$title[] = '@ ' . $this->conference();
 		}
 
 		if ($this->issue()->isNotEmpty()) {
-			$title[] = '№' . $this->issue();
+			$title[] = '• №' . $this->issue();
 		}
 
-		return parent::shortTitle()->value(implode(' • ', $title));
+		return parent::shortTitle()->value(implode(' ', $title));
 	}
 
 	public function title(): Field
 	{
-		return parent::title()->value('Kirby Community Meetup • ' . $this->shortTitle());
+		if ($this->isMeetup() === true) {
+			return parent::title()->value('Kirby Community Meetup • ' . $this->shortTitle());
+		}
+
+		return parent::title();
 	}
 
 }

site/snippets/templates/meet/event.php

@@ -1,5 +1,5 @@
 <a target="_blank" href="<?= $event->link() ?>" class="event">
-	<h3>📍 Kirby Meetup <?= $event->shortTitle() ?></h3>
+	<h3><?= $event->icon() ?> <?= $event->shortTitle() ?></h3>
 
 	<?php if ($event->isUpcoming() === true): ?>
 	<localized-datetime date="<?= $event->date()->toDate('Y-m-d H:i:s') ?>"><?= $event->date()->toDate('D, j M Y, H:i T') ?></localized-datetime>