From 45425a4bc4417a1d9b7d77c014cd8ede439253a4 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 21 Jun 2021 17:27:52 +0900 Subject: [PATCH] Formatting --- youmubot-core/src/community/mod.rs | 16 ++++-- youmubot-core/src/community/roles.rs | 76 ++++++++++++++++------------ 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/youmubot-core/src/community/mod.rs b/youmubot-core/src/community/mod.rs index 7ad387a..dd3f280 100644 --- a/youmubot-core/src/community/mod.rs +++ b/youmubot-core/src/community/mod.rs @@ -20,8 +20,8 @@ mod roles; mod votes; use roles::{ - ADD_COMMAND, LIST_COMMAND, REMOVE_COMMAND, RMROLEMESSAGE_COMMAND, ROLEMESSAGE_COMMAND, UPDATEROLEMESSAGE_COMMAND, - TOGGLE_COMMAND, + ADD_COMMAND, LIST_COMMAND, REMOVE_COMMAND, RMROLEMESSAGE_COMMAND, ROLEMESSAGE_COMMAND, + TOGGLE_COMMAND, UPDATEROLEMESSAGE_COMMAND, }; use votes::VOTE_COMMAND; @@ -30,7 +30,17 @@ pub use roles::ReactionWatchers; #[group] #[description = "Community related commands. Usually comes with some sort of delays, since it involves pinging"] #[only_in("guilds")] -#[commands(choose, vote, add, list, remove, toggle, rolemessage, rmrolemessage, updaterolemessage)] +#[commands( + choose, + vote, + add, + list, + remove, + toggle, + rolemessage, + rmrolemessage, + updaterolemessage +)] struct Community; #[command] diff --git a/youmubot-core/src/community/roles.rs b/youmubot-core/src/community/roles.rs index ad9ed4c..0db8ebf 100644 --- a/youmubot-core/src/community/roles.rs +++ b/youmubot-core/src/community/roles.rs @@ -1,5 +1,13 @@ use crate::db::Roles as DB; -use serenity::{framework::standard::{macros::command, Args, CommandResult}, model::{channel::{Message, ReactionType}, guild::Role, id::RoleId}, utils::MessageBuilder}; +use serenity::{ + framework::standard::{macros::command, Args, CommandResult}, + model::{ + channel::{Message, ReactionType}, + guild::Role, + id::RoleId, + }, + utils::MessageBuilder, +}; use youmubot_prelude::*; pub use reaction_watcher::Watchers as ReactionWatchers; @@ -262,7 +270,7 @@ fn role_from_string(role: &str, roles: &std::collections::HashMap) async fn rolemessage(ctx: &Context, m: &Message, args: Args) -> CommandResult { let (title, roles) = match parse(ctx, m, args).await? { Some(v) => v, - None => return Ok(()) + None => return Ok(()), }; let data = ctx.data.read().await; let guild_id = m.guild_id.unwrap(); @@ -273,7 +281,11 @@ async fn rolemessage(ctx: &Context, m: &Message, args: Args) -> CommandResult { Ok(()) } -async fn parse(ctx: &Context, m: &Message, mut args: Args) -> Result)>> { +async fn parse( + ctx: &Context, + m: &Message, + mut args: Args, +) -> Result)>> { let title = args.single_quoted::().unwrap(); let data = ctx.data.read().await; let guild_id = m.guild_id.unwrap(); @@ -335,7 +347,7 @@ async fn parse(ctx: &Context, m: &Message, mut args: Args) -> Result CommandResult { let (title, roles) = match parse(ctx, m, args).await? { Some(v) => v, - None => return Ok(()) + None => return Ok(()), }; let data = ctx.data.read().await; let guild_id = m.guild_id.unwrap(); @@ -346,7 +358,8 @@ async fn updaterolemessage(ctx: &Context, m: &Message, args: Args) -> CommandRes m.reply(&ctx, "No replied message found.").await?; return Ok(()); } - }.clone(); + } + .clone(); if data .get::() @@ -354,10 +367,10 @@ async fn updaterolemessage(ctx: &Context, m: &Message, args: Args) -> CommandRes .remove(ctx, guild_id, message.id) .await? { - data - .get::() - .unwrap() - .setup(&mut *message, ctx.clone(), guild_id, title, roles).await?; + data.get::() + .unwrap() + .setup(&mut *message, ctx.clone(), guild_id, title, roles) + .await?; } else { m.reply(&ctx, "Message does not come with a reaction handler") .await @@ -396,8 +409,6 @@ async fn rmrolemessage(ctx: &Context, m: &Message, _args: Args) -> CommandResult .ok(); } - - Ok(()) } @@ -455,9 +466,10 @@ mod reaction_watcher { channel: ChannelId, title: String, roles: Vec<(Role, DiscordRole, ReactionType)>, - - ) -> Result<()> { - let mut msg = channel.send_message(&ctx, |c| c.content("Youmu is setting up the message...")).await?; + ) -> Result<()> { + let mut msg = channel + .send_message(&ctx, |c| c.content("Youmu is setting up the message...")) + .await?; self.setup(&mut msg, ctx, guild, title, roles).await } pub async fn setup( @@ -470,30 +482,30 @@ mod reaction_watcher { ) -> Result<()> { // Send a message msg.edit(&ctx, |m| { - m.content({ - let mut builder = serenity::utils::MessageBuilder::new(); + m.content({ + let mut builder = serenity::utils::MessageBuilder::new(); + builder + .push_bold("Role Menu:") + .push(" ") + .push_bold_line_safe(&title) + .push_line("React to give yourself a role.") + .push_line(""); + for (role, discord_role, emoji) in &roles { builder - .push_bold("Role Menu:") + .push(emoji) .push(" ") - .push_bold_line_safe(&title) - .push_line("React to give yourself a role.") + .push_bold_safe(&discord_role.name) + .push(": ") + .push_line_safe(&role.description) .push_line(""); - for (role, discord_role, emoji) in &roles { - builder - .push(emoji) - .push(" ") - .push_bold_safe(&discord_role.name) - .push(": ") - .push_line_safe(&role.description) - .push_line(""); - } - builder - }) + } + builder }) - .await?; + }) + .await?; // Do reactions for (_, _, emoji) in &roles { - msg.react(&ctx, emoji.clone()).await.ok(); + msg.react(&ctx, emoji.clone()).await.ok(); } // Store the message into the list. {