with global application commands, check if they exist
This commit is contained in:
parent
0abe696f58
commit
1f62951131
@ -10,7 +10,12 @@ use serenity::{
|
|||||||
async_trait,
|
async_trait,
|
||||||
client::{Context, EventHandler},
|
client::{Context, EventHandler},
|
||||||
model::{
|
model::{
|
||||||
channel::Channel, guild::Guild, id::GuildId, interactions::Interaction, voice::VoiceState,
|
channel::Channel,
|
||||||
|
gateway::{Activity, Ready},
|
||||||
|
guild::Guild,
|
||||||
|
id::GuildId,
|
||||||
|
interactions::Interaction,
|
||||||
|
voice::VoiceState,
|
||||||
},
|
},
|
||||||
utils::shard_id,
|
utils::shard_id,
|
||||||
};
|
};
|
||||||
@ -36,6 +41,10 @@ pub struct Handler;
|
|||||||
|
|
||||||
#[serenity::async_trait]
|
#[serenity::async_trait]
|
||||||
impl EventHandler for Handler {
|
impl EventHandler for Handler {
|
||||||
|
async fn ready(&self, ctx: Context, _: Ready) {
|
||||||
|
ctx.set_activity(Activity::watching("for /play")).await;
|
||||||
|
}
|
||||||
|
|
||||||
async fn cache_ready(&self, ctx: Context, _: Vec<GuildId>) {
|
async fn cache_ready(&self, ctx: Context, _: Vec<GuildId>) {
|
||||||
let framework = ctx
|
let framework = ctx
|
||||||
.data
|
.data
|
||||||
|
@ -451,11 +451,6 @@ impl RegexFramework {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn build_slash(&self, http: impl AsRef<Http>) {
|
pub async fn build_slash(&self, http: impl AsRef<Http>) {
|
||||||
if env::var("REBUILD_COMMANDS").is_err() {
|
|
||||||
info!("No rebuild");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("Building slash commands...");
|
info!("Building slash commands...");
|
||||||
|
|
||||||
let mut count = 0;
|
let mut count = 0;
|
||||||
@ -491,7 +486,62 @@ impl RegexFramework {
|
|||||||
count += 1;
|
count += 1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
info!("Checking for existing commands...");
|
||||||
|
|
||||||
|
let current_commands = ApplicationCommand::get_global_application_commands(&http)
|
||||||
|
.await
|
||||||
|
.expect("Failed to fetch existing commands");
|
||||||
|
|
||||||
|
info!("Existing commands: {:?}", current_commands);
|
||||||
|
|
||||||
|
// delete commands not in use
|
||||||
|
for command in ¤t_commands {
|
||||||
|
if self
|
||||||
|
.commands_
|
||||||
|
.iter()
|
||||||
|
.find(|c| c.names[0] == command.name)
|
||||||
|
.is_none()
|
||||||
|
{
|
||||||
|
info!("Deleting command {}", command.name);
|
||||||
|
|
||||||
|
ApplicationCommand::delete_global_application_command(&http, command.id)
|
||||||
|
.await
|
||||||
|
.expect("Failed to delete an unused command");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for command in self.commands_.iter().filter(|c| c.allow_slash) {
|
for command in self.commands_.iter().filter(|c| c.allow_slash) {
|
||||||
|
let already_created = if let Some(current_command) = current_commands
|
||||||
|
.iter()
|
||||||
|
.find(|curr| curr.name == command.names[0])
|
||||||
|
{
|
||||||
|
if current_command.description == command.desc
|
||||||
|
&& current_command.options.len() == command.args.len()
|
||||||
|
{
|
||||||
|
let mut has_different_arg = false;
|
||||||
|
|
||||||
|
for (arg, option) in
|
||||||
|
command.args.iter().zip(current_command.options.clone())
|
||||||
|
{
|
||||||
|
if arg.required != option.required
|
||||||
|
|| arg.name != option.name
|
||||||
|
|| arg.description != option.description
|
||||||
|
|| arg.kind != option.kind
|
||||||
|
{
|
||||||
|
has_different_arg = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
!has_different_arg
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
};
|
||||||
|
|
||||||
|
if !already_created {
|
||||||
ApplicationCommand::create_global_application_command(&http, |a| {
|
ApplicationCommand::create_global_application_command(&http, |a| {
|
||||||
a.name(command.names[0]).description(command.desc);
|
a.name(command.names[0]).description(command.desc);
|
||||||
|
|
||||||
@ -515,6 +565,7 @@ impl RegexFramework {
|
|||||||
count += 1;
|
count += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
info!("{} slash commands built! Ready to go", count);
|
info!("{} slash commands built! Ready to go", count);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user