diff --git a/Cargo.toml b/Cargo.toml index 41b499493b2c8857e172a423405052aac4cfdbac..77946dea8f8356c1ecb3048feb8ab25b536bf22d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,3 +16,4 @@ serde_yaml = "^0.8" serenity = "0.8.0" simplelog = "^0.7.4" guard = "0.5.0" +indexmap = "1.3.1" diff --git a/src/config.rs b/src/config.rs index 452553cb208a676073def9585ab2b9407410ec90..376b9fa50d380201948f1d0dafa6864be6a142dc 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,7 +1,8 @@ +extern crate indexmap; use serde::Deserialize; use serde_yaml; use serenity::model::id; -use std::collections::HashMap; +use indexmap::IndexMap; use std::fs; lazy_static! { @@ -44,8 +45,10 @@ impl UccbotConfig { } } +pub type ReactRoleMap = IndexMap<String, id::RoleId>; + #[derive(Debug, Deserialize, Clone)] pub struct ReactionMapping { pub message: serenity::model::id::MessageId, - pub mapping: HashMap<String, id::RoleId>, + pub mapping: ReactRoleMap, } diff --git a/src/reaction_roles.rs b/src/reaction_roles.rs index 35861b9884ce757f059392758e82b17a6684221a..faa2a238d81a517104548cb6818de392aa1be86d 100644 --- a/src/reaction_roles.rs +++ b/src/reaction_roles.rs @@ -1,4 +1,4 @@ -use crate::config::CONFIG; +use crate::config::{CONFIG, ReactRoleMap}; use crate::util::{get_react_from_string, get_string_from_react}; use serenity::{ client::Context, @@ -178,7 +178,7 @@ fn get_all_role_reaction_message( ctx: &Context, ) -> Vec<( Message, - &'static HashMap<String, serenity::model::id::RoleId>, + &'static ReactRoleMap, )> { let guild = ctx.http.get_guild(CONFIG.server_id).unwrap(); info!(" Find role-react message: guild determined");