From 52a4740f252391c944bf910c1a81a07bd7aea610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Tue, 8 Jun 2021 10:00:33 +0200
Subject: always send user joined/left channels and events

---
 mumlib/src/command.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mumlib/src')

diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs
index fff921a..f1b52b8 100644
--- a/mumlib/src/command.rs
+++ b/mumlib/src/command.rs
@@ -20,8 +20,8 @@ impl fmt::Display for MumbleEvent {
 /// The different kinds of events that can happen.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum MumbleEventKind {
-    UserConnected(String, Option<String>),
-    UserDisconnected(String, Option<String>),
+    UserConnected(String, String),
+    UserDisconnected(String, String),
     UserMuteStateChanged(String),  // This logic is kinda weird so we only store the rendered message.
     TextMessageReceived(String),
     UserJoinedChannel(String, String),
@@ -34,10 +34,10 @@ impl fmt::Display for MumbleEventKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             MumbleEventKind::UserConnected(user, channel) => {
-                write!(f, "{} connected to {}", user, channel.as_deref().unwrap_or("unknown channel"))
+                write!(f, "{} connected to {}", user, channel)
             }
             MumbleEventKind::UserDisconnected(user, channel) => {
-                write!(f, "{} disconnected from {}", user, channel.as_deref().unwrap_or("unknown channel"))
+                write!(f, "{} disconnected from {}", user, channel)
             }
             MumbleEventKind::UserMuteStateChanged(message) => {
                 write!(f, "{}", message)
-- 
cgit v1.2.1