From 8465010f3cb51d672b60df39a7dfd34624ab5c7c Mon Sep 17 00:00:00 2001 From: Max Audron Date: Fri, 1 Oct 2021 18:13:43 +0200 Subject: migrate to separated NetworkMap and NetworkList macros --- src/message/signalproxy/objects/ignorelistmanager.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/message/signalproxy/objects/ignorelistmanager.rs') diff --git a/src/message/signalproxy/objects/ignorelistmanager.rs b/src/message/signalproxy/objects/ignorelistmanager.rs index f98ed36..a3d9798 100644 --- a/src/message/signalproxy/objects/ignorelistmanager.rs +++ b/src/message/signalproxy/objects/ignorelistmanager.rs @@ -1,10 +1,11 @@ -use libquassel_derive::Network; +use crate::message::signalproxy::translation::{Network, NetworkMap}; +use libquassel_derive::{NetworkList, NetworkMap}; + use std::convert::TryFrom; -#[derive(Debug, Clone, PartialEq, Network)] -#[network(repr = "list")] +#[derive(Debug, Clone, PartialEq, NetworkList)] pub struct IgnoreListManager { - #[network(rename = "IgnoreList", network, variant = "VariantMap")] + #[network(rename = "IgnoreList", variant = "VariantMap", network, map)] ignore_list: Vec, // // C->S calls @@ -32,7 +33,7 @@ pub struct IgnoreListManager { // update(properties: QVariantMap) } -#[derive(Debug, Clone, PartialEq, Network)] +#[derive(Debug, Clone, PartialEq, NetworkMap)] #[network(repr = "maplist")] pub struct IgnoreListItem { #[network(rename = "ignoreType", network, type = "u8")] @@ -76,7 +77,7 @@ impl TryFrom for IgnoreType { } } -impl super::Network for IgnoreType { +impl crate::message::signalproxy::Network for IgnoreType { type Item = u8; fn to_network(&self) -> Self::Item { @@ -109,7 +110,7 @@ impl TryFrom for StrictnessType { } } -impl super::Network for StrictnessType { +impl crate::message::signalproxy::Network for StrictnessType { type Item = u8; fn to_network(&self) -> Self::Item { @@ -142,7 +143,7 @@ impl TryFrom for ScopeType { } } -impl super::Network for ScopeType { +impl crate::message::signalproxy::Network for ScopeType { type Item = u8; fn to_network(&self) -> Self::Item { -- cgit v1.2.3 /1.19/_custom/mapContainers.libsonnet?h=R0flcopt3r/catinator-pet-command&id=bf06821e77078c10ab3cdd7ea3a364030c144e16'>treecommitdiff
Commit message (Collapse)AuthorLines
2021-05-26fix log breaking once buffer fullMax Audron-2/+33
the log_msg function was poping the newest message and replacing it with the newest message, it should be poping the oldest messages.
2021-05-16add deployment stuffMax Audron-6/+27786
2021-05-15add container buildMax Audron-2/+35