fix ircchannel and maplist network representation

1 files changed, 12 insertions, 19 deletions

diff --git a/src/message/signalproxy/objects/mod.rs b/src/message/signalproxy/objects/mod.rs
index de5bf35..b3b2858 100644
--- a/src/message/signalproxy/objects/mod.rs
+++ b/src/message/signalproxy/objects/mod.rs
@@ -1,31 +1,31 @@
 mod aliasmanager;
-mod buffersyncer;
 mod backlogmanager;
-mod bufferviewmanager;
+mod buffersyncer;
 mod bufferviewconfig;
+mod bufferviewmanager;
 mod certmanager;
+mod chanmodes;
 mod coreinfo;
 mod highlightrulemanager;
 mod identity;
 mod ignorelistmanager;
 mod ircchannel;
-mod chanmodes;
 mod ircuser;
 mod network;
 mod networkinfo;
 
 pub use aliasmanager::*;
-pub use buffersyncer::*;
 pub use backlogmanager::*;
-pub use bufferviewmanager::*;
+pub use buffersyncer::*;
 pub use bufferviewconfig::*;
+pub use bufferviewmanager::*;
 pub use certmanager::*;
+pub use chanmodes::*;
 pub use coreinfo::*;
 pub use highlightrulemanager::*;
 pub use identity::*;
 pub use ignorelistmanager::*;
 pub use ircchannel::*;
-pub use chanmodes::*;
 pub use ircuser::*;
 pub use network::*;
 pub use networkinfo::*;
@@ -70,7 +70,7 @@ pub enum Types {
     Network(network::Network),
     NetworkInfo(NetworkInfo),
     NetworkConfig(NetworkConfig),
-    // IrcChannel(IrcChannel),
+    IrcChannel(IrcChannel),
     Unknown(VariantList),
 }
 
@@ -90,16 +90,13 @@ impl Types {
             Types::Network(val) => val.to_network_list(),
             Types::NetworkInfo(val) => val.to_network_list(),
             Types::NetworkConfig(val) => val.to_network_list(),
-            // Types::IrcChannel(val) => todo!(),
+            Types::IrcChannel(val) => val.to_network_list(),
             Types::Unknown(val) => val.clone(),
         }
     }
 
     pub fn from_network(class_name: &str, object_name: &str, input: &mut VariantList) -> Self {
-        debug!(
-            "converting {} from network object: {:#?}",
-            class_name, input
-        );
+        debug!("converting {} from network object: {:#?}", class_name, input);
         match class_name {
             "AliasManager" => Types::AliasManager(AliasManager::from_network_list(input)),
             "BufferSyncer" => Types::BufferSyncer(BufferSyncer::from_network_list(input)),
@@ -108,9 +105,7 @@ impl Types {
                 config.buffer_view_id = object_name.parse().unwrap();
                 Types::BufferViewConfig(config)
             }
-            "BufferViewManager" => {
-                Types::BufferViewManager(BufferViewManager::from_network_list(input))
-            }
+            "BufferViewManager" => Types::BufferViewManager(BufferViewManager::from_network_list(input)),
             // "CoreInfo" => Types::CoreInfo(CoreInfo::from_network_map(
             //     &mut input.remove(0).try_into().unwrap(),
             // )),
@@ -120,14 +115,12 @@ impl Types {
             "HighlightRuleManager" => {
                 Types::HighlightRuleManager(HighlightRuleManager::from_network_list(input))
             }
-            "IgnoreListManager" => {
-                Types::IgnoreListManager(IgnoreListManager::from_network_list(input))
-            }
+            "IgnoreListManager" => Types::IgnoreListManager(IgnoreListManager::from_network_list(input)),
             "CertManager" => Types::CertManager(CertManager::from_network_list(input)),
             "Network" => Types::Network(Network::from_network_list(input)),
             "NetworkInfo" => Types::NetworkInfo(NetworkInfo::from_network_list(input)),
             "NetworkConfig" => Types::NetworkConfig(NetworkConfig::from_network_list(input)),
-            // "IrcChannel" => Types::IrcChannel(IrcChannel::from_network_list(input)),
+            "IrcChannel" => Types::IrcChannel(IrcChannel::from_network_list(input)),
             _ => Types::Unknown(input.to_owned()),
         }
     }