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

blacklist stuff

Browse Source
This commit is contained in:
jude
2020-08-25 17:19:08 +01:00
parent e5334af999
commit afe3dbc525
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/framework.rs
View File

@@ -34,7 +34,10 @@ use std::{
fmt,
};
use crate::SQLPool;
use crate::{
models::ChannelData,
SQLPool,
};
type CommandFn = for<'fut> fn(&'fut Context, &'fut Message, String) -> BoxFuture<'fut, CommandResult>;
@@ -311,14 +314,21 @@ impl Framework for RegexFramework {
match check_self_permissions(&ctx, &guild, &channel).await {
Ok(perms) => match perms {
PermissionCheck::All => {
let command = self.commands.get(full_match.name("cmd").unwrap().as_str()).unwrap();
let args = full_match.name("args")
.map(|m| m.as_str())
.unwrap_or("")
.to_string();
let pool = ctx.data.read().await
.get::<SQLPool>().cloned().expect("Could not get SQLPool from data");
if command.check_permissions(&ctx, &guild, &member).await {
(command.func)(&ctx, &msg, args).await.unwrap();
let command = self.commands.get(full_match.name("cmd").unwrap().as_str()).unwrap();
let channel_data = ChannelData::from_channel(msg.channel(&ctx).await.unwrap(), pool).await;
if !command.can_blacklist || channel_data.map(|c| c.blacklisted).unwrap_or(false) {
let args = full_match.name("args")
.map(|m| m.as_str())
.unwrap_or("")
.to_string();
if command.check_permissions(&ctx, &guild, &member).await {
(command.func)(&ctx, &msg, args).await.unwrap();
}
}
}