Merge pull request #33 from Panini-Devs/0.0.1-staging-changes

small reworks

Cargo.toml

@@ -6,18 +6,18 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-poise = { version = "0.6.1", features = ["cache"] }
-serenity = { version = "0.12.0", default-features = false,features = ["rustls_backend", "chrono", "framework"]}
-serde = "1.0.195"
-serde_json = "1.0.111"
-tracing = "0.1.40"
+poise = { git = "https://github.com/serenity-rs/poise/", branch = "current", features = ["cache"] }
+serenity = { version = "^0.12.1", default-features = false, features = ["rustls_backend", "chrono", "gateway"] }
+serde = "^1.0.197"
+serde_json = "^1.0.114"
+tracing = "^0.1.40"
 tracing-subscriber = "^0.3"
 dotenv = "^0.15.0"
-chrono = "0.4.31"
-git2 = "0.18.1"
-tokio = { version = "1.35.1", features = ["macros", "signal", "rt-multi-thread"] }
-rustrict = "0.7.20"
-sqlx = { version = "0.7.3", "features" = [
+chrono = "^0.4.34"
+git2 = "^0.18.2"
+tokio = { version = "^1.36.0", features = ["macros", "signal", "rt-multi-thread"] }
+rustrict = "^0.7.21"
+sqlx = { version = "^0.7.3", "features" = [
     "macros",
     "migrate",
     "chrono",
@@ -26,7 +26,7 @@ sqlx = { version = "0.7.3", "features" = [
     "sqlite",
     "sqlx-sqlite",
 ] }
-reqwest = { version = "0.11.23", features = ["json"] }
+reqwest = { version = "0.11.24", features = ["json"] }
 lazy_static = "1.4.0"
 dashmap = "^5.5.3"
 uuid = { version = "1.7.0", features = ["v4"] }

Dockerfile

@@ -0,0 +1,11 @@
+FROM rust:latest
+
+COPY ./ ./
+
+RUN apt-get update && apt-get install -y cmake && apt-get clean
+
+# install sqlx-cli and run "sqlx database setup" in project directory before running the docker image or the following steps will not compile and will result in error
+
+RUN cargo build --release
+
+CMD ["./target/release/bismarck"]

migrations/0_initial.sql

@@ -31,16 +31,27 @@ CREATE TABLE guild_logged_channel (
 );
 
 CREATE TABLE user_guild (
-  user_id BIGINT,
-  guild_id BIGINT,
+  user_id BIGINT NOT NULL,
+  guild_id BIGINT NOT NULL,
   join_date TEXT NOT NULL,
-  first_join_date TEXT NOT NULL,
   infractions INT NOT NULL DEFAULT 0,
   PRIMARY KEY (user_id, guild_id),
-  FOREIGN KEY (user_id) REFERENCES user(id) ON DELETE CASCADE,
   FOREIGN KEY (guild_id) REFERENCES guild(id) ON DELETE CASCADE
 );
 
+CREATE TABLE guild_log (
+  uuid TEXT NOT NULL,
+  guild_id BIGINT,
+  user_id BIGINT,
+  moderator_id BIGINT,
+  action_type TEXT NOT NULL,
+  reason TEXT NOT NULL,
+  time_created TIMESTAMP NOT NULL,
+  PRIMARY KEY (uuid),
+  FOREIGN KEY (guild_id) REFERENCES guild(id) ON DELETE CASCADE,
+  FOREIGN KEY (moderator_id) REFERENCES user(id)
+);
+
 CREATE TABLE item (
   id INT PRIMARY KEY,
   name TEXT NOT NULL,

src/commands/info.rs

@@ -178,9 +178,12 @@ pub async fn user_avatars(
 )]
 pub async fn bot_stat(context: Context<'_>) -> Result<(), Error> {
     let guild = context.guild().unwrap().id;
+    let guildid = guild.get();
 
-    let commands_ran = context.data().commands_ran.get(&guild.get()).unwrap();
-    let songs_played = context.data().songs_played.get(&guild.get()).unwrap();
+    let data = context.data();
+
+    let commands_ran = data.commands_ran.get(&guildid).unwrap();
+    let songs_played = data.songs_played.get(&guildid).unwrap();
 
     let embed = CreateEmbed::new()
         .title("**Stats**")

src/commands/math.rs

@@ -48,7 +48,7 @@ pub async fn add(
     Ok(())
 }
 
-/// Subtracts two numbers.
+/// Divides two numbers.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -57,11 +57,11 @@ pub async fn add(
 )]
 pub async fn divide(
     context: Context<'_>,
-    #[description = "Number to be divided"] dividend: Option<f64>,
-    #[description = "A number to divide One"] divisor: Option<f64>,
+    #[description = "Number to be divided"] dividend: f64,
+    #[description = "A number to divide One"] divisor: f64,
 ) -> Result<(), Error> {
-    let one = dividend.unwrap_or(1.0);
-    let two = divisor.unwrap_or(1.0);
+    let one = dividend;
+    let two = divisor;
 
     if two == 0.0 {
         let _ = context.say("Divisor cannot be 0!").await;

src/commands/mod.rs

@@ -6,3 +6,4 @@ pub mod owner;
 pub mod settings;
 pub mod setup;
 pub mod utilities;
+pub mod wiki;

src/commands/moderation.rs

@@ -5,7 +5,7 @@ use crate::{
         self,
         embeds::warnings_command_embed,
         messages, models,
-        modlog::{self, ModType},
+        modlog::{self, ensure_user, ModType},
     },
     Context, Error,
 };
@@ -16,6 +16,7 @@ use poise::serenity_prelude::UserId;
 use serenity::model::Timestamp;
 use tracing::{error, info};
 
+/// Bans a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -38,6 +39,15 @@ pub async fn ban(
 
     let user = models::user(context, user_id).await?;
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     let moderator = context.author();
     let moderator_id = moderator.id;
 
@@ -119,11 +129,15 @@ pub async fn ban(
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
         context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+        context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Kicks a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -146,6 +160,15 @@ pub async fn kick(
 
     let user = models::user(context, user_id).await?;
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     let moderator = context.author();
     let moderator_id = moderator.id;
 
@@ -226,12 +249,17 @@ pub async fn kick(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Unbans a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -254,6 +282,15 @@ pub async fn unban(
 
     let user = models::user(context, user_id).await?;
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     let moderator = context.author();
     let moderator_id = moderator.id;
 
@@ -324,12 +361,17 @@ pub async fn unban(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Times out a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -369,6 +411,15 @@ pub async fn timeout(
         return Ok(());
     }
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     let reason = reason.unwrap_or_else(|| "No reason provided.".to_string());
 
     let reason_char_count = reason.chars().count();
@@ -451,12 +502,17 @@ pub async fn timeout(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Un-times out a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -482,6 +538,15 @@ pub async fn untimeout(
         return Ok(());
     }
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     let result = {
         let (user_name, user_mention) = (&user.name, models::user_mention(context, user_id).await?);
 
@@ -528,12 +593,17 @@ pub async fn untimeout(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Warns a user.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -554,6 +624,15 @@ pub async fn warn(
 
     let user = models::user(context, user_id).await?;
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     if user.system {
         let reply = messages::error_reply("Cannot warn a system user.", false);
         context.send(reply).await?;
@@ -604,12 +683,17 @@ pub async fn warn(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }
 
     Ok(())
 }
 
+/// Gets a user's warnings.
 #[poise::command(
     prefix_command,
     slash_command,
@@ -628,6 +712,15 @@ pub async fn warnings(
 
     let user = models::user(context, user_id).await?;
 
+    let member = models::member(context, context.guild_id().unwrap(), user_id).await?;
+
+    let ensure = ensure_user(&member, &user_id, &context.guild_id().unwrap(), database).await;
+
+    if let Err(why) = ensure {
+        let _ = messages::error_response(why.to_string(), true).await;
+        return Ok(());
+    }
+
     if user.system {
         let reply = messages::error_reply("Cannot get warnings for a system user.", false);
         context.send(reply).await?;
@@ -711,6 +804,10 @@ pub async fn warnings(
 
     if let Err(why) = result {
         let reply = messages::error_reply(&why, true);
+        context.send(reply).await?;
+    } else {
+        let reply = messages::info_reply(result.unwrap(), true);
+
         context.send(reply).await?;
     }