diff --git a/src/main.rs b/src/main.rs index 9121024e38619bc7b4adb7de3b6cb524bb894ba0..2207e5ffd6f9b8e360898d2db279bae27000f3d4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,9 +3,10 @@ extern crate lazy_static; #[macro_use] extern crate log; -extern crate simplelog; extern crate indexmap; -#[macro_use] extern crate guard; +extern crate simplelog; +#[macro_use] +extern crate guard; use simplelog::*; use std::fs::{read_to_string, File}; @@ -109,7 +110,7 @@ impl EventHandler for Handler { if message_type == MessageType::RoleReactMessage && add_reaction.user_id.0 != CONFIG.bot_id { - add_role_by_reaction(ctx, message, add_reaction); + add_role_by_reaction(&ctx, message, add_reaction); return; } if message.author.id.0 != CONFIG.bot_id || add_reaction.user_id == CONFIG.bot_id { @@ -159,7 +160,7 @@ impl EventHandler for Handler { if message_type == MessageType::RoleReactMessage && removed_reaction.user_id != CONFIG.bot_id { - remove_role_by_reaction(ctx, message, removed_reaction); + remove_role_by_reaction(&ctx, message, removed_reaction); return; } if message.author.id.0 != CONFIG.bot_id || removed_reaction.user_id == CONFIG.bot_id @@ -191,11 +192,11 @@ impl EventHandler for Handler { // In this case, just print what the current user's username is. fn ready(&self, ctx: Context, ready: Ready) { info!("{} is connected!", ready.user.name); - reaction_roles::sync_all_role_reactions(ctx); + reaction_roles::sync_all_role_reactions(&ctx); } fn resume(&self, ctx: Context, _: serenity::model::event::ResumedEvent) { - reaction_roles::sync_all_role_reactions(ctx); + reaction_roles::sync_all_role_reactions(&ctx); } } diff --git a/src/reaction_roles.rs b/src/reaction_roles.rs index 3607c88aed6240ef4031467f1e2fadb158832438..3c4ba9e91c46c7aee1102c645b269f6482239a38 100644 --- a/src/reaction_roles.rs +++ b/src/reaction_roles.rs @@ -17,10 +17,10 @@ macro_rules! e { }; } -pub fn add_role_by_reaction(ctx: Context, msg: Message, added_reaction: Reaction) { +pub fn add_role_by_reaction(ctx: &Context, msg: Message, added_reaction: Reaction) { let user = added_reaction .user_id - .to_user(&ctx) + .to_user(ctx) .expect("Unable to get user"); if let Some(role_id) = CONFIG .react_role_messages @@ -35,7 +35,7 @@ pub fn add_role_by_reaction(ctx: Context, msg: Message, added_reaction: Reaction "{} requested role '{}'", user.name, role_id - .to_role_cached(&ctx) + .to_role_cached(ctx) .expect("Unable to get role") .name ); @@ -48,11 +48,11 @@ pub fn add_role_by_reaction(ctx: Context, msg: Message, added_reaction: Reaction .ok(); } else { warn!("{} provided invalid react for role", user.name); - e!("Unable to delete react: {:?}", added_reaction.delete(&ctx)); + e!("Unable to delete react: {:?}", added_reaction.delete(ctx)); } } -pub fn remove_role_by_reaction(ctx: Context, msg: Message, removed_reaction: Reaction) { +pub fn remove_role_by_reaction(ctx: &Context, msg: Message, removed_reaction: Reaction) { CONFIG .react_role_messages .iter() @@ -66,7 +66,7 @@ pub fn remove_role_by_reaction(ctx: Context, msg: Message, removed_reaction: Rea "{} requested removal of role '{}'", msg.author.name, role_id - .to_role_cached(&ctx) + .to_role_cached(ctx) .expect("Unable to get role") .name ); @@ -80,9 +80,9 @@ pub fn remove_role_by_reaction(ctx: Context, msg: Message, removed_reaction: Rea }); } -pub fn sync_all_role_reactions(ctx: Context) { +pub fn sync_all_role_reactions(ctx: &Context) { info!("Syncing roles to reactions"); - let messages_with_role_mappings = get_all_role_reaction_message(&ctx); + let messages_with_role_mappings = get_all_role_reaction_message(ctx); info!(" Sync: reaction messages fetched"); let guild = ctx.http.get_guild(CONFIG.server_id).unwrap(); info!(" Sync: guild fetched"); @@ -115,7 +115,7 @@ pub fn sync_all_role_reactions(ctx: Context) { i, react_as_string ); for _illegal_react in - &message.reaction_users(&ctx, react.reaction_type.clone(), Some(100), None) + &message.reaction_users(ctx, react.reaction_type.clone(), Some(100), None) { warn!(" need to implement react removal"); } @@ -133,7 +133,7 @@ pub fn sync_all_role_reactions(ctx: Context) { if !reactor_ids.contains(&UserId::from(CONFIG.bot_id)) { e!( "Unable to add reaction, {:?}", - message.react(&ctx, reaction_type) + message.react(ctx, reaction_type) ); }