diff options
| -rw-r--r-- | derive/src/lib.rs | 4 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/highlightrulemanager.rs | 8 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/identity.rs | 40 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/ignorelistmanager.rs | 3 | ||||
| -rw-r--r-- | src/message/signalproxy/objects/ircuser.rs | 18 |
5 files changed, 36 insertions, 37 deletions
diff --git a/derive/src/lib.rs b/derive/src/lib.rs index 47e8ad8..11b3689 100644 --- a/derive/src/lib.rs +++ b/derive/src/lib.rs @@ -10,7 +10,7 @@ pub fn network_list(input: proc_macro::TokenStream) -> proc_macro::TokenStream { network::network_list(input) } -#[proc_macro_derive(NetworkMap, attributes(network, quassel))] +#[proc_macro_derive(NetworkMap, attributes(network))] pub fn network_map(input: proc_macro::TokenStream) -> proc_macro::TokenStream { network::network_map(input) } @@ -20,7 +20,7 @@ pub fn from(input: proc_macro::TokenStream) -> proc_macro::TokenStream { from::from(input) } -#[proc_macro_derive(Setters, attributes(setter, quassel))] +#[proc_macro_derive(Setters, attributes(setter))] pub fn setters(input: proc_macro::TokenStream) -> proc_macro::TokenStream { setters::setters(input) } diff --git a/src/message/signalproxy/objects/highlightrulemanager.rs b/src/message/signalproxy/objects/highlightrulemanager.rs index 9083686..0f1569a 100644 --- a/src/message/signalproxy/objects/highlightrulemanager.rs +++ b/src/message/signalproxy/objects/highlightrulemanager.rs @@ -195,13 +195,13 @@ pub struct HighlightRule { pub id: i32, #[network(stringlist)] pub name: String, - #[quassel(name = "isRegEx")] + #[network(rename = "isRegEx")] pub is_regex: bool, - #[quassel(name = "isCaseSensitive")] + #[network(rename = "isCaseSensitive")] pub is_case_sensitive: bool, - #[quassel(name = "isEnabled")] + #[network(rename = "isEnabled")] pub is_enabled: bool, - #[quassel(name = "isInverse")] + #[network(rename = "isInverse")] pub is_inverse: bool, #[network(stringlist)] pub sender: String, diff --git a/src/message/signalproxy/objects/identity.rs b/src/message/signalproxy/objects/identity.rs index 8831b6c..0a2aaf8 100644 --- a/src/message/signalproxy/objects/identity.rs +++ b/src/message/signalproxy/objects/identity.rs @@ -16,48 +16,48 @@ use crate::primitive::IdentityId; #[derive(Default, Debug, Clone, PartialEq, NetworkMap, NetworkList, Setters)] pub struct Identity { - #[quassel(name = "identityId")] + #[network(rename = "identityId")] pub identity_id: IdentityId, - #[quassel(name = "identityName")] + #[network(rename = "identityName")] pub identity_name: String, - #[quassel(name = "realName")] + #[network(rename = "realName")] pub real_name: String, - #[quassel(name = "nicks")] + #[network(rename = "nicks")] #[network(type = "StringList")] pub nicks: Vec<String>, /// Away Nick is not actually used - /// in official quassel client - #[quassel(name = "awayNick")] + /// in official network client + #[network(rename = "awayNick")] pub away_nick: String, - #[quassel(name = "awayNickEnabled")] + #[network(rename = "awayNickEnabled")] pub away_nick_enabled: bool, - #[quassel(name = "awayReason")] + #[network(rename = "awayReason")] pub away_reason: String, - #[quassel(name = "awayReasonEnabled")] + #[network(rename = "awayReasonEnabled")] pub away_reason_enabled: bool, - #[quassel(name = "autoAwayEnabled")] + #[network(rename = "autoAwayEnabled")] pub auto_away_enabled: bool, - #[quassel(name = "autoAwayTime")] + #[network(rename = "autoAwayTime")] pub auto_away_time: i32, - #[quassel(name = "autoAwayReason")] + #[network(rename = "autoAwayReason")] pub auto_away_reason: String, - #[quassel(name = "autoAwayReasonEnabled")] + #[network(rename = "autoAwayReasonEnabled")] pub auto_away_reason_enabled: bool, - #[quassel(name = "detachAwayEnabled")] + #[network(rename = "detachAwayEnabled")] pub detach_away_enabled: bool, - #[quassel(name = "detachAwayReason")] + #[network(rename = "detachAwayReason")] pub detach_away_reason: String, - #[quassel(name = "detachAwayReasonEnabled")] + #[network(rename = "detachAwayReasonEnabled")] pub detach_away_reason_enabled: bool, - #[quassel(name = "ident")] + #[network(rename = "ident")] pub ident: String, - #[quassel(name = "kickReason")] + #[network(rename = "kickReason")] pub kick_reason: String, - #[quassel(name = "partReason")] + #[network(rename = "partReason")] pub part_reason: String, - #[quassel(name = "quitReason")] + #[network(rename = "quitReason")] pub quit_reason: String, } diff --git a/src/message/signalproxy/objects/ignorelistmanager.rs b/src/message/signalproxy/objects/ignorelistmanager.rs index ca287e8..b97ca77 100644 --- a/src/message/signalproxy/objects/ignorelistmanager.rs +++ b/src/message/signalproxy/objects/ignorelistmanager.rs @@ -8,8 +8,7 @@ use num_derive::{FromPrimitive, ToPrimitive}; #[derive(Default, Debug, Clone, PartialEq, NetworkList, NetworkMap)] pub struct IgnoreListManager { - #[quassel(name = "IgnoreList")] - #[network(variant = "VariantMap", network = "map")] + #[network(rename = "IgnoreList", variant = "VariantMap", network = "map")] pub ignore_list: Vec<IgnoreListItem>, } diff --git a/src/message/signalproxy/objects/ircuser.rs b/src/message/signalproxy/objects/ircuser.rs index 6ddf0cc..c522c13 100644 --- a/src/message/signalproxy/objects/ircuser.rs +++ b/src/message/signalproxy/objects/ircuser.rs @@ -15,30 +15,30 @@ pub struct IrcUser { pub user: String, pub host: String, pub nick: String, - #[quassel(name = "realName")] + #[network(rename = "realName")] pub real_name: String, pub account: String, pub away: bool, - #[quassel(name = "awayMessage")] + #[network(rename = "awayMessage")] pub away_message: String, - #[quassel(name = "idleTime")] + #[network(rename = "idleTime")] pub idle_time: DateTime, - #[quassel(name = "loginTime")] + #[network(rename = "loginTime")] pub login_time: DateTime, pub server: String, - #[quassel(name = "ircOperator")] + #[network(rename = "ircOperator")] pub irc_operator: String, // #[quassel(name = "lastAwayMessage")] // pub last_away_message: i32, - #[quassel(name = "lastAwayMessageTime")] + #[network(rename = "lastAwayMessageTime")] pub last_away_message_time: DateTime, - #[quassel(name = "whoisServiceReply")] + #[network(rename = "whoisServiceReply")] pub whois_service_reply: String, - #[quassel(name = "suserHost")] + #[network(rename = "suserHost")] pub suser_host: String, pub encrypted: bool, pub channels: StringList, - #[quassel(name = "userModes")] + #[network(rename = "userModes")] pub user_modes: String, } |