From f75af926f502a2703b6a5638bb19687cf8a8051a Mon Sep 17 00:00:00 2001 From: jellywx Date: Thu, 16 Sep 2021 22:04:48 +0100 Subject: [PATCH] rustfmt. removed gating on creating user rows for join sounds --- rustfmt.toml | 2 ++ src/cmds/info.rs | 8 +++----- src/cmds/manage.rs | 5 ++--- src/cmds/play.rs | 6 ++---- src/cmds/search.rs | 1 - src/cmds/settings.rs | 1 - src/cmds/stop.rs | 4 +--- src/event_handlers.rs | 19 ++++++++----------- src/framework.rs | 28 ++++++++++++---------------- src/guild_data.rs | 6 ++++-- src/main.rs | 26 ++++++++++---------------- src/sound.rs | 29 ++++++++++++----------------- 12 files changed, 56 insertions(+), 79 deletions(-) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..455c820 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,2 @@ +imports_granularity = "Crate" +group_imports = "StdExternalCrate" diff --git a/src/cmds/info.rs b/src/cmds/info.rs index a31429d..1931699 100644 --- a/src/cmds/info.rs +++ b/src/cmds/info.rs @@ -1,15 +1,13 @@ -use regex_command_attr::command; +use std::{collections::HashMap, sync::Arc}; +use regex_command_attr::command; use serenity::{client::Context, framework::standard::CommandResult}; use crate::{ - framework::{Args, CommandInvoke, CreateGenericResponse, RegexFramework}, + framework::{Args, CommandInvoke, CommandKind, CreateGenericResponse, RegexFramework}, THEME_COLOR, }; -use crate::framework::CommandKind; -use std::{collections::HashMap, sync::Arc}; - #[command] #[group("Information")] #[description("Get information on the commands of the bot")] diff --git a/src/cmds/manage.rs b/src/cmds/manage.rs index 8b1356c..95aa409 100644 --- a/src/cmds/manage.rs +++ b/src/cmds/manage.rs @@ -1,5 +1,6 @@ -use regex_command_attr::command; +use std::time::Duration; +use regex_command_attr::command; use serenity::{ client::Context, framework::standard::CommandResult, @@ -12,8 +13,6 @@ use crate::{ MySQL, MAX_SOUNDS, PATREON_GUILD, PATREON_ROLE, }; -use std::time::Duration; - #[command("upload")] #[group("Manage")] #[description("Upload a new sound to the bot")] diff --git a/src/cmds/play.rs b/src/cmds/play.rs index 7f3bcf9..750a3f0 100644 --- a/src/cmds/play.rs +++ b/src/cmds/play.rs @@ -1,12 +1,12 @@ -use regex_command_attr::command; +use std::{convert::TryFrom, time::Duration}; +use regex_command_attr::command; use serenity::{ builder::CreateActionRow, client::Context, framework::standard::CommandResult, model::interactions::{message_component::ButtonStyle, InteractionResponseType}, }; - use songbird::{ create_player, ffmpeg, input::{cached::Memory, Input}, @@ -22,8 +22,6 @@ use crate::{ AudioIndex, MySQL, }; -use std::{convert::TryFrom, time::Duration}; - #[command] #[aliases("p")] #[required_permissions(Managed)] diff --git a/src/cmds/search.rs b/src/cmds/search.rs index 9a77985..211fc1d 100644 --- a/src/cmds/search.rs +++ b/src/cmds/search.rs @@ -1,5 +1,4 @@ use regex_command_attr::command; - use serenity::{client::Context, framework::standard::CommandResult}; use crate::{ diff --git a/src/cmds/settings.rs b/src/cmds/settings.rs index ce1e37a..9e15556 100644 --- a/src/cmds/settings.rs +++ b/src/cmds/settings.rs @@ -1,5 +1,4 @@ use regex_command_attr::command; - use serenity::{client::Context, framework::standard::CommandResult}; use crate::{ diff --git a/src/cmds/stop.rs b/src/cmds/stop.rs index eac7e5c..dccc318 100644 --- a/src/cmds/stop.rs +++ b/src/cmds/stop.rs @@ -1,11 +1,9 @@ use regex_command_attr::command; - use serenity::{client::Context, framework::standard::CommandResult}; +use songbird; use crate::framework::{Args, CommandInvoke, CreateGenericResponse}; -use songbird; - #[command("stop")] #[required_permissions(Managed)] #[group("Stop")] diff --git a/src/event_handlers.rs b/src/event_handlers.rs index d6609b2..1f7fde1 100644 --- a/src/event_handlers.rs +++ b/src/event_handlers.rs @@ -1,10 +1,4 @@ -use crate::{ - framework::RegexFramework, - guild_data::CtxGuildData, - join_channel, play_audio, play_from_query, - sound::{JoinSoundCtx, Sound}, - MySQL, ReqwestClient, -}; +use std::{collections::HashMap, env}; use serenity::{ async_trait, @@ -19,12 +13,15 @@ use serenity::{ }, utils::shard_id, }; - use songbird::{Event, EventContext, EventHandler as SongbirdEventHandler}; -use crate::framework::Args; - -use std::{collections::HashMap, env}; +use crate::{ + framework::{Args, RegexFramework}, + guild_data::CtxGuildData, + join_channel, play_audio, play_from_query, + sound::{JoinSoundCtx, Sound}, + MySQL, ReqwestClient, +}; pub struct RestartTrack; diff --git a/src/framework.rs b/src/framework.rs index 3924f9d..c31410c 100644 --- a/src/framework.rs +++ b/src/framework.rs @@ -1,6 +1,16 @@ +use std::{ + collections::{HashMap, HashSet}, + env, fmt, + hash::{Hash, Hasher}, + sync::Arc, +}; + +use log::{debug, error, info, warn}; +use regex::{Match, Regex, RegexBuilder}; +use serde_json::Value; use serenity::{ async_trait, - builder::CreateEmbed, + builder::{CreateComponents, CreateEmbed}, cache::Cache, client::Context, framework::{standard::CommandResult, Framework}, @@ -9,7 +19,7 @@ use serenity::{ model::{ channel::{Channel, GuildChannel, Message}, guild::{Guild, Member}, - id::{ChannelId, GuildId, UserId}, + id::{ChannelId, GuildId, RoleId, UserId}, interactions::{ application_command::{ ApplicationCommand, ApplicationCommandInteraction, ApplicationCommandOptionType, @@ -21,21 +31,7 @@ use serenity::{ Result as SerenityResult, }; -use log::{debug, error, info, warn}; - -use regex::{Match, Regex, RegexBuilder}; - -use std::{ - collections::{HashMap, HashSet}, - env, fmt, - hash::{Hash, Hasher}, - sync::Arc, -}; - use crate::guild_data::CtxGuildData; -use serde_json::Value; -use serenity::builder::CreateComponents; -use serenity::model::id::RoleId; type CommandFn = for<'fut> fn( &'fut Context, diff --git a/src/guild_data.rs b/src/guild_data.rs index 8c5c968..1f77924 100644 --- a/src/guild_data.rs +++ b/src/guild_data.rs @@ -1,9 +1,11 @@ -use crate::{GuildDataCache, MySQL}; +use std::sync::Arc; + use serenity::{async_trait, model::id::GuildId, prelude::Context}; use sqlx::mysql::MySqlPool; -use std::sync::Arc; use tokio::sync::RwLock; +use crate::{GuildDataCache, MySQL}; + #[derive(Clone)] pub struct GuildData { pub id: u64, diff --git a/src/main.rs b/src/main.rs index 5546331..2accd74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,15 +8,11 @@ mod framework; mod guild_data; mod sound; -use crate::{ - event_handlers::Handler, - framework::{Args, RegexFramework}, - guild_data::{CtxGuildData, GuildData}, - sound::Sound, -}; +use std::{collections::HashMap, env, sync::Arc}; +use dashmap::DashMap; +use dotenv::dotenv; use log::info; - use serenity::{ client::{bridge::gateway::GatewayIntents, Client, Context}, http::Http, @@ -27,19 +23,17 @@ use serenity::{ }, prelude::{Mutex, TypeMapKey}, }; - use songbird::{create_player, error::JoinResult, tracks::TrackHandle, Call, SerenityInit}; - use sqlx::mysql::MySqlPool; - -use dotenv::dotenv; - -use dashmap::DashMap; - -use std::{collections::HashMap, env, sync::Arc}; - use tokio::sync::{MutexGuard, RwLock}; +use crate::{ + event_handlers::Handler, + framework::{Args, RegexFramework}, + guild_data::{CtxGuildData, GuildData}, + sound::Sound, +}; + struct MySQL; impl TypeMapKey for MySQL { diff --git a/src/sound.rs b/src/sound.rs index 6e86c11..16ab461 100644 --- a/src/sound.rs +++ b/src/sound.rs @@ -1,15 +1,12 @@ -use super::error::ErrorTypes; - -use sqlx::mysql::MySqlPool; - -use tokio::{fs::File, io::AsyncWriteExt, process::Command}; - -use songbird::input::restartable::Restartable; - use std::{env, path::Path}; -use crate::{JoinSoundCache, MySQL}; use serenity::{async_trait, model::id::UserId, prelude::Context}; +use songbird::input::restartable::Restartable; +use sqlx::mysql::MySqlPool; +use tokio::{fs::File, io::AsyncWriteExt, process::Command}; + +use super::error::ErrorTypes; +use crate::{JoinSoundCache, MySQL}; #[async_trait] pub trait JoinSoundCtx { @@ -83,17 +80,15 @@ SELECT join_sound_id let pool = self.data.read().await.get::().cloned().unwrap(); - if join_sound_cache.get(&user_id).is_none() { - let _ = sqlx::query!( - " + let _ = sqlx::query!( + " INSERT IGNORE INTO users (user) VALUES (?) ", - user_id.as_u64() - ) - .execute(&pool) - .await; - } + user_id.as_u64() + ) + .execute(&pool) + .await; let _ = sqlx::query!( "