6 files changed, 22 insertions, 27 deletions
diff --git a/src/message/signalproxy/objects/aliasmanager.rs b/src/message/signalproxy/objects/aliasmanager.rs
index d35f145..02add49 100644
--- a/src/message/signalproxy/objects/aliasmanager.rs
+++ b/src/message/signalproxy/objects/aliasmanager.rs
@@ -2,6 +2,8 @@
 use libquassel_derive::sync;
 use libquassel_derive::{NetworkList, NetworkMap};
 
+#[allow(unused_imports)]
+use crate::message::signalproxy::translation::NetworkMap;
 use crate::message::Class;
 #[allow(unused_imports)]
 use crate::message::StatefulSyncableClient;
diff --git a/src/message/signalproxy/objects/bufferviewmanager.rs b/src/message/signalproxy/objects/bufferviewmanager.rs
index 50265dc..683d937 100644
--- a/src/message/signalproxy/objects/bufferviewmanager.rs
+++ b/src/message/signalproxy/objects/bufferviewmanager.rs
@@ -54,7 +54,7 @@ impl BufferViewManager {
 
     #[cfg(feature = "server")]
     pub fn add_buffer_view_config(&mut self, config: BufferViewConfig) {
-        self.buffer_view_configs.insert(0, config);
+        self.buffer_view_configs.insert(0, Some(config));
 
         sync!("addBufferViewConfig", [0]);
     }
@@ -72,7 +72,8 @@ impl BufferViewManager {
         if let Some(stored) = self.buffer_view_configs.get_mut(&config.buffer_view_id) {
             *stored = Some(config);
         } else {
-            self.buffer_view_configs.insert(config.buffer_view_id, Some(config));
+            self.buffer_view_configs
+                .insert(config.buffer_view_id, Some(config));
         }
     }
 }
@@ -102,9 +103,9 @@ impl StatefulSyncableServer for BufferViewManager {
         Self: Sized,
     {
         match msg.slot_name.as_str() {
-            "requestCreateBufferView" => self.add_buffer_view_config(
-                BufferViewConfig::from_network_map(&mut msg.params.remove(0).try_into().unwrap()),
-            ),
+            "requestCreateBufferView" => self.add_buffer_view_config(BufferViewConfig::from_network_map(
+                &mut msg.params.remove(0).try_into().unwrap(),
+            )),
             "requestCreateBufferViews" => {
                 let views: VariantList = msg.params.remove(0).try_into().unwrap();
                 views.into_iter().for_each(|view| {
diff --git a/src/message/signalproxy/objects/chanmodes.rs b/src/message/signalproxy/objects/chanmodes.rs
index a13a0bb..1161e28 100644
--- a/src/message/signalproxy/objects/chanmodes.rs
+++ b/src/message/signalproxy/objects/chanmodes.rs
@@ -1,31 +1,25 @@
 use std::collections::HashMap;
 
-use libquassel_derive::Setters;
-
 use crate::{
     message::NetworkMap,
     primitive::{StringList, Variant, VariantMap},
 };
 
-#[derive(Debug, Clone, PartialEq, Setters)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct ChanModes {
     /// Modes that add or remove items from a list, like commonly +b for the banlist.
     ///
     /// Always require a parameter from server to client.
     /// Clients can request the whole list by leaving the parameter empty
-    #[setter(skip)]
     pub channel_modes_a: HashMap<char, StringList>,
 
     /// Modes that take a parameter as setting and require it when setting or removing the mode.
-    #[setter(skip)]
     pub channel_modes_b: HashMap<char, String>,
 
     /// Modes that take a parameter as setting, but only require it when setting the mode.
-    #[setter(skip)]
     pub channel_modes_c: HashMap<char, String>,
 
     /// Modes without a parameter.
-    #[setter(skip)]
     pub channel_modes_d: String,
 }
 
@@ -136,9 +130,6 @@ mod tests {
 
     #[test]
     fn chanmodes_from_network() {
-        assert_eq!(
-            ChanModes::from_network_map(&mut get_network()),
-            get_runtime()
-        )
+        assert_eq!(ChanModes::from_network_map(&mut get_network()), get_runtime())
     }
 }
diff --git a/src/message/signalproxy/objects/highlightrulemanager.rs b/src/message/signalproxy/objects/highlightrulemanager.rs
index 8d2b4ee..bd96d89 100644
--- a/src/message/signalproxy/objects/highlightrulemanager.rs
+++ b/src/message/signalproxy/objects/highlightrulemanager.rs
@@ -10,6 +10,8 @@ use crate::message::StatefulSyncableServer;
 use crate::message::Syncable;
 use crate::primitive::Variant;
 
+use crate::message::signalproxy::translation::NetworkMap;
+
 #[derive(Default, Debug, Clone, PartialEq, NetworkList, NetworkMap)]
 pub struct HighlightRuleManager {
     #[network(rename = "HighlightRuleList", variant = "VariantMap", network = "map")]
@@ -120,7 +122,7 @@ impl HighlightRuleManager {
 
     pub fn set_highlight_nick(&mut self, nick: HighlightNickType) {
         #[cfg(feature = "server")]
-        sync!("setHighlightNick", [nick.to_network()]);
+        sync!("setHighlightNick", [Variant::from(nick)]);
 
         self.highlight_nick = nick;
     }
@@ -209,7 +211,7 @@ pub struct HighlightRule {
     pub channel: String,
 }
 
-#[derive(Default, Debug, Clone, PartialEq)]
+#[derive(Default, Debug, Clone, Copy, PartialEq)]
 pub enum HighlightNickType {
     #[default]
     NoNick = 0x00,
diff --git a/src/message/signalproxy/objects/ircchannel.rs b/src/message/signalproxy/objects/ircchannel.rs
index 15ed5f3..7d4b0e4 100644
--- a/src/message/signalproxy/objects/ircchannel.rs
+++ b/src/message/signalproxy/objects/ircchannel.rs
@@ -14,6 +14,7 @@ use super::{ChanModes, ChannelModeType};
 #[derive(Debug, Clone, PartialEq, Setters, NetworkList, NetworkMap)]
 #[network(repr = "maplist")]
 pub struct IrcChannel {
+    #[setter(skip)]
     #[network(rename = "ChanModes", variant = "VariantMap", network = "map")]
     pub chan_modes: ChanModes,
 
@@ -187,7 +188,7 @@ impl crate::message::StatefulSyncableClient for IrcChannel {
 #[cfg(feature = "server")]
 impl crate::message::StatefulSyncableServer for IrcChannel {
     /// Not Implemented for this type
-    fn request_update(&mut self, _param: <IrcChannel as NetworkMap>::Item)
+    fn request_update(&mut self, _param: <IrcChannel as crate::message::NetworkMap>::Item)
     where
         Self: Sized,
     {
diff --git a/src/message/signalproxy/objects/ircuser.rs b/src/message/signalproxy/objects/ircuser.rs
index 61c4a2e..93ae013 100644
--- a/src/message/signalproxy/objects/ircuser.rs
+++ b/src/message/signalproxy/objects/ircuser.rs
@@ -6,10 +6,10 @@ use crate::{
 use itertools::Itertools;
 #[cfg(feature = "server")]
 use libquassel_derive::sync;
-use libquassel_derive::{NetworkMap, Setters};
+use libquassel_derive::{NetworkList, NetworkMap, Setters};
 
 #[allow(dead_code)]
-#[derive(Debug, Clone, PartialEq, NetworkMap, Setters)]
+#[derive(Debug, Clone, PartialEq, NetworkList, NetworkMap, Setters)]
 #[network(repr = "maplist")]
 pub struct IrcUser {
     pub user: String,
@@ -98,12 +98,10 @@ impl Syncable for IrcUser {
     const CLASS: Class = Class::IrcUser;
 
     fn send_sync(&self, function: &str, params: crate::primitive::VariantList) {
-        crate::message::signalproxy::SYNC_PROXY.get().unwrap().sync(
-            Self::CLASS,
-            None,
-            function,
-            params,
-        );
+        crate::message::signalproxy::SYNC_PROXY
+            .get()
+            .unwrap()
+            .sync(Self::CLASS, None, function, params);
     }
 }