diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-03-30 11:27:10 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-03-30 15:25:56 +0200 |
| commit | d8c269f66a4a5a17155bec5e2cb5ad97f3ba00fd (patch) | |
| tree | d456500252f4c94db8f33775242dffb2335b8e96 /mumd/src | |
| parent | 0362df3a4a5d91cb2b8e530d44de327da7a18765 (diff) | |
| download | mum-d8c269f66a4a5a17155bec5e2cb5ad97f3ba00fd.tar.gz | |
rename notify -> notifications
Notify is already taken, see https://lib.rs/crates/notify.
Diffstat (limited to 'mumd/src')
| -rw-r--r-- | mumd/src/main.rs | 4 | ||||
| -rw-r--r-- | mumd/src/notifications.rs (renamed from mumd/src/notify.rs) | 0 | ||||
| -rw-r--r-- | mumd/src/state.rs | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mumd/src/main.rs b/mumd/src/main.rs index 42be3f8..cd53d4a 100644 --- a/mumd/src/main.rs +++ b/mumd/src/main.rs @@ -3,7 +3,7 @@ mod client; mod command; mod error; mod network; -mod notify; +mod notifications; mod state; use crate::state::State; @@ -24,7 +24,7 @@ async fn main() { } setup_logger(std::io::stderr(), true); - notify::init(); + notifications::init(); // check if another instance is live let connection = UnixStream::connect(mumlib::SOCKET_PATH).await; diff --git a/mumd/src/notify.rs b/mumd/src/notifications.rs index e52b909..e52b909 100644 --- a/mumd/src/notify.rs +++ b/mumd/src/notifications.rs diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 858441a..9202e9f 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -6,7 +6,7 @@ use crate::audio::{Audio, NotificationEvents}; use crate::error::StateError; use crate::network::{ConnectionInfo, VoiceStreamType}; use crate::network::tcp::{TcpEvent, TcpEventData}; -use crate::notify; +use crate::notifications; use crate::state::server::Server; use log::*; @@ -463,7 +463,7 @@ impl State { == self.get_users_channel(self.server().unwrap().session_id().unwrap()) { if let Some(channel) = self.server().unwrap().channels().get(&channel_id) { - notify::send(format!( + notifications::send(format!( "{} connected and joined {}", &msg.get_name(), channel.name() @@ -516,7 +516,7 @@ impl State { self.get_users_channel(self.server().unwrap().session_id().unwrap()); if from_channel == this_channel || to_channel == this_channel { if let Some(channel) = self.server().unwrap().channels().get(&to_channel) { - notify::send(format!( + notifications::send(format!( "{} moved to channel {}", user.name(), channel.name() @@ -545,7 +545,7 @@ impl State { s += if deaf { " deafened" } else { " undeafened" }; } s += " themselves"; - notify::send(s); + notifications::send(s); } } } @@ -561,7 +561,7 @@ impl State { if this_channel == other_channel { self.audio.play_effect(NotificationEvents::UserDisconnected); if let Some(user) = self.server().unwrap().users().get(&msg.get_session()) { - notify::send(format!("{} disconnected", &user.name())); + notifications::send(format!("{} disconnected", &user.name())); } } |
