diff options
| author | Max Audron <audron@cocaine.farm> | 2025-02-26 19:15:11 +0100 |
|---|---|---|
| committer | Max Audron <audron@cocaine.farm> | 2025-02-26 19:20:33 +0100 |
| commit | 58eb9e51595838aa28e24db69ff01a5509852357 (patch) | |
| tree | 48f0c018d14264c34287a5f3c9e4649d20cb50de /src/message | |
| parent | refactor variant deserialization (diff) | |
implement IdentityId
Diffstat (limited to 'src/message')
| -rw-r--r-- | src/message/signalproxy/objects/identity.rs | 3 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/networkinfo.rs | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/message/signalproxy/objects/identity.rs b/src/message/signalproxy/objects/identity.rs index a34125f..8831b6c 100644 --- a/src/message/signalproxy/objects/identity.rs +++ b/src/message/signalproxy/objects/identity.rs @@ -12,11 +12,12 @@ use crate::message::Syncable; #[allow(unused_imports)] use crate::message::signalproxy::translation::NetworkMap; +use crate::primitive::IdentityId; #[derive(Default, Debug, Clone, PartialEq, NetworkMap, NetworkList, Setters)] pub struct Identity { #[quassel(name = "identityId")] - pub identity_id: i32, + pub identity_id: IdentityId, #[quassel(name = "identityName")] pub identity_name: String, #[quassel(name = "realName")] diff --git a/src/message/signalproxy/objects/networkinfo.rs b/src/message/signalproxy/objects/networkinfo.rs index 11a4d0f..b3b2a4d 100644 --- a/src/message/signalproxy/objects/networkinfo.rs +++ b/src/message/signalproxy/objects/networkinfo.rs @@ -1,6 +1,6 @@ use crate::{ message::{Class, Syncable}, - primitive::StringList, + primitive::{IdentityId, StringList}, }; use libquassel_derive::{NetworkList, NetworkMap, Setters}; @@ -39,7 +39,7 @@ pub struct NetworkInfo { // TODO add these type aliases or usertypes in variants // pub network_id: NetworkId, #[network(rename = "identityId")] - pub identity_id: i32, + pub identity_id: IdentityId, #[network(rename = "msgRateBurstSize")] pub msg_rate_burst_size: u32, #[network(rename = "msgRateMessageDelay")] @@ -120,7 +120,7 @@ mod tests { Variant::ByteArray(s!("codecForDecoding")), Variant::ByteArray(s!("")), Variant::ByteArray(s!("identityId")), - Variant::i32(0), + Variant::IdentityId(IdentityId(0)), Variant::ByteArray(s!("msgRateBurstSize")), Variant::u32(5), Variant::ByteArray(s!("msgRateMessageDelay")), @@ -150,7 +150,7 @@ mod tests { fn get_runtime() -> NetworkInfo { NetworkInfo { - identity_id: 0, + identity_id: IdentityId(0), network_name: s!("snoonet"), server_list: vec![], perform: vec![s!("")], |