Context does not need to be mutable

sam-kirby · Jan 15, 2021 · a86c88e · a86c88e
1 parent 0874d06
commit a86c88e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -76,7 +76,7 @@ impl Context {
         }
     }
 
-    pub async fn make_dead(&mut self, target: &UserId) {
+    pub async fn make_dead(&self, target: &UserId) {
         if let Some(game) = self.game.write().await.as_mut() {
             if game.dead.insert(*target) && game.meeting_in_progress {
                 if let Err(why) = self
@@ -109,7 +109,7 @@ impl Context {
             .map_or(false, |g| g.ctrl_msg == reaction.message_id)
     }
 
-    pub async fn start_game(&mut self, msg: &Message, ctrl_user: UserId, guild_id: GuildId) {
+    pub async fn start_game(&self, msg: &Message, ctrl_user: UserId, guild_id: GuildId) {
         self.game.write().await.replace(Game {
             dead: HashSet::new(),
             ctrl_channel: msg.channel_id,
@@ -225,7 +225,7 @@ impl Context {
         Ok(())
     }
 
-    pub async fn end_game(&mut self) -> Result<()> {
+    pub async fn end_game(&self) -> Result<()> {
         if let Some(game) = self.game.write().await.take() {
             self.discord_http
                 .delete_message(game.ctrl_channel, game.ctrl_msg)

diff --git a/src/main.rs b/src/main.rs
@@ -73,7 +73,7 @@ async fn main() -> Result<()> {
 
     let mut events = shard.some_events(event_flags);
 
-    let mut context = Context::new(config, discord_http, cache, shutdown_handle, owners);
+    let context = Context::new(config, discord_http, cache, shutdown_handle, owners);
 
     let parser = {
         let mut parser_config = CommandParserConfig::new();
@@ -130,7 +130,7 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-async fn process_command(mut ctx: Context, parser: Parser<'_>, msg: &Message) -> Result<()> {
+async fn process_command(ctx: Context, parser: Parser<'_>, msg: &Message) -> Result<()> {
     match parser.parse(&msg.content) {
         Some(Command {
             name: "new",
@@ -212,36 +212,33 @@ async fn process_command(mut ctx: Context, parser: Parser<'_>, msg: &Message) ->
                 .delete_message(msg.channel_id, msg.id)
                 .await?;
 
-            if ctx.is_in_control(&msg.author.id).await {
-                match arguments.next().map(UserId::parse) {
-                    Some(Ok(target)) => {
-                        let reply = ctx
-                            .broadcast()
-                            .await
-                            .unwrap()
-                            .content(format!("deadifying {}", target.mention()))?
-                            .await?;
-                        ctx.make_dead(&target).await;
-                        sleep(Duration::from_secs(5)).await;
-                        ctx.discord_http
-                            .delete_message(reply.channel_id, reply.id)
-                            .await?;
-                    }
-                    _ => {
-                        ctx.broadcast()
-                            .await
-                            .unwrap()
-                            .content("You must mention the user you wish to die")?
-                            .await?;
+            if let Some(broadcast) = ctx.broadcast().await {
+                if ctx.is_in_control(&msg.author.id).await {
+                    match arguments.next().map(UserId::parse) {
+                        Some(Ok(target)) => {
+                            let reply = broadcast
+                                .content(format!("deadifying {}", target.mention()))?
+                                .await?;
+                            ctx.make_dead(&target).await;
+                            sleep(Duration::from_secs(5)).await;
+                            ctx.discord_http
+                                .delete_message(reply.channel_id, reply.id)
+                                .await?;
+                        }
+                        _ => {
+                            broadcast
+                                .content("You must mention the user you wish to die")?
+                                .await?;
+                        }
                     }
+                } else {
+                    broadcast
+                        .content(
+                            "You must have started the game or be an owner of the bot to make \
+                             others dead\nTo make yourself dead, please use the reactions",
+                        )?
+                        .await?;
                 }
-            } else if let Some(broadcast) = ctx.broadcast().await {
-                broadcast
-                    .content(
-                        "You must have started the game or be an owner of the bot to make others \
-                         dead\nTo make yourself dead, please use the reactions",
-                    )?
-                    .await?;
             } else {
                 ctx.discord_http
                     .create_message(msg.channel_id)