From 17f077d48b361a4cf8f5743750ca7408a8800797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 7 Jun 2021 01:30:40 +0200
Subject: timestamps on mumble events

---
 mumd/Cargo.toml   |  1 +
 mumd/src/state.rs | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'mumd')

diff --git a/mumd/Cargo.toml b/mumd/Cargo.toml
index d8e2635..1e8e63f 100644
--- a/mumd/Cargo.toml
+++ b/mumd/Cargo.toml
@@ -42,6 +42,7 @@ tokio-stream = "0.1.0"
 tokio-native-tls = "0.3"
 tokio-util = { version = "0.6", features = ["codec", "net"] }
 bincode = "1.3.2"
+chrono = "0.4"
 
 libnotify = { version = "1.0", optional = true }
 
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index c51c139..ec25204 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -15,7 +15,7 @@ use mumble_protocol::control::msgs;
 use mumble_protocol::control::ControlPacket;
 use mumble_protocol::ping::PongPacket;
 use mumble_protocol::voice::Serverbound;
-use mumlib::command::{Command, CommandResponse, Event, MessageTarget};
+use mumlib::command::{Command, CommandResponse, MessageTarget, MumbleEvent, MumbleEventKind};
 use mumlib::config::Config;
 use mumlib::Error;
 use std::{
@@ -76,7 +76,7 @@ pub struct State {
 
     phase_watcher: (watch::Sender<StatePhase>, watch::Receiver<StatePhase>),
 
-    events: Vec<Event>,
+    events: Vec<MumbleEvent>,
 }
 
 impl State {
@@ -146,7 +146,7 @@ impl State {
                         ));
                     }
                     let this_channel_name = this_channel_name.map(|s| s.to_string());
-                    self.push_event(Event::UserConnected(msg.get_name().to_string(), this_channel_name));
+                    self.push_event(MumbleEventKind::UserConnected(msg.get_name().to_string(), this_channel_name));
                     self.audio_output
                         .play_effect(NotificationEvents::UserConnected);
                 }
@@ -244,7 +244,7 @@ impl State {
             if let Some(user) = self.server().unwrap().users().get(&msg.get_session()) {
                 notifications::send(format!("{} disconnected", &user.name()));
                 let user_name = user.name().to_string();
-                self.push_event(Event::UserDisconnected(user_name, channel_name));
+                self.push_event(MumbleEventKind::UserDisconnected(user_name, channel_name));
             }
         }
 
@@ -287,8 +287,8 @@ impl State {
             .play_effect(NotificationEvents::ServerConnect);
     }
 
-    pub fn push_event(&mut self, event: Event) {
-        self.events.push(event);
+    pub fn push_event(&mut self, kind: MumbleEventKind) {
+        self.events.push(MumbleEvent { timestamp: chrono::Local::now().naive_local(), kind });
     }
 
     pub fn audio_input(&self) -> &AudioInput {
-- 
cgit v1.2.1