WIP

2 files changed, 9 insertions, 6 deletions

diff --git a/src/message/signalproxy/objects/aliasmanager.rs b/src/message/signalproxy/objects/aliasmanager.rs
index d0e5d5b..2a29865 100644
--- a/src/message/signalproxy/objects/aliasmanager.rs
+++ b/src/message/signalproxy/objects/aliasmanager.rs
@@ -1,12 +1,15 @@
-use libquassel_derive::Network;
+use libquassel_derive::{Network, NetworkList, NetworkMap};
 
 use crate::message::{StatefulSyncable, SyncProxy, Syncable};
 
+use crate::message::signalproxy::translation::Network;
+use crate::primitive::{VariantList, VariantMap};
+
 /// AliasManager
 /// keeps a list of all registered aliases
 /// syncable
-#[derive(Clone, Debug, std::cmp::PartialEq, Network)]
-#[network(repr = "list")]
+#[derive(Clone, Debug, std::cmp::PartialEq, NetworkList, NetworkMap)]
+#[network]
 pub struct AliasManager {
     #[network(rename = "Aliases", variant = "VariantMap", network)]
     pub aliases: Vec<Alias>,
diff --git a/src/message/signalproxy/objects/mod.rs b/src/message/signalproxy/objects/mod.rs
index 59c196d..124ed10 100644
--- a/src/message/signalproxy/objects/mod.rs
+++ b/src/message/signalproxy/objects/mod.rs
@@ -29,7 +29,7 @@ pub use networkinfo::*;
 use libquassel_derive::From;
 use log::debug;
 
-use super::Network;
+use super::{Network, NetworkList, NetworkMap};
 use crate::primitive::VariantList;
 
 /// Central Enum containing and identifying all Quassel Protocol Types:
@@ -72,7 +72,7 @@ impl Types {
     pub fn to_network(&self) -> VariantList {
         debug!("converting to network object: {:#?}", self);
         match self {
-            Types::AliasManager(val) => val.to_network(),
+            Types::AliasManager(val) => val.to_network_list(),
             Types::BufferSyncer(val) => val.to_network(),
             Types::BufferViewConfig(val) => val.to_network(),
             Types::BufferViewManager(val) => val.to_network(),
@@ -94,7 +94,7 @@ impl Types {
             class_name, input
         );
         match class_name {
-            "AliasManager" => Types::AliasManager(AliasManager::from_network(input)),
+            "AliasManager" => Types::AliasManager(AliasManager::from_network_list(input)),
             "BufferSyncer" => Types::BufferSyncer(BufferSyncer::from_network(input)),
             "BufferViewConfig" => Types::BufferViewConfig(BufferViewConfig::from_network(input)),
             "BufferViewManager" => Types::BufferViewManager(BufferViewManager::from_network(input)),