diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/handler.rs | 6 | ||||
| -rw-r--r-- | src/core/mod.rs | 1 | ||||
| -rw-r--r-- | src/core/model.rs | 12 | ||||
| -rw-r--r-- | src/core/webserver.rs | 22 |
4 files changed, 17 insertions, 24 deletions
diff --git a/src/core/handler.rs b/src/core/handler.rs index 7fbb005..e1d1a12 100644 --- a/src/core/handler.rs +++ b/src/core/handler.rs @@ -5,6 +5,7 @@ use crate::core::consts::DB as db; use crate::core::model::*; use crate::core::utils::*; use crate::db::models::UserUpdate; +use crate::modules::plugins::*; use levenshtein::levenshtein; use rand::prelude::*; use serenity::CACHE; @@ -107,7 +108,7 @@ impl EventHandler for Handler { info!("Caching complete."); } - fn message(&self, _ctx: Context, message: Message) { + fn message(&self, ctx: Context, message: Message) { // check_error!(message.guild().unwrap().read() // .edit_member(712088369206919269, |member| member.nickname("Wisp"))); @@ -118,6 +119,9 @@ impl EventHandler for Handler { if message.mention_everyone { check_error!(message.react("👀")) } + + exec_on_message!([&ctx, &message], + random_hi); } fn message_delete(&self, _: Context, channel_id: ChannelId, message_id: MessageId) { diff --git a/src/core/mod.rs b/src/core/mod.rs index 3abe541..2ddcba0 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -6,4 +6,3 @@ pub mod handler; pub mod model; pub mod timers; pub mod utils; -// pub mod webserver; diff --git a/src/core/model.rs b/src/core/model.rs index 1b19f13..e90f5e1 100644 --- a/src/core/model.rs +++ b/src/core/model.rs @@ -5,10 +5,12 @@ use serenity::client::bridge::{ gateway::ShardManager, // voice::ClientVoiceManager }; +// use serenity::model::id::{UserId, GuildId}; use serenity::model::id::UserId; use serenity::prelude::Mutex; // use serenity::voice; use std::sync::Arc; +// use std::collections::HashSet; use typemap::Key; pub struct Owner; @@ -40,3 +42,13 @@ impl Key for TC { // impl Key for VoiceManager { // type Value = Arc<Mutex<ClientVoiceManager>>; // } + +// pub struct Lavalink; +// impl Key for Lavalink { +// type Value = Arc<Mutex<LavalinkClient>>; +// } + +// pub struct VoiceGuildUpdate; +// impl Key for VoiceGuildUpdate { +// type Value = Arc<RwLock<HashSet<GuildId>>>; +// } diff --git a/src/core/webserver.rs b/src/core/webserver.rs deleted file mode 100644 index 0234fda..0000000 --- a/src/core/webserver.rs +++ /dev/null @@ -1,22 +0,0 @@ -use rocket::response::content; -use rocket::response::NamedFile; -// use serenity::prelude::*; -// use std::sync::Arc; - -#[get("/favicon.ico")] -pub fn icon() -> Option<NamedFile> { - NamedFile::open("static/favicon.ico").ok() -} - -#[get("/")] -pub fn index() -> content::Json<&'static str> { - content::Json("{\"message\": \"online\"}") -} - -// #[get("/")] -// pub fn get_context() -> content::Json<&'static str> { -// let ctx = Arc::new(Context); -// let ctx_clone = Arc::clone(&ctx); - -// content::Json(format!("{\"message\": \"{}\"}", data)) -// } |