From 1d05a7394e5cf72538cc79b22c5f9330f179cfc3 Mon Sep 17 00:00:00 2001 From: Max Audron Date: Sun, 23 Feb 2025 17:37:39 +0100 Subject: move network config to it's own file and impl it's sync --- src/message/signalproxy/objects/mod.rs | 2 + src/message/signalproxy/objects/network.rs | 22 +------- src/message/signalproxy/objects/networkconfig.rs | 67 ++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 src/message/signalproxy/objects/networkconfig.rs (limited to 'src/message') diff --git a/src/message/signalproxy/objects/mod.rs b/src/message/signalproxy/objects/mod.rs index b3b2858..0fb16c6 100644 --- a/src/message/signalproxy/objects/mod.rs +++ b/src/message/signalproxy/objects/mod.rs @@ -12,6 +12,7 @@ mod ignorelistmanager; mod ircchannel; mod ircuser; mod network; +mod networkconfig; mod networkinfo; pub use aliasmanager::*; @@ -28,6 +29,7 @@ pub use ignorelistmanager::*; pub use ircchannel::*; pub use ircuser::*; pub use network::*; +pub use networkconfig::*; pub use networkinfo::*; use libquassel_derive::From; diff --git a/src/message/signalproxy/objects/network.rs b/src/message/signalproxy/objects/network.rs index a8a882d..9f0150f 100644 --- a/src/message/signalproxy/objects/network.rs +++ b/src/message/signalproxy/objects/network.rs @@ -5,7 +5,7 @@ use log::{error, warn}; use num_derive::{FromPrimitive, ToPrimitive}; use num_traits::{FromPrimitive, ToPrimitive}; -use libquassel_derive::{sync, NetworkList, NetworkMap, Setters}; +use libquassel_derive::{sync, NetworkMap, Setters}; use crate::error::ProtocolError; use crate::message::signalproxy::translation::NetworkMap; @@ -616,26 +616,6 @@ pub struct NetworkServer { pub proxy_pass: String, } -#[derive(Debug, Clone, PartialEq, NetworkList)] -pub struct NetworkConfig { - #[network(rename = "pingTimeoutEnabled")] - ping_timeout_enabled: bool, - #[network(rename = "pingInterval")] - ping_interval: i32, - #[network(rename = "maxPingCount")] - max_ping_count: i32, - #[network(rename = "autoWhoEnabled")] - auto_who_enabled: bool, - #[network(rename = "autoWhoInterval")] - auto_who_interval: i32, - #[network(rename = "autoWhoNickLimit")] - auto_who_nick_limit: i32, - #[network(rename = "autoWhoDelay")] - auto_who_delay: i32, - #[network(rename = "standardCtcp")] - standard_ctcp: bool, -} - #[cfg(test)] mod tests { use super::*; diff --git a/src/message/signalproxy/objects/networkconfig.rs b/src/message/signalproxy/objects/networkconfig.rs new file mode 100644 index 0000000..c4f5397 --- /dev/null +++ b/src/message/signalproxy/objects/networkconfig.rs @@ -0,0 +1,67 @@ +use libquassel_derive::{NetworkList, NetworkMap, Setters}; + +use crate::message::{Class, Syncable}; + +#[derive(Debug, Default, Clone, PartialEq, NetworkList, NetworkMap, Setters)] +pub struct NetworkConfig { + #[network(rename = "pingTimeoutEnabled")] + ping_timeout_enabled: bool, + #[network(rename = "pingInterval")] + ping_interval: i32, + #[network(rename = "maxPingCount")] + max_ping_count: i32, + #[network(rename = "autoWhoEnabled")] + auto_who_enabled: bool, + #[network(rename = "autoWhoInterval")] + auto_who_interval: i32, + #[network(rename = "autoWhoNickLimit")] + auto_who_nick_limit: i32, + #[network(rename = "autoWhoDelay")] + auto_who_delay: i32, + #[network(rename = "standardCtcp")] + standard_ctcp: bool, +} + +impl Syncable for NetworkConfig { + const CLASS: Class = Class::NetworkConfig; +} + +#[cfg(feature = "client")] +impl crate::message::StatefulSyncableClient for NetworkConfig { + fn sync_custom(&mut self, mut msg: crate::message::SyncMessage) + where + Self: Sized, + { + match msg.slot_name.as_str() { + "setAutoWhoDelay" => self.set_auto_who_delay(get_param!(msg)), + "setAutoWhoEnabled" => self.set_auto_who_enabled(get_param!(msg)), + "setAutoWhoInterval" => self.set_auto_who_interval(get_param!(msg)), + "setAutoWhoNickLimit" => self.set_auto_who_nick_limit(get_param!(msg)), + "setMaxPingCount" => self.set_max_ping_count(get_param!(msg)), + "setPingInterval" => self.set_ping_interval(get_param!(msg)), + "setPingTimeoutEnabled" => self.set_ping_timeout_enabled(get_param!(msg)), + "setStandardCtcp" => self.set_standard_ctcp(get_param!(msg)), + _ => (), + } + } +} + +#[cfg(feature = "server")] +impl crate::message::StatefulSyncableServer for NetworkConfig { + fn sync_custom(&mut self, mut msg: crate::message::SyncMessage) + where + Self: Sized, + { + match msg.slot_name.as_str() { + "requestSetAutoWhoDelay" => self.set_auto_who_delay(get_param!(msg)), + "requestSetAutoWhoEnabled" => self.set_auto_who_enabled(get_param!(msg)), + "requestSetAutoWhoInterval" => self.set_auto_who_interval(get_param!(msg)), + "requestSetAutoWhoNickLimit" => self.set_auto_who_nick_limit(get_param!(msg)), + "requestSetMaxPingCount" => self.set_max_ping_count(get_param!(msg)), + "requestSetPingInterval" => self.set_ping_interval(get_param!(msg)), + "requestSetPingTimeoutEnabled" => self.set_ping_timeout_enabled(get_param!(msg)), + "requestSetStandardCtcp" => self.set_standard_ctcp(get_param!(msg)), + _ => (), + } + } +} -- cgit v1.2.3