add delete command to clean up the channel
This commit is contained in:
44
src/commands/delete.rs
Normal file
44
src/commands/delete.rs
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
use std::{env, error::Error, num::NonZeroU64, time::Duration};
|
||||||
|
use tokio::time::sleep;
|
||||||
|
use tracing::info;
|
||||||
|
use twilight_model::{channel::Message, id::Id};
|
||||||
|
|
||||||
|
use crate::state::State;
|
||||||
|
|
||||||
|
pub(crate) async fn delete(
|
||||||
|
msg: Message,
|
||||||
|
state: State,
|
||||||
|
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||||
|
let admin = env::var("ADMIN")?.parse::<u64>()?;
|
||||||
|
if msg.author.id != Id::from(NonZeroU64::new(admin).unwrap()) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let n = msg
|
||||||
|
.content
|
||||||
|
.split(' ')
|
||||||
|
.last()
|
||||||
|
.unwrap()
|
||||||
|
.parse::<u16>()
|
||||||
|
.unwrap_or(1);
|
||||||
|
if n > 100 {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let messages = state
|
||||||
|
.http
|
||||||
|
.channel_messages(msg.channel_id)
|
||||||
|
.before(msg.id)
|
||||||
|
.limit(n)?
|
||||||
|
.await?
|
||||||
|
.model()
|
||||||
|
.await?;
|
||||||
|
state.http.delete_message(msg.channel_id, msg.id).await?;
|
||||||
|
for message in messages {
|
||||||
|
info!("Delete message: {:?}: {:?}", message.author.name, message);
|
||||||
|
state
|
||||||
|
.http
|
||||||
|
.delete_message(msg.channel_id, message.id)
|
||||||
|
.await?;
|
||||||
|
sleep(Duration::from_secs(5)).await;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -7,8 +7,8 @@ pub(crate) async fn join(
|
|||||||
msg: Message,
|
msg: Message,
|
||||||
state: State,
|
state: State,
|
||||||
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||||
let user_id = msg.author.id;
|
|
||||||
let guild_id = msg.guild_id.ok_or("No guild id attached to the message.")?;
|
let guild_id = msg.guild_id.ok_or("No guild id attached to the message.")?;
|
||||||
|
let user_id = msg.author.id;
|
||||||
let channel_id = state
|
let channel_id = state
|
||||||
.cache
|
.cache
|
||||||
.voice_state(user_id, guild_id)
|
.voice_state(user_id, guild_id)
|
||||||
@@ -16,16 +16,19 @@ pub(crate) async fn join(
|
|||||||
.channel_id();
|
.channel_id();
|
||||||
let channel_id =
|
let channel_id =
|
||||||
NonZeroU64::new(channel_id.into()).ok_or("Joined voice channel must have nonzero ID.")?;
|
NonZeroU64::new(channel_id.into()).ok_or("Joined voice channel must have nonzero ID.")?;
|
||||||
state
|
|
||||||
.songbird
|
|
||||||
.join(guild_id, channel_id)
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("Could not join voice channel: {:?}", e))?;
|
|
||||||
|
|
||||||
// signal that we are not listening
|
// signal that we are not listening
|
||||||
if let Some(call_lock) = state.songbird.get(guild_id) {
|
if let Some(call_lock) = state.songbird.get(guild_id) {
|
||||||
let mut call = call_lock.lock().await;
|
let mut call = call_lock.lock().await;
|
||||||
call.deafen(true).await?;
|
call.deafen(true).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// join the voice channel
|
||||||
|
state
|
||||||
|
.songbird
|
||||||
|
.join(guild_id, channel_id)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("Could not join voice channel: {:?}", e))?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ pub(crate) use resume::resume;
|
|||||||
mod stop;
|
mod stop;
|
||||||
pub(crate) use stop::stop;
|
pub(crate) use stop::stop;
|
||||||
|
|
||||||
|
mod delete;
|
||||||
|
pub(crate) use delete::delete;
|
||||||
|
|
||||||
use twilight_model::application::command::CommandType;
|
use twilight_model::application::command::CommandType;
|
||||||
use twilight_util::builder::command::{CommandBuilder, StringBuilder};
|
use twilight_util::builder::command::{CommandBuilder, StringBuilder};
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::commands::{join, leave, pause, play, queue, resume, stop};
|
use crate::commands::{delete, join, leave, pause, play, queue, resume, stop};
|
||||||
use crate::state::State;
|
use crate::state::State;
|
||||||
|
|
||||||
use futures::Future;
|
use futures::Future;
|
||||||
@@ -16,6 +16,7 @@ enum ChatCommand {
|
|||||||
Leave(Message),
|
Leave(Message),
|
||||||
Join(Message),
|
Join(Message),
|
||||||
Queue(Message),
|
Queue(Message),
|
||||||
|
Delete(Message),
|
||||||
NotImplemented,
|
NotImplemented,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,6 +37,7 @@ fn parse_command(event: Event) -> Option<ChatCommand> {
|
|||||||
["!leave"] | ["!leave", _] => Some(ChatCommand::Leave(msg_create.0)),
|
["!leave"] | ["!leave", _] => Some(ChatCommand::Leave(msg_create.0)),
|
||||||
["!join"] | ["!join", _] => Some(ChatCommand::Join(msg_create.0)),
|
["!join"] | ["!join", _] => Some(ChatCommand::Join(msg_create.0)),
|
||||||
["!queue"] | ["!queue", _] => Some(ChatCommand::Queue(msg_create.0)),
|
["!queue"] | ["!queue", _] => Some(ChatCommand::Queue(msg_create.0)),
|
||||||
|
["!delete"] | ["!delete", _] => Some(ChatCommand::Delete(msg_create.0)),
|
||||||
_ => Some(ChatCommand::NotImplemented),
|
_ => Some(ChatCommand::NotImplemented),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -70,6 +72,7 @@ impl Handler {
|
|||||||
Some(ChatCommand::Leave(msg)) => spawn(leave(msg, Arc::clone(&self.state))),
|
Some(ChatCommand::Leave(msg)) => spawn(leave(msg, Arc::clone(&self.state))),
|
||||||
Some(ChatCommand::Join(msg)) => spawn(join(msg, Arc::clone(&self.state))),
|
Some(ChatCommand::Join(msg)) => spawn(join(msg, Arc::clone(&self.state))),
|
||||||
Some(ChatCommand::Queue(msg)) => spawn(queue(msg, Arc::clone(&self.state))),
|
Some(ChatCommand::Queue(msg)) => spawn(queue(msg, Arc::clone(&self.state))),
|
||||||
|
Some(ChatCommand::Delete(msg)) => spawn(delete(msg, Arc::clone(&self.state))),
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
12
src/main.rs
12
src/main.rs
@@ -27,12 +27,18 @@ use crate::commands::get_chat_commands;
|
|||||||
async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
||||||
dotenv().ok();
|
dotenv().ok();
|
||||||
|
|
||||||
|
println!("Starting up...");
|
||||||
|
|
||||||
// Initialize the tracing subscriber.
|
// Initialize the tracing subscriber.
|
||||||
tracing_subscriber::fmt::init();
|
tracing_subscriber::fmt::init();
|
||||||
|
|
||||||
|
info!("Starting up...");
|
||||||
|
|
||||||
let (mut shards, state) = {
|
let (mut shards, state) = {
|
||||||
let token = env::var("DISCORD_TOKEN")?;
|
let token = env::var("DISCORD_TOKEN").map_err(|_| "DISCORD_TOKEN is not set")?;
|
||||||
let app_id = env::var("DISCORD_APP_ID")?.parse()?;
|
let app_id = env::var("DISCORD_APP_ID")
|
||||||
|
.map_err(|_| "DISCORD_APP_ID is not set")?
|
||||||
|
.parse()?;
|
||||||
|
|
||||||
let http = HttpClient::new(token.clone());
|
let http = HttpClient::new(token.clone());
|
||||||
let user_id = http.current_user().await?.model().await?.id;
|
let user_id = http.current_user().await?.model().await?.id;
|
||||||
@@ -74,6 +80,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
|||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
info!("Ready to receive events");
|
||||||
|
|
||||||
let mut handler = Handler::new(Arc::clone(&state));
|
let mut handler = Handler::new(Arc::clone(&state));
|
||||||
let mut stop_rx = signal_handler();
|
let mut stop_rx = signal_handler();
|
||||||
let mut stream = ShardEventStream::new(shards.iter_mut());
|
let mut stream = ShardEventStream::new(shards.iter_mut());
|
||||||
|
|||||||
Reference in New Issue
Block a user