jude/soundfx-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

updated the regex_command_attr to reflect upstream. changed add_command to not accept a name

Browse Source
This commit is contained in:
jellywx
2021-06-10 21:16:16 +01:00
parent 99e1807097
commit d5d2ac2bee
8 changed files with 485 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/framework.rs
View File

@ -191,15 +191,18 @@ pub enum PermissionLevel {
}
pub struct Command {
pub name: &'static str,
pub required_perms: PermissionLevel,
pub func: CommandFn,
pub fun: CommandFn,
pub names: &'static [&'static str],
pub desc: Option<&'static str>,
pub usage: Option<&'static str>,
pub examples: &'static [&'static str],
pub required_permissions: PermissionLevel,
pub allow_slash: bool,
}
impl Command {
async fn check_permissions(&self, ctx: &Context, guild: &Guild, member: &Member) -> bool {
if self.required_perms == PermissionLevel::Unrestricted {
if self.required_permissions == PermissionLevel::Unrestricted {
true
} else {
let permissions = guild.member_permissions(&ctx, &member.user).await.unwrap();
@ -208,7 +211,7 @@ impl Command {
return true;
}
if self.required_perms == PermissionLevel::Managed {
if self.required_permissions == PermissionLevel::Managed {
let pool = ctx
.data
.read()
@ -262,8 +265,8 @@ SELECT role
impl fmt::Debug for Command {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Command")
.field("name", &self.name)
.field("required_perms", &self.required_perms)
.field("name", &self.names[0])
.field("required_permissions", &self.required_permissions)
.finish()
}
}
@ -350,8 +353,10 @@ impl RegexFramework {
self
}
pub fn add_command<S: ToString>(mut self, name: S, command: &'static Command) -> Self {
self.commands.insert(name.to_string(), command);
pub fn add_command(mut self, command: &'static Command) -> Self {
for name in command.names {
self.commands.insert(name.to_string(), command);
}
self
}
@ -448,16 +453,18 @@ impl Framework for RegexFramework {
let member = guild.member(&ctx, &msg.author).await.unwrap();
if command.check_permissions(&ctx, &guild, &member).await {
(command.func)(
(command.fun)(
&ctx,
&msg,
Args::new(&args, &[Delimiter::Single(' ')]),
)
.await
.unwrap();
} else if command.required_perms == PermissionLevel::Managed {
} else if command.required_permissions == PermissionLevel::Managed {
let _ = msg.channel_id.say(&ctx, "You must either be an Admin or have a role specified in `?roles` to do this command").await;
} else if command.required_perms == PermissionLevel::Restricted {
} else if command.required_permissions
== PermissionLevel::Restricted
{
let _ = msg
.channel_id
.say(&ctx, "You must be an Admin to do this command")

100
src/main.rs
View File

@ -184,35 +184,33 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
.case_insensitive(true)
.ignore_bots(true)
// info commands
.add_command("help", &HELP_COMMAND)
.add_command("info", &INFO_COMMAND)
.add_command("invite", &INFO_COMMAND)
.add_command("donate", &INFO_COMMAND)
.add_command(&HELP_COMMAND)
.add_command(&INFO_COMMAND)
.add_command(&INFO_COMMAND)
.add_command(&INFO_COMMAND)
// play commands
.add_command("loop", &LOOP_PLAY_COMMAND)
.add_command("play", &PLAY_COMMAND)
.add_command("p", &PLAY_COMMAND)
.add_command("stop", &STOP_PLAYING_COMMAND)
.add_command("disconnect", &DISCONNECT_COMMAND)
.add_command("dc", &DISCONNECT_COMMAND)
.add_command(&LOOP_PLAY_COMMAND)
.add_command(&PLAY_COMMAND)
.add_command(&STOP_PLAYING_COMMAND)
.add_command(&DISCONNECT_COMMAND)
// sound management commands
.add_command("upload", &UPLOAD_NEW_SOUND_COMMAND)
.add_command("delete", &DELETE_SOUND_COMMAND)
.add_command("list", &LIST_SOUNDS_COMMAND)
.add_command("public", &CHANGE_PUBLIC_COMMAND)
.add_command(&UPLOAD_NEW_SOUND_COMMAND)
.add_command(&DELETE_SOUND_COMMAND)
.add_command(&LIST_SOUNDS_COMMAND)
.add_command(&CHANGE_PUBLIC_COMMAND)
// setting commands
.add_command("prefix", &CHANGE_PREFIX_COMMAND)
.add_command("roles", &SET_ALLOWED_ROLES_COMMAND)
.add_command("volume", &CHANGE_VOLUME_COMMAND)
.add_command("allow_greet", &ALLOW_GREET_SOUNDS_COMMAND)
.add_command("greet", &SET_GREET_SOUND_COMMAND)
.add_command(&CHANGE_PREFIX_COMMAND)
.add_command(&SET_ALLOWED_ROLES_COMMAND)
.add_command(&CHANGE_VOLUME_COMMAND)
.add_command(&ALLOW_GREET_SOUNDS_COMMAND)
.add_command(&SET_GREET_SOUND_COMMAND)
// search commands
.add_command("search", &SEARCH_SOUNDS_COMMAND)
.add_command("popular", &SHOW_POPULAR_SOUNDS_COMMAND)
.add_command("random", &SHOW_RANDOM_SOUNDS_COMMAND);
.add_command(&SEARCH_SOUNDS_COMMAND)
.add_command(&SHOW_POPULAR_SOUNDS_COMMAND)
.add_command(&SHOW_RANDOM_SOUNDS_COMMAND);
if audio_index.is_some() {
framework = framework.add_command("ambience", &PLAY_AMBIENCE_COMMAND);
framework = framework.add_command(&PLAY_AMBIENCE_COMMAND);
}
framework = framework.build();
@ -425,18 +423,14 @@ Please select a category from the following:
}
#[command]
#[permission_level(Managed)]
#[aliases("p")]
#[required_permissions(Managed)]
async fn play(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
args: Args,
) -> CommandResult {
let guild = invoke
.guild_id()
.unwrap()
.to_guild_cached(&ctx)
.await
.unwrap();
let guild = invoke.guild(ctx.cache.clone()).await.unwrap();
invoke
.channel_id()
@ -450,7 +444,7 @@ async fn play(
}
#[command]
#[permission_level(Managed)]
#[required_permissions(Managed)]
async fn loop_play(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -528,8 +522,8 @@ async fn play_cmd(ctx: &Context, guild: Guild, user_id: UserId, args: Args, loop
}
}
#[command]
#[permission_level(Managed)]
#[command("ambience")]
#[required_permissions(Managed)]
async fn play_ambience(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -617,8 +611,8 @@ __Available ambience sounds:__
Ok(())
}
#[command]
#[permission_level(Managed)]
#[command("stop")]
#[required_permissions(Managed)]
async fn stop_playing(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -639,7 +633,8 @@ async fn stop_playing(
}
#[command]
#[permission_level(Managed)]
#[aliases("dc")]
#[required_permissions(Managed)]
async fn disconnect(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -654,6 +649,7 @@ async fn disconnect(
}
#[command]
#[aliases("invite")]
async fn info(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -690,8 +686,8 @@ There is a maximum sound limit per user. This can be removed by subscribing at *
Ok(())
}
#[command]
#[permission_level(Managed)]
#[command("volume")]
#[required_permissions(Managed)]
async fn change_volume(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -755,8 +751,8 @@ async fn change_volume(
Ok(())
}
#[command]
#[permission_level(Restricted)]
#[command("prefix")]
#[required_permissions(Restricted)]
async fn change_prefix(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -838,7 +834,7 @@ async fn change_prefix(
Ok(())
}
#[command]
#[command("upload")]
#[allow_slash(false)]
async fn upload_new_sound(
ctx: &Context,
@ -971,8 +967,8 @@ async fn upload_new_sound(
Ok(())
}
#[command]
#[permission_level(Restricted)]
#[command("roles")]
#[required_permissions(Restricted)]
#[allow_slash(false)]
async fn set_allowed_roles(
ctx: &Context,
@ -1060,7 +1056,7 @@ INSERT INTO roles (guild_id, role)
Ok(())
}
#[command]
#[command("list")]
async fn list_sounds(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1121,7 +1117,7 @@ async fn list_sounds(
Ok(())
}
#[command]
#[command("public")]
async fn change_public(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1186,7 +1182,7 @@ async fn change_public(
Ok(())
}
#[command]
#[command("delete")]
async fn delete_sound(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1290,7 +1286,7 @@ fn format_search_results(search_results: Vec<Sound>) -> CreateGenericResponse {
CreateGenericResponse::new().embed(|e| e.title(title).fields(field_iter))
}
#[command]
#[command("search")]
async fn search_sounds(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1322,7 +1318,7 @@ async fn search_sounds(
Ok(())
}
#[command]
#[command("popular")]
async fn show_popular_sounds(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1356,7 +1352,7 @@ SELECT name, id, plays, public, server_id, uploader_id
Ok(())
}
#[command]
#[command("random")]
async fn show_random_sounds(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1391,7 +1387,7 @@ SELECT name, id, plays, public, server_id, uploader_id
Ok(())
}
#[command]
#[command("greet")]
async fn set_greet_sound(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),
@ -1457,8 +1453,8 @@ async fn set_greet_sound(
Ok(())
}
#[command]
#[permission_level(Managed)]
#[command("allow_greet")]
#[required_permissions(Managed)]
async fn allow_greet_sounds(
ctx: &Context,
invoke: &(dyn CommandInvoke + Sync + Send),