Merge branch 'master' into module/moderation

.cargo/config.toml

@@ -1,2 +0,0 @@
-[registries.gitea]
-index = "sparse+https://git.toast-server.net/api/packages/toast/cargo/"

.dockerignore

@@ -1,9 +1,7 @@
 .vscode
-.cargo
+target
 .env
 .gitignore
-.gitattributes
 docker-compose.yml
-Dockerfile
 renovate.json
 run.sh

.gitattributes

@@ -1 +0,0 @@
-src/internals/assets/FluidR3_GM.sf2 filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/build.yml

@@ -1,91 +1,48 @@
-name: Build and push Docker image
+name: Build and push container image
 
 on:
   push:
     branches:
       - master
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-node
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
-
     steps:
-      - name: Set up Docker Buildx
+      - name: Set up Docker environment
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
-
-      - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - name: Install zstd
-        run: sudo apt-get update && sudo apt-get install -y zstd
-
-      - name: Generate cache key
-        id: cargo-cache-key
         run: |
-          find ./Cargo.lock -type f -exec sha256sum {} + | sha256sum > hash.txt
+          apt update && apt upgrade -y && apt install -y apt-transport-https ca-certificates curl zstd gnupg lsb-release
-          cat hash.txt
+          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          echo \
+            "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
+            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt update && apt install -y docker-ce docker-ce-cli containerd.io
 
-      - name: Cache
+      - name: Checkout branch
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: https://github.com/actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-        id: cache
-        with:
-          save-always: true
-          path: |
-            $HOME/.cargo/bin/
-            $HOME/.cargo/git/
-            $HOME/.cargo/registry/index/
-            $HOME/.cargo/registry/cache/
-            target/
-          key: ${{ runner.os }}-cache-${{ steps.cargo-cache-key.outputs.hash }}
 
       - name: Login to Gitea
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: https://github.com/docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3
         with:
           registry: git.toast-server.net
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Set up Rust toolchain
+      - name: Set up Docker Buildx
-        uses: actions-rust-lang/setup-rust-toolchain@1fbea72663f6d4c03efaab13560c8a24cfd2a7cc # v1.9.0
+        uses: https://github.com/docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3
-        with:
-          toolchain: stable
-          rustflags: -C target-feature=-crt-static
-
-      - name: Install zigbuild
-        run: |
-          pip3 install ziglang
-          cargo install --locked cargo-zigbuild
-
-      - name: Compile
-        run: |
-          rustup target add x86_64-unknown-linux-musl
-          export GIT_COMMIT_HASH=${{ github.sha }} && \
-          export GIT_COMMIT_BRANCH=${{ github.ref_name }} && \
-          cargo zigbuild --target x86_64-unknown-linux-musl --locked -rF production
 
       - name: Build and push image
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
+        uses: https://github.com/docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
           context: .
           platforms: linux/amd64
           push: true
-          tags: git.toast-server.net/toast/kon:master
+          tags: git.toast-server.net/toast/kon:main
-          cache-from: type=registry,ref=git.toast-server.net/toast/kon:cache
+          build-args: |
-          cache-to: type=registry,ref=git.toast-server.net/toast/kon:cache,mode=max,image-manifest=true,oci-mediatypes=true
+            CARGO_TOKEN=${{ secrets.CARGO_TOKEN }}
 
-
+      - name: Update Delivery
-  deploy:
+        uses: https://github.com/appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
-    runs-on: host
-    needs: build
-    steps:
-      - name: Deploy update
-        uses: appleboy/ssh-action@d732991ab09097d8c8f390d91385b0386e619598 # v1.0.3
         with:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USERNAME }}
@@ -93,6 +50,6 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            cd kon && docker compose pull bot && \
+            cd kon && docker compose pull && \
-            docker compose up -d bot --force-recreate && \
+            docker compose down --remove-orphans && docker compose up -d && \
-            docker system prune -f
+            docker image prune -f && docker system prune -f

.gitignore

@@ -1,6 +1,2 @@
 target
 .env
-*.log
-
-# Local Gitea Actions
-act

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-  "recommendations": [
-    "fill-labs.dependi",
-    "usernamehw.errorlens",
-    "tamasfe.even-better-toml",
-    "GitHub.vscode-pull-request-github",
-    "rust-lang.rust-analyzer",
-    "redhat.vscode-yaml",
-    "sumneko.lua"
-  ]
-}

.vscode/settings.json

@@ -1,4 +1,6 @@
 {
-  "rust-analyzer.showUnlinkedFileNotification": false,
+  "rust-analyzer.linkedProjects": [
-  "rust-analyzer.linkedProjects": ["./Cargo.toml"]
+    "./Cargo.toml"
+  ],
+  "rust-analyzer.showUnlinkedFileNotification": false
 }

Cargo.toml

@@ -1,26 +1,23 @@
 [package]
 name = "kon"
-version = "0.4.1"
+version = "0.3.2"
 edition = "2021"
 
 [dependencies]
-bb8 = "0.8.5"
+cargo_toml = "0.19.2"
-bb8-redis = "0.17.0"
+gamedig = "0.5.0"
-cargo_toml = "0.20.5"
+lazy_static = "1.4.0"
-feed-rs = "2.1.1"
+once_cell = "1.19.0"
-once_cell = "1.20.2"
+parse_duration = "2.1.1"
 poise = "0.6.1"
-regex = "1.11.0"
+reqwest = { version = "0.12.3", features = ["json"] }
-reqwest = { version = "0.12.8", features = ["json", "native-tls-vendored"] }
+serde = "1.0.197"
-serde = "1.0.210"
+serde_json = "1.0.115"
-serde_json = "1.0.128"
+sysinfo = "0.30.8"
-sysinfo = "0.32.0"
+tokenservice-client = { version = "0.2.0", registry = "gitea" }
-tokenservice-client = { version = "0.4.0", registry = "gitea" }
+tokio = { version = "1.37.0", features = ["macros", "signal", "rt-multi-thread"] }
-tokio = { version = "1.40.0", features = ["macros", "signal", "rt-multi-thread"] }
+tokio-postgres = "0.7.10"
-uptime_lib = "0.3.1"
+uptime_lib = "0.3.0"
-
-[features]
-production = []
 
 [[bin]]
 name = "kon"

Dockerfile

@@ -1,10 +1,16 @@
-FROM scratch AS base
+FROM rust:1.77-alpine3.19@sha256:d4c2b0a1544462f40b6179aedff4f5485a019a213907c8590ed77d1b6145a29c AS compiler
-WORKDIR /builder
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+ARG CARGO_TOKEN
+RUN apk add --no-cache openssl-dev musl-dev 
+WORKDIR /usr/src/kon
 COPY . .
+RUN mkdir -p .cargo && \
+  printf '[registries.gitea]\nindex = "sparse+https://git.toast-server.net/api/packages/toast/cargo/"\ntoken = "Bearer %s"\n' "$CARGO_TOKEN" >> .cargo/config.toml
+RUN cargo fetch && cargo build -r
 
-FROM alpine:3.20
+FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b
-LABEL org.opencontainers.image.source="https://git.toast-server.net/toast/Kon"
+RUN apk add --no-cache openssl-dev libgcc
-RUN apk add --no-cache libgcc fluidsynth
 WORKDIR /kon
-COPY --from=base /builder/target/x86_64-unknown-linux-musl/release/kon .
+COPY --from=compiler /usr/src/kon/target/release/kon .
+COPY --from=compiler /usr/src/kon/Cargo.toml .
 CMD [ "./kon" ]

build.rs

@@ -1,26 +0,0 @@
-fn main() {
-  #[cfg(feature = "production")]
-  {
-    if let Ok(git_commit_hash) = std::env::var("GIT_COMMIT_HASH") {
-      println!("cargo:rustc-env=GIT_COMMIT_HASH={}", &git_commit_hash[..7]);
-    } else {
-      println!("cargo:warning=GIT_COMMIT_HASH not found");
-      println!("cargo:rustc-env=GIT_COMMIT_HASH=no_env_set");
-    }
-  }
-
-  {
-    let git_branch = std::process::Command::new("git")
-      .args(["rev-parse", "--abbrev-ref", "HEAD"])
-      .output()
-      .expect("Command execution failed");
-
-    if git_branch.status.success() {
-      let git_branch = String::from_utf8(git_branch.stdout).expect("Invalid UTF-8 sequence").trim().to_string();
-      println!("cargo:rustc-env=GIT_COMMIT_BRANCH={}", &git_branch);
-    } else {
-      println!("cargo:warning=GIT_COMMIT_BRANCH not found");
-      println!("cargo:rustc-env=GIT_COMMIT_BRANCH=no_env_set");
-    }
-  }
-}

docker-compose.yml

@@ -1,14 +1,22 @@
 services:
   bot:
     container_name: kon
-    #image: git.toast-server.net/toast/kon:master
+    #image: 'git.toast-server.net/toast/kon:main'
     build: .
+    env_file:
+      - .env
     restart: unless-stopped
     depends_on:
-      - cache
+      - db
-  cache:
+  db:
-    container_name: kon-redis
+    container_name: kon-database
-    image: redis/redis-stack-server:7.4.0-v0
+    image: postgres:16.2-alpine3.19@sha256:1d74239810c19ed0dbb317acae40974e673865b2d565a0d369e206159d483957
     restart: unless-stopped
     ports:
-      - 37935:6379/tcp
+      - 37930:5432/tcp
+    volumes:
+      - /var/lib/docker/volumes/kon-database:/var/lib/postgresql/data:rw
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}

renovate.json

@@ -18,7 +18,6 @@
     "branchTopic": "{{{datasource}}}-{{{depName}}}-vulnerability",
     "prCreation": "immediate"
   },
-  "enabled": false,
   "pinDigests": true,
   "ignoreTests": true,
   "pruneStaleBranches": true,
@@ -26,7 +25,9 @@
   "automerge": true,
   "automergeType": "pr",
   "automergeStrategy": "squash",
-  "automergeSchedule": ["at any time"],
+  "automergeSchedule": [
+    "at any time"
+  ],
   "packageRules": [
     {
       "matchManagers": ["cargo"],

run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-clear && cargo run kon_dev
+export $(grep -v '^#' .env | xargs) && cargo run kon_dev

src/commands.rs

@@ -1,18 +0,0 @@
-use crate::Error;
-
-pub mod ilo;
-pub mod midi;
-pub mod ping;
-pub mod status;
-pub mod uptime;
-
-/// Deploy the commands globally or in a guild
-#[poise::command(
-  prefix_command,
-  owners_only,
-  guild_only
-)]
-pub async fn deploy(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
-  poise::builtins::register_application_commands_buttons(ctx).await?;
-  Ok(())
-}

src/commands/gameserver.rs

@@ -0,0 +1,265 @@
+use crate::{
+  Error,
+  internals::utils::EMBED_COLOR,
+  models::gameservers::Gameservers
+};
+
+use poise::serenity_prelude::{
+  futures::{
+    stream::iter,
+    future::ready,
+    Stream,
+    StreamExt
+  },
+  builder::CreateActionRow,
+  builder::CreateEmbed,
+};
+use poise::{
+  CreateReply,
+  serenity_prelude,
+  serenity_prelude::ButtonStyle,
+  ChoiceParameter
+};
+
+#[derive(Debug, ChoiceParameter)]
+enum GameNames {
+  #[name = "Minecraft"]
+  Minecraft
+}
+
+/// Manage the game servers for this guild
+#[poise::command(
+  slash_command,
+  subcommands("add", "remove", "update", "list"),
+  subcommand_required,
+  guild_only,
+  default_member_permissions = "MANAGE_GUILD",
+  required_permissions = "MANAGE_GUILD" // No clue if this is needed or not. Just leaving it here for now
+)]
+pub async fn gameserver(_: poise::Context<'_, (), Error>) -> Result<(), Error> {
+  Ok(())
+}
+
+/// Add a game server to the database
+#[poise::command(slash_command)]
+pub async fn add(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Server name as shown in-game or friendly name"] server_name: String,
+  #[description = "Which game is this server running?"] game_name: GameNames,
+  #[description = "IP address/domain of the server (Include the port if it has one, e.g 127.0.0.1:8080)"] ip_address: String
+) -> Result<(), Error> {
+  let action_row = CreateActionRow::Buttons(vec![
+    serenity_prelude::CreateButton::new("add-confirm")
+      .style(ButtonStyle::Success)
+      .label("Yes"),
+    serenity_prelude::CreateButton::new("add-cancel")
+      .style(ButtonStyle::Danger)
+      .label("No")
+  ]);
+
+  let reply = CreateReply::default()
+    .embed(CreateEmbed::new()
+      .title("Does this look correct?")
+      .description(format!("
+        **Server name:** `{}`
+        **Game name:** `{}`
+        **IP Address:** `{}`
+      ", server_name, game_name.name(), ip_address))
+      .color(EMBED_COLOR)
+    )
+    .components(vec![action_row]);
+
+  ctx.send(reply).await?;
+
+  while let Some(collector) = serenity_prelude::ComponentInteractionCollector::new(ctx)
+    .guild_id(ctx.guild_id().unwrap())
+    .author_id(ctx.author().id)
+    .timeout(std::time::Duration::from_secs(30))
+    .await
+  {
+    if collector.data.custom_id == "add-confirm" {
+      let result = Gameservers::add_server(
+        ctx.guild_id().unwrap().into(),
+        server_name.as_str(),
+        game_name.name(),
+        ip_address.as_str()
+      ).await;
+
+      let mut msg = collector.message.clone();
+
+      match result {
+        Ok(_) => {
+          msg.edit(
+            ctx,
+            serenity_prelude::EditMessage::new()
+              .content("*Confirmed, added the server to database*")
+              .embeds(Vec::new())
+              .components(Vec::new())
+          ).await?;
+        },
+        Err(y) => {
+          msg.edit(
+            ctx,
+            serenity_prelude::EditMessage::new()
+              .content(format!("*Error adding server to database:\n`{}`*", y))
+              .embeds(Vec::new())
+              .components(Vec::new())
+          ).await?;
+        }
+      }
+    } else if collector.data.custom_id == "add-cancel" {
+      let mut msg = collector.message.clone();
+
+      msg.edit(
+        ctx,
+        serenity_prelude::EditMessage::new()
+          .content("*Command cancelled*")
+          .embeds(Vec::new())
+          .components(Vec::new())
+      ).await?;
+    }
+  }
+
+  Ok(())
+}
+
+/// Remove a game server from the database
+#[poise::command(slash_command)]
+pub async fn remove(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Server name"] #[autocomplete = "ac_server_name"] server_name: String
+) -> Result<(), Error> {
+  let reply = CreateReply::default()
+    .embed(CreateEmbed::new()
+      .title("Are you sure you want to remove this server?")
+      .description(format!("**Server name:** `{}`", server_name))
+      .color(EMBED_COLOR)
+    )
+    .components(vec![
+      CreateActionRow::Buttons(vec![
+        serenity_prelude::CreateButton::new("delete-confirm")
+          .style(ButtonStyle::Success)
+          .label("Yes"),
+        serenity_prelude::CreateButton::new("delete-cancel")
+          .style(ButtonStyle::Danger)
+          .label("No")
+      ])
+    ]);
+
+  ctx.send(reply).await?;
+
+  while let Some(collector) = serenity_prelude::ComponentInteractionCollector::new(ctx)
+    .guild_id(ctx.guild_id().unwrap())
+    .author_id(ctx.author().id)
+    .timeout(std::time::Duration::from_secs(30))
+    .await
+  {
+    if collector.data.custom_id == "delete-confirm" {
+      let result = Gameservers::remove_server(ctx.guild_id().unwrap().into(), server_name.as_str()).await;
+
+      let mut msg = collector.message.clone();
+
+      match result {
+        Ok(_) => {
+          msg.edit(
+            ctx,
+            serenity_prelude::EditMessage::new()
+              .content("*Confirmed, removed the server from database*")
+              .embeds(Vec::new())
+              .components(Vec::new())
+          ).await?;
+        },
+        Err(y) => {
+          msg.edit(
+            ctx,
+            serenity_prelude::EditMessage::new()
+              .content(format!("*Error removing server from database:\n`{}`*", y))
+              .embeds(Vec::new())
+              .components(Vec::new())
+          ).await?;
+        }
+      }
+    } else if collector.data.custom_id == "delete-cancel" {
+      let mut msg = collector.message.clone();
+
+      msg.edit(
+        ctx,
+        serenity_prelude::EditMessage::new()
+          .content("*Command cancelled*")
+          .embeds(Vec::new())
+          .components(Vec::new())
+      ).await?;
+    }
+  }
+
+  Ok(())
+}
+
+/// Update a game server in the database
+#[poise::command(slash_command)]
+pub async fn update(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Server name"] #[autocomplete = "ac_server_name"] server_name: String,
+  #[description = "Game name"] game_name: GameNames,
+  #[description = "IP address"] ip_address: String
+) -> Result<(), Error> {
+  let result = Gameservers::update_server(
+    ctx.guild_id().unwrap().into(),
+    &server_name,
+    &game_name.name(),
+    &ip_address
+  ).await;
+
+  match result {
+    Ok(_) => {
+      ctx.send(CreateReply::default().content("Updated the server in database.")).await?;
+    },
+    Err(y) => {
+      ctx.send(CreateReply::default().content(format!("Error updating the server in database: {:?}", y))).await?;
+    }
+  }
+
+  Ok(())
+}
+
+/// List all the available game servers for this guild
+#[poise::command(slash_command)]
+pub async fn list(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
+  let servers = Gameservers::list_servers(ctx.guild_id().unwrap().into()).await?;
+
+  let mut embed_fields = Vec::new();
+  for server in servers {
+    embed_fields.push(
+      (server.server_name, format!("Game: `{}`\nIP: `{}`", server.game_name, server.ip_address), true)
+    );
+  }
+
+  ctx.send(CreateReply::default()
+    .embed(CreateEmbed::new()
+      .title("List of registered gameservers")
+      .fields(embed_fields)
+      .color(EMBED_COLOR)
+    )
+  ).await?;
+
+  Ok(())
+}
+
+pub async fn ac_server_name<'a>(
+  ctx: poise::Context<'_, (), Error>,
+  partial: &'a str
+) -> impl Stream<Item = String> + 'a {
+  let result = Gameservers::get_server_names(ctx.guild_id().unwrap().into()).await;
+
+  let names = match result {
+    Ok(names_vector) => names_vector,
+    Err(y) => {
+      println!("Error retrieving server names: {:?}", y);
+      Vec::new()
+    }
+  };
+
+  iter(names)
+    .filter(move |server_name| ready(server_name.starts_with(partial)))
+    .map(|server_name| server_name.to_string())
+}

src/commands/ilo.rs

@@ -1,319 +0,0 @@
-use crate::{
-  Error,
-  internals::{
-    config::BINARY_PROPERTIES,
-    utils::token_path
-  }
-};
-
-use reqwest::{
-  ClientBuilder,
-  Error as ReqError
-};
-use serde::{
-  Serialize,
-  Deserialize
-};
-use poise::{
-  CreateReply,
-  serenity_prelude::{
-    CreateEmbed,
-    Timestamp
-  }
-};
-
-#[derive(Serialize, Deserialize)]
-struct Chassis {
-  #[serde(rename = "Fans")]
-  fans: Vec<Fan>,
-  #[serde(rename = "Temperatures")]
-  temperatures: Vec<Temperature>
-}
-
-#[derive(Serialize, Deserialize)]
-struct Fan {
-  #[serde(rename = "CurrentReading")]
-  current_reading: i32,
-  #[serde(rename = "FanName")]
-  fan_name: String,
-  #[serde(rename = "Status")]
-  status: Status,
-}
-
-#[derive(Serialize, Deserialize)]
-struct Temperature {
-  #[serde(rename = "CurrentReading")]
-  current_reading: i32,
-  #[serde(rename = "Name")]
-  name: String,
-  #[serde(rename = "ReadingCelsius")]
-  reading_celsius: i32,
-  #[serde(rename = "Status")]
-  status: Status,
-  #[serde(rename = "Units")]
-  units: String,
-  #[serde(rename = "UpperThresholdCritical")]
-  upper_threshold_critical: i32,
-  #[serde(rename = "UpperThresholdFatal")]
-  upper_threshold_fatal: i32
-}
-
-#[derive(Serialize, Deserialize)]
-struct Status {
-  #[serde(rename = "Health")]
-  health: Option<String>,
-  #[serde(rename = "State")]
-  state: String
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct Power {
-  #[serde(rename = "PowerCapacityWatts")]
-  power_capacity_watts: i32,
-  #[serde(rename = "PowerConsumedWatts")]
-  power_consumed_watts: i32,
-  #[serde(rename = "PowerMetrics")]
-  power_metrics: PowerMetrics
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PowerMetrics {
-  #[serde(rename = "AverageConsumedWatts")]
-  average_consumed_watts: i32,
-  #[serde(rename = "MaxConsumedWatts")]
-  max_consumed_watts: i32,
-  #[serde(rename = "MinConsumedWatts")]
-  min_consumed_watts: i32
-}
-
-#[derive(Serialize, Deserialize)]
-struct System {
-  #[serde(rename = "Memory")]
-  memory: Memory,
-  #[serde(rename = "Model")]
-  model: String,
-  #[serde(rename = "Oem")]
-  oem: Oem,
-  #[serde(rename = "PowerState")]
-  power_state: String,
-  #[serde(rename = "ProcessorSummary")]
-  processor_summary: ProcessorSummary
-}
-
-#[derive(Serialize, Deserialize)]
-struct Memory {
-  #[serde(rename = "TotalSystemMemoryGB")]
-  total_system_memory: i32
-}
-
-#[derive(Serialize, Deserialize)]
-struct ProcessorSummary {
-  #[serde(rename = "Count")]
-  count: i32,
-  #[serde(rename = "Model")]
-  cpu: String
-}
-
-#[derive(Serialize, Deserialize)]
-struct Oem {
-  #[serde(rename = "Hp")]
-  hp: Hp
-}
-
-#[derive(Serialize, Deserialize)]
-struct Hp {
-  #[serde(rename = "PostState")]
-  post_state: String
-}
-
-#[derive(Serialize, Deserialize)]
-struct Event {
-  #[serde(rename = "Status")]
-  status: Status
-}
-
-const ILO_HOSTNAME: &str = "POMNI";
-
-enum RedfishEndpoint {
-  Thermal,
-  Power,
-  System,
-  EventService
-}
-
-impl RedfishEndpoint {
-  fn url(&self) -> String {
-    match self {
-      RedfishEndpoint::Thermal => "Chassis/1/Thermal".to_string(),
-      RedfishEndpoint::Power => "Chassis/1/Power".to_string(),
-      RedfishEndpoint::System => "Systems/1".to_string(),
-      RedfishEndpoint::EventService => "EventService".to_string()
-    }
-  }
-}
-
-async fn ilo_data(endpoint: RedfishEndpoint) -> Result<Box<dyn std::any::Any + Send>, ReqError> {
-  let client = ClientBuilder::new()
-    .danger_accept_invalid_certs(true)
-    .build()
-    .unwrap();
-  let res = client
-    .get(format!("https://{}/redfish/v1/{}", token_path().await.ilo_ip, endpoint.url()))
-    .basic_auth(token_path().await.ilo_user, Some(token_path().await.ilo_pw))
-    .send()
-    .await
-    .unwrap();
-
-  match endpoint {
-    RedfishEndpoint::Thermal => {
-      let body: Chassis = res.json().await.unwrap();
-      Ok(Box::new(body))
-    }
-    RedfishEndpoint::Power => {
-      let body: Power = res.json().await.unwrap();
-      Ok(Box::new(body))
-    }
-    RedfishEndpoint::System => {
-      let body: System = res.json().await.unwrap();
-      Ok(Box::new(body))
-    }
-    RedfishEndpoint::EventService => {
-      let body: Event = res.json().await.unwrap();
-      Ok(Box::new(body))
-    }
-  }
-}
-
-/// Retrieve data from the HP iLO4 interface
-#[poise::command(
-  slash_command,
-  subcommands("temperature", "power", "system")
-)]
-pub async fn ilo(_: poise::Context<'_, (), Error>) -> Result<(), Error> {
-  Ok(())
-}
-
-/// Retrieve the server's temperature data
-#[poise::command(slash_command)]
-pub async fn temperature(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
-  ctx.defer().await?;
-  let ilo = ilo_data(RedfishEndpoint::Thermal).await.unwrap();
-  let data = ilo.downcast_ref::<Chassis>().unwrap();
-  let mut tempdata = String::new();
-  let mut fandata = String::new();
-
-  let allowed_sensors = [
-    "01-Inlet Ambient",
-    "04-P1 DIMM 1-6",
-    "14-Chipset Zone"
-  ];
-
-  for temp in &data.temperatures {
-    if temp.reading_celsius == 0 || !allowed_sensors.contains(&temp.name.as_str()) {
-      continue;
-    }
-
-    let name = match temp.name.as_str() {
-      "01-Inlet Ambient" => "Inlet Ambient",
-      "04-P1 DIMM 1-6" => "P1 DIMM 1-6",
-      "14-Chipset Zone" => "Chipset Zone",
-      _ => "Unknown Sensor"
-    };
-
-    tempdata.push_str(&format!("**{}:** `{}°C`\n", name, temp.reading_celsius));
-  }
-  for fan in &data.fans {
-    if fan.current_reading == 0 {
-      continue;
-    }
-
-    fandata.push_str(&format!("**{}:** `{}%`\n", fan.fan_name, fan.current_reading));
-  }
-
-  ctx.send(CreateReply::default().embed(
-    CreateEmbed::new()
-      .color(BINARY_PROPERTIES.embed_color)
-      .timestamp(Timestamp::now())
-      .title(format!("{} - Temperatures", ILO_HOSTNAME))
-      .fields(vec![
-        ("Temperatures", tempdata, false),
-        ("Fans", fandata, false)
-      ])
-  )).await?;
-
-  Ok(())
-}
-
-/// Retrieve the server's power data
-#[poise::command(slash_command)]
-pub async fn power(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
-  ctx.defer().await?;
-  let ilo = ilo_data(RedfishEndpoint::Power).await.unwrap();
-  let data = ilo.downcast_ref::<Power>().unwrap();
-
-  let mut powerdata = String::new();
-
-  powerdata.push_str(&format!("**Power Capacity:** `{}w`\n", &data.power_capacity_watts));
-  powerdata.push_str(&format!("**Power Consumed:** `{}w`\n", &data.power_consumed_watts));
-  powerdata.push_str(&format!("**Average Power:** `{}w`\n", &data.power_metrics.average_consumed_watts));
-  powerdata.push_str(&format!("**Max Consumed:** `{}w`\n", &data.power_metrics.max_consumed_watts));
-  powerdata.push_str(&format!("**Min Consumed:** `{}w`", &data.power_metrics.min_consumed_watts));
-
-  ctx.send(CreateReply::default().embed(
-    CreateEmbed::new()
-      .color(BINARY_PROPERTIES.embed_color)
-      .timestamp(Timestamp::now())
-      .title(format!("{} - Power", ILO_HOSTNAME))
-      .description(powerdata)
-  )).await?;
-
-  Ok(())
-}
-
-/// Retrieve the server's system data
-#[poise::command(slash_command)]
-pub async fn system(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
-  ctx.defer().await?;
-
-  let (ilo_sys, ilo_event) = tokio::join!(
-    ilo_data(RedfishEndpoint::System),
-    ilo_data(RedfishEndpoint::EventService)
-  );
-
-  let ilo_sys = ilo_sys.unwrap();
-  let ilo_event = ilo_event.unwrap();
-
-  let system_data = ilo_sys.downcast_ref::<System>().unwrap();
-  let event_data = ilo_event.downcast_ref::<Event>().unwrap();
-
-  let mut data = String::new();
-
-  let post_state = match system_data.oem.hp.post_state.as_str() {
-    "FinishedPost" => "Finished POST",
-    "InPost" => "In POST (Booting)",
-    "PowerOff" => "Powered off",
-    _ => "Unknown State"
-  };
-  if system_data.oem.hp.post_state != "FinishedPost" {
-    println!("iLO:PostState = {}", system_data.oem.hp.post_state);
-  }
-
-  data.push_str(&format!("**Health:** `{}`\n", event_data.status.health.as_ref().unwrap_or(&"Unknown".to_string())));
-  data.push_str(&format!("**POST:** `{}`\n", post_state));
-  data.push_str(&format!("**Power:** `{}`\n", &system_data.power_state));
-  data.push_str(&format!("**Model:** `{}`", &system_data.model));
-
-  ctx.send(CreateReply::default().embed(
-    CreateEmbed::new()
-      .color(BINARY_PROPERTIES.embed_color)
-      .timestamp(Timestamp::now())
-      .title(format!("{} - System", ILO_HOSTNAME))
-      .description(data)
-      .fields(vec![
-        (format!("CPU ({}x)", system_data.processor_summary.count), system_data.processor_summary.cpu.trim().to_string(), true),
-        ("RAM".to_string(), format!("{} GB", system_data.memory.total_system_memory), true)
-      ])
-  )).await?;
-
-  Ok(())
-}

src/commands/midi.rs

@@ -1,101 +0,0 @@
-use crate::{
-  Error,
-  internals::utils::{
-    mention_dev,
-    format_bytes
-  }
-};
-
-use regex::Regex;
-use std::{
-  os::unix::fs::MetadataExt,
-  fs::{
-    write,
-    remove_file,
-    metadata
-  }
-};
-use poise::{
-  CreateReply,
-  serenity_prelude::CreateAttachment
-};
-
-/// Convert MIDI file to WAV
-#[poise::command(context_menu_command = "MIDI -> WAV")]
-pub async fn midi_to_wav(
-  ctx: poise::Context<'_, (), Error>,
-  #[description = "MIDI file to be converted"] message: poise::serenity_prelude::Message
-) -> Result<(), Error> {
-  let re = Regex::new(r"(?i)\.mid$").unwrap();
-
-  if !message.embeds.is_empty() || message.attachments.is_empty() || !re.is_match(&message.attachments[0].filename) {
-    ctx.reply("That ain't a MIDI file! What are you even doing??").await?;
-    return Ok(());
-  }
-
-  ctx.defer().await?;
-
-  let bytes = match message.attachments[0].download().await {
-    Ok(bytes) => bytes,
-    Err(y) => {
-      ctx.send(CreateReply::default()
-        .content(format!(
-          "Download failed, ask {} to check console for more information!",
-          mention_dev(ctx).unwrap_or_default()
-        ))
-      )
-      .await.unwrap();
-
-      return Err(Error::from(format!("Failed to download the file: {}", y)))
-    }
-  };
-
-  let midi_path = &message.attachments[0].filename;
-  write(midi_path, bytes)?;
-
-  let wav_path = re.replace(midi_path, ".wav");
-
-  let sf2_path = "/tmp/FluidR3_GM.sf2";
-  write(sf2_path, include_bytes!("../internals/assets/FluidR3_GM.sf2"))?;
-
-  let output = std::process::Command::new("fluidsynth")
-    .args(["-ni", sf2_path, midi_path, "-F", &wav_path])
-    .output();
-
-  // Just to add an info to console to tell what the bot is doing when MIDI file is downloaded.
-  println!("Discord[{}:{}]: Processing MIDI file: \"{}\"", ctx.guild().unwrap().name, ctx.command().qualified_name, midi_path);
-
-  match output {
-    Ok(_) => {
-      let reply = ctx.send(CreateReply::default()
-        .attachment(CreateAttachment::path(&*wav_path).await.unwrap())
-      ).await;
-
-      if reply.is_err() {
-        println!(
-          "Discord[{}:{}]: Processed file couldn't be uploaded back to Discord channel due to upload limit",
-          ctx.guild().unwrap().name, ctx.command().qualified_name
-        );
-
-        ctx.send(CreateReply::default()
-          .content(format!(
-            "Couldn't upload the processed file (`{}`, `{}`) due to upload limit",
-            &*wav_path, format_bytes(metadata(&*wav_path).unwrap().size())
-          ))
-        ).await.unwrap();
-      } else if reply.is_ok() {
-        remove_file(midi_path)?;
-        remove_file(&*wav_path)?;
-      }
-    },
-    Err(y) => {
-      ctx.send(CreateReply::default()
-        .content("Command didn't execute successfully, check console for more information!")
-      ).await.unwrap();
-
-      return Err(Error::from(format!("Midi conversion failed: {}", y)))
-    }
-  }
-
-  Ok(())
-}

src/commands/mod.rs

@@ -0,0 +1,5 @@
+pub mod ping;
+pub mod status;
+pub mod uptime;
+pub mod gameserver;
+pub mod moderation;

src/commands/moderation.rs

@@ -0,0 +1,203 @@
+use crate::{
+  Error,
+  internals::utils::capitalize_first,
+  models::moderation_events::{
+    Moderations,
+    ActionTypes
+  }
+};
+
+use poise::CreateReply;
+use poise::serenity_prelude::Member;
+use parse_duration::parse;
+use std::time::SystemTime;
+
+static FALLBACK_REASON: &str = "Reason unknown";
+
+fn duration2epoch(duration: &str) -> Result<i64, Error> {
+  match parse(duration) {
+    Ok(dur) => {
+      let now = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .map_err(|_| Error::from("System time before Unix Epoch"))?;
+      Ok((now + dur).as_secs() as i64)
+    }
+    Err(_) => Err(Error::from("Invalid duration format"))
+  }
+}
+
+/// Subcommands collection for /case command
+#[poise::command(
+  slash_command,
+  guild_only,
+  subcommands("update"),
+  default_member_permissions = "KICK_MEMBERS | BAN_MEMBERS | MODERATE_MEMBERS"
+)]
+pub async fn case(_: poise::Context<'_, (), Error>) -> Result<(), Error> {
+  Ok(())
+}
+
+/// Update a case with new reason
+#[poise::command(slash_command, guild_only)]
+pub async fn update(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Case ID to update"] case_id: i32,
+  #[description = "New reason for the case"] reason: String
+) -> Result<(), Error> {
+  match Moderations::update_case(
+    i64::from(ctx.guild_id().unwrap()),
+    case_id,
+    false,
+    Some(reason.clone())
+  ).await {
+    Ok(_) => ctx.send(CreateReply::default().content(format!("Case #{} updated with new reason:\n`{}`", case_id, reason))).await?,
+    Err(e) => ctx.send(CreateReply::default().content(format!("Error updating case ID: {}\nError: {}", case_id, e))).await?
+  };
+
+  Ok(())
+}
+
+/// Kick a member
+#[poise::command(
+  slash_command,
+  guild_only,
+  default_member_permissions = "KICK_MEMBERS",
+  required_bot_permissions = "KICK_MEMBERS"
+)]
+pub async fn kick(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Member to be kicked"] member: Member,
+  #[description = "Reason for the kick"] reason: Option<String>
+) -> Result<(), Error> {
+  let reason = reason.unwrap_or(FALLBACK_REASON.to_string());
+  let case = Moderations::create_case(
+    i64::from(ctx.guild_id().unwrap()),
+    ActionTypes::Kick,
+    false,
+    i64::from(member.user.id),
+    member.user.tag(),
+    reason.clone(),
+    i64::from(ctx.author().id),
+    ctx.author().tag(),
+    ctx.created_at().timestamp(),
+    None
+  ).await?;
+  Moderations::generate_modlog(case.clone(), &ctx.http(), ctx.channel_id().into()).await?;
+
+  member.kick_with_reason(&ctx.http(), &reason).await?;
+  ctx.send(CreateReply::default().content(format!("Member: {}\nReason: `{}`\nType: {}\nModerator: {}", member.user.tag(), reason, capitalize_first(case.action_type.as_str()), ctx.author().tag()))).await?;
+
+  Ok(())
+}
+
+/// Ban a member
+#[poise::command(
+  slash_command,
+  guild_only,
+  default_member_permissions = "BAN_MEMBERS",
+  required_bot_permissions = "BAN_MEMBERS"
+)]
+pub async fn ban(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Member to be banned"] member: Member,
+  #[description = "Reason for the ban"] reason: Option<String>,
+  #[description = "Ban duration"] duration: Option<String>
+) -> Result<(), Error> {
+  let reason = reason.unwrap_or(FALLBACK_REASON.to_string());
+  let duration = match duration {
+    Some(d) => Some(duration2epoch(&d)?),
+    None => None
+  };
+  let is_case_active = duration.is_some();
+
+  let case = Moderations::create_case(
+    i64::from(ctx.guild_id().unwrap()),
+    ActionTypes::Ban,
+    is_case_active,
+    i64::from(member.user.id),
+    member.user.tag(),
+    reason.clone(),
+    i64::from(ctx.author().id),
+    ctx.author().tag(),
+    ctx.created_at().timestamp(),
+    duration
+  ).await?;
+  Moderations::generate_modlog(case.clone(), &ctx.http(), ctx.channel_id().into()).await?;
+
+  member.ban_with_reason(&ctx.http(), 0, &reason).await?;
+  ctx.send(CreateReply::default().content(format!("Member: {}\nReason: `{}`\nType: {}\nModerator: {}\nDuration: `{}`", member.user.tag(), reason, capitalize_first(case.action_type.as_str()), ctx.author().tag(), duration.unwrap()))).await?;
+
+  Ok(())
+}
+
+/// Timeout a member
+#[poise::command(
+  slash_command,
+  guild_only,
+  default_member_permissions = "MODERATE_MEMBERS",
+  required_bot_permissions = "MODERATE_MEMBERS"
+)]
+pub async fn mute(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Member to be muted"] mut member: Member,
+  #[description = "Mute duration"] duration: String,
+  #[description = "Reason for the mute"] reason: Option<String>
+) -> Result<(), Error> {
+  let reason = reason.unwrap_or(FALLBACK_REASON.to_string());
+  let duration = Some(duration2epoch(&duration)?);
+  let is_case_active = duration.is_some();
+
+  let case = Moderations::create_case(
+    i64::from(ctx.guild_id().unwrap()),
+    ActionTypes::Mute,
+    is_case_active,
+    i64::from(member.user.id),
+    member.user.tag(),
+    reason.clone(),
+    i64::from(ctx.author().id),
+    ctx.author().tag(),
+    ctx.created_at().timestamp(),
+    duration
+  ).await?;
+
+  println!("case.duration: {}", case.duration.unwrap().to_string().as_str());
+
+  let mute_time = poise::serenity_prelude::Timestamp::from_unix_timestamp(case.duration.unwrap()).expect("Failed to format timestamp");
+  member.disable_communication_until_datetime(&ctx.http(), mute_time).await?;
+
+  ctx.send(CreateReply::default().content(format!("Member: {}\nReason: `{}`\nType: {}\nModerator: {}\nDuration: `{}`", member.user.tag(), reason, capitalize_first(case.action_type.as_str()), ctx.author().tag(), mute_time))).await?;
+
+  Ok(())
+}
+
+/// Warn a member
+#[poise::command(
+  slash_command,
+  guild_only,
+  default_member_permissions = "MODERATE_MEMBERS",
+  required_bot_permissions = "MODERATE_MEMBERS"
+)]
+pub async fn warn(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Member to be warned"] member: Member,
+  #[description = "Reason for the warn"] reason: Option<String>
+) -> Result<(), Error> {
+  let reason = reason.unwrap_or(FALLBACK_REASON.to_string());
+  let case = Moderations::create_case(
+    i64::from(ctx.guild_id().unwrap()),
+    ActionTypes::Warn,
+    false,
+    i64::from(member.user.id),
+    member.user.tag(),
+    reason.clone(),
+    i64::from(ctx.author().id),
+    ctx.author().tag(),
+    ctx.created_at().timestamp(),
+    None
+  ).await?;
+  Moderations::generate_modlog(case.clone(), &ctx.http(), ctx.channel_id().into()).await?;
+
+  ctx.send(CreateReply::default().content(format!("Member: {}\nReason: `{}`\nType: {}\nModerator: {}", member.user.tag(), reason, capitalize_first(case.action_type.as_str()), ctx.author().tag()))).await?;
+
+  Ok(())
+}

src/commands/status.rs

@@ -1,23 +1,41 @@
 use crate::{
   Error,
-  internals::{
+  models::gameservers::Gameservers,
-    config::BINARY_PROPERTIES,
+  commands::gameserver::ac_server_name,
-    http::HttpClient,
+  internals::utils::EMBED_COLOR,
-    utils::token_path
+  internals::http::HttpClient,
-  }
+  internals::utils::token_path
 };
 
-use serde_json::Value;
 use std::collections::HashMap;
 use tokio::join;
-use poise::{
+use poise::CreateReply;
-  CreateReply,
+use poise::serenity_prelude::builder::CreateEmbed;
-  serenity_prelude::builder::CreateEmbed
+use serde::Deserialize;
-};
+use serde_json::Value;
+
+#[derive(Deserialize)]
+struct MinecraftQueryData {
+  motd: Option<MinecraftMotd>,
+  players: Option<MinecraftPlayers>,
+  version: Option<String>,
+  online: bool
+}
+
+#[derive(Deserialize)]
+struct MinecraftMotd {
+  clean: Vec<String>
+}
+
+#[derive(Deserialize, Clone, Copy)]
+struct MinecraftPlayers {
+  online: i32,
+  max: i32
+}
 
 async fn pms_serverstatus(url: &str) -> Result<Vec<(String, Vec<Value>)>, Error> {
   let client = HttpClient::new();
-  let req = client.get(url, "PMS-Status").await?;
+  let req = client.get(url).await?;
 
   let response = req.json::<HashMap<String, Value>>().await?;
   let data = response["data"].as_array().unwrap();
@@ -54,7 +72,7 @@ fn process_pms_statuses(servers: Vec<(String, Vec<Value>)>) -> Vec<(String, Stri
         _ => "Unknown"
       };
       let name = id_name_map.get(id).unwrap_or(&name);
-      server_map.entry(title.clone()).or_default().push((name.to_owned().to_string(), status.to_owned()));
+      server_map.entry(title.clone()).or_insert_with(Vec::new).push((name.to_owned().to_string(), status.to_owned()));
     }
   }
 
@@ -66,11 +84,22 @@ fn process_pms_statuses(servers: Vec<(String, Vec<Value>)>) -> Vec<(String, Stri
   statuses
 }
 
+async fn gs_query_minecraft(server_ip: &str) -> Result<MinecraftQueryData, Error> {
+  let client = HttpClient::new();
+  let req = client.get(&format!("https://api.mcsrvstat.us/2/{}", server_ip)).await?;
+
+  if req.status().is_success() {
+    let data: MinecraftQueryData = req.json().await?;
+    Ok(data)
+  } else if req.status().is_server_error() {
+    Err(Error::from("Webserver returned a 5xx error.")) 
+  } else {
+    Err(Error::from("Failed to query the server."))
+  }
+}
+
 /// Query the server statuses
-#[poise::command(
+#[poise::command(slash_command, subcommands("wg", "gs"), subcommand_required)]
-  slash_command,
-  subcommands("wg")
-)]
 pub async fn status(_: poise::Context<'_, (), Error>) -> Result<(), Error> {
   Ok(())
 }
@@ -80,7 +109,7 @@ pub async fn status(_: poise::Context<'_, (), Error>) -> Result<(), Error> {
 pub async fn wg(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
   let pms_asia = token_path().await.wg_pms;
   let pms_eu = pms_asia.replace("asia", "eu");
-  let embed = CreateEmbed::new().color(BINARY_PROPERTIES.embed_color);
+  let embed = CreateEmbed::new().color(EMBED_COLOR);
 
   let (servers_asia, servers_eu) = join!(pms_serverstatus(&pms_asia), pms_serverstatus(&pms_eu));
   let joined_pms_servers = [servers_eu.unwrap(), servers_asia.unwrap()].concat();
@@ -90,3 +119,46 @@ pub async fn wg(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
 
   Ok(())
 }
+
+/// Retrieve the given server data from gameservers DB
+#[poise::command(slash_command, guild_only)]
+pub async fn gs(
+  ctx: poise::Context<'_, (), Error>,
+  #[description = "Server name"] #[autocomplete = "ac_server_name"] server_name: String
+) -> Result<(), Error> {
+  let server_data = Gameservers::get_server_data(ctx.guild_id().unwrap().into(), &server_name).await?;
+
+  // Extract values from a Vec above
+  let game_name = &server_data[1];
+  let ip_address = &server_data[2];
+
+  match game_name.as_str() {
+    "Minecraft" => {
+      let result = gs_query_minecraft(ip_address).await?;
+      let embed = CreateEmbed::new().color(EMBED_COLOR);
+
+      if result.online {
+        let mut embed_fields = Vec::new();
+        embed_fields.push(("Server IP".to_owned(), ip_address.to_owned(), true));
+        embed_fields.push((format!("\u{200b}"), format!("\u{200b}"), true));
+        embed_fields.push(("MOTD".to_owned(), format!("{}", result.motd.unwrap().clean[0]), true));
+        embed_fields.push(("Players".to_owned(), format!("**{}**/**{}**", result.players.unwrap().online, result.players.clone().unwrap().max), true));
+        embed_fields.push(("Version".to_owned(), result.version.unwrap(), true));
+
+        ctx.send(CreateReply::default()
+          .embed(embed
+            .title(server_name)
+            .fields(embed_fields)
+          )
+        ).await?;
+      } else {
+        ctx.send(CreateReply::default()
+          .content(format!("**{}** (`{}`) is currently offline or unreachable.", server_name, ip_address))
+        ).await?;
+      }
+    },
+    _ => {}
+  }
+
+  Ok(())
+}

src/commands/uptime.rs

@@ -1,50 +1,20 @@
 use crate::{
   Error,
-  GIT_COMMIT_HASH,
-  GIT_COMMIT_BRANCH,
   internals::utils::{
-    BOT_VERSION,
+    format_duration,
-    format_duration
+    concat_message,
+    BOT_VERSION
   }
 };
 
 use sysinfo::System;
 use uptime_lib::get;
-use std::{
+use std::time::{
-  fs::File,
-  path::Path,
-  time::{
   Duration,
   SystemTime,
   UNIX_EPOCH
-  },
-  io::{
-    BufRead,
-    BufReader
-  }
 };
 
-fn get_os_info() -> String {
-  let path = Path::new("/etc/os-release");
-  let mut name = "BoringOS".to_string();
-  let mut version = "v0.0".to_string();
-
-  if let Ok(file) = File::open(path) {
-    let reader = BufReader::new(file);
-    let set_value = |s: String| s.split('=').nth(1).unwrap_or_default().trim_matches('"').to_string();
-    reader.lines().map_while(Result::ok).for_each(|line| {
-      match line {
-        l if l.starts_with("NAME=") => name = set_value(l),
-        l if l.starts_with("VERSION=") => version = set_value(l),
-        l if l.starts_with("VERSION_ID=") => version = set_value(l),
-        _ => {}
-      }
-    });
-  }
-
-  format!("{} {}", name, version)
-}
-
 /// Retrieve host and bot uptimes
 #[poise::command(slash_command)]
 pub async fn uptime(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
@@ -55,9 +25,6 @@ pub async fn uptime(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
   // Fetch system's uptime
   let sys_uptime = get().unwrap().as_secs();
 
-  // Fetch system's processor
-  let cpu = sys.cpus();
-
   // Fetch bot's process uptime
   let curr_pid = sysinfo::get_current_pid().unwrap();
   let now = SystemTime::now();
@@ -67,14 +34,12 @@ pub async fn uptime(ctx: poise::Context<'_, (), Error>) -> Result<(), Error> {
     proc_uptime = now.duration_since(time_started).unwrap().as_secs();
   }
 
-  let stat_msg = [
+  let stat_msg = vec![
-    format!("**{} {}** `{}:{}`", _bot.name, BOT_VERSION.as_str(), GIT_COMMIT_HASH, GIT_COMMIT_BRANCH),
+    format!("**{} {}**", _bot.name, BOT_VERSION.as_str()),
     format!(">>> System: `{}`", format_duration(sys_uptime)),
-    format!("Process: `{}`", format_duration(proc_uptime)),
+    format!("Process: `{}`", format_duration(proc_uptime))
-    format!("CPU: `{}`", cpu[0].brand()),
-    format!("OS: `{}`", get_os_info())
   ];
-  ctx.reply(stat_msg.join("\n")).await?;
+  ctx.reply(concat_message(stat_msg)).await?;
 
   Ok(())
 }

src/controllers.rs

@@ -1 +0,0 @@
-pub mod cache;

src/controllers/cache.rs

@@ -1,91 +0,0 @@
-use crate::internals::utils::token_path;
-
-use bb8_redis::{
-  bb8::Pool,
-  redis::cmd,
-  redis::RedisError,
-  redis::RedisResult,
-  redis::AsyncCommands,
-  RedisConnectionManager
-};
-use tokio::time::{
-  Duration,
-  sleep
-};
-
-#[derive(Debug)]
-pub struct RedisController {
-  pool: Pool<RedisConnectionManager>
-}
-
-impl RedisController {
-  pub async fn new() -> Result<Self, RedisError> {
-    let manager = RedisConnectionManager::new(token_path().await.redis_uri.as_str())?;
-    let pool = Self::create_pool(manager).await;
-    Ok(Self { pool })
-  }
-
-  async fn create_pool(manager: RedisConnectionManager) -> Pool<RedisConnectionManager> {
-    let mut backoff = 1;
-
-    loop {
-      match Pool::builder().max_size(20).retry_connection(true).build(manager.clone()).await {
-        Ok(pool) => {
-          match pool.get().await {
-            Ok(mut conn) => {
-              let ping: RedisResult<String> = cmd("PING").query_async(&mut *conn).await;
-              match ping {
-                Ok(_) => {
-                  println!("Redis[Info]: Successfully connected");
-                  return pool.clone();
-                },
-                Err(e) => {
-                  eprintln!("Redis[Error]: {}, retrying in {} seconds", e, backoff);
-                  Self::apply_backoff(&mut backoff).await;
-                }
-              }
-            },
-            Err(e) => {
-              eprintln!("Redis[ConnError]: {}, retrying in {} seconds", e, backoff);
-              Self::apply_backoff(&mut backoff).await;
-            }
-          }
-        }
-        Err(e) => {
-          eprintln!("Redis[PoolError]: {}, retrying in {} seconds", e, backoff);
-          Self::apply_backoff(&mut backoff).await;
-        }
-      }
-    }
-  }
-
-  async fn apply_backoff(backoff: &mut u64) {
-    sleep(Duration::from_secs(*backoff)).await;
-    if *backoff < 64 {
-      *backoff *= 2;
-    }
-  }
-
-  /// Get a key from the cache
-  pub async fn get(&self, key: &str) -> RedisResult<Option<String>> {
-    let mut conn = self.pool.get().await.unwrap();
-    conn.get(key).await
-  }
-
-  pub async fn del(&self, key: &str) -> RedisResult<()> {
-    let mut conn = self.pool.get().await.unwrap();
-    conn.del(key).await
-  }
-
-  /// Set a key with a value in the cache
-  pub async fn set(&self, key: &str, value: &str) -> RedisResult<()> {
-    let mut conn = self.pool.get().await.unwrap();
-    conn.set(key, value).await
-  }
-
-  /// Set a key with an expiration time in seconds
-  pub async fn expire(&self, key: &str, seconds: i64) -> RedisResult<()> {
-    let mut conn = self.pool.get().await.unwrap();
-    conn.expire(key, seconds).await
-  }
-}

src/controllers/database.rs

@@ -0,0 +1,64 @@
+use crate::internals;
+
+use poise::serenity_prelude::prelude::TypeMapKey;
+use tokio_postgres::{Client, NoTls, Error};
+
+pub struct DatabaseController {
+  pub client: Client
+}
+
+impl TypeMapKey for DatabaseController {
+  type Value = DatabaseController;
+}
+
+impl DatabaseController {
+  pub async fn new() -> Result<DatabaseController, Error> {
+    let (client, connection) = tokio_postgres::connect(&internals::utils::token_path().await.postgres_uri, NoTls).await?;
+
+    tokio::spawn(async move {
+      if let Err(e) = connection.await {
+        eprintln!("Connection error: {}", e);
+      }
+    });
+
+    // Gameservers
+    client.batch_execute("
+      CREATE TABLE IF NOT EXISTS gameservers (
+        server_name VARCHAR(255) NOT NULL,
+        game_name VARCHAR(255) NOT NULL,
+        guild_owner BIGINT NOT NULL,
+        ip_address VARCHAR(255) NOT NULL,
+        PRIMARY KEY (server_name, guild_owner)
+      );
+    ").await?;
+
+    // Guild Case IDs
+    client.batch_execute("
+      CREATE TABLE IF NOT EXISTS guild_case_ids (
+        guild_id BIGINT NOT NULL,
+        max_case_id INT NOT NULL DEFAULT 0,
+        PRIMARY KEY (guild_id)
+      );
+    ").await?;
+
+    // ModerationEvents
+    client.batch_execute("
+      CREATE TABLE IF NOT EXISTS moderation_events (
+        guild_id BIGINT NOT NULL,
+        case_id INT NOT NULL,
+        action_type VARCHAR(255) NOT NULL,
+        is_active BOOLEAN NOT NULL DEFAULT FALSE,
+        user_id BIGINT NOT NULL,
+        user_tag VARCHAR(255) NOT NULL,
+        reason VARCHAR(1024) NOT NULL,
+        moderator_id BIGINT NOT NULL,
+        moderator_tag VARCHAR(255) NOT NULL,
+        time_created BIGINT NOT NULL,
+        duration BIGINT,
+        PRIMARY KEY (guild_id, case_id)
+      );
+    ").await?;
+
+    Ok(DatabaseController { client })
+  }
+}

src/controllers/mod.rs

@@ -0,0 +1,2 @@
+pub mod database;
+pub mod timers;

src/controllers/timers.rs

@@ -0,0 +1,95 @@
+use crate::{
+  Error,
+  models::moderation_events::{
+    Moderations,
+    ActionTypes
+  }
+};
+
+use std::time::SystemTime;
+use poise::serenity_prelude::{
+  Context,
+  model::{
+    user::CurrentUser,
+    id::{
+      UserId,
+      GuildId
+    }
+  },
+};
+use tokio::time::{
+  interval,
+  Duration
+};
+
+fn timer_failed(name: &str) -> String {
+  format!("Failed to start timer for {}", name)
+}
+
+pub async fn start_timers(discord_: &Context, bot_: CurrentUser) -> Result<(), Error> {
+  let ctx_clone = discord_.clone();
+  tokio::spawn(async move {
+    check_modlog_cases(&ctx_clone, bot_).await.expect(&timer_failed("moderation events"))
+  });
+
+  Ok(())
+}
+
+async fn check_modlog_cases(discord_: &Context, bot_: CurrentUser) -> Result<(), Error> {
+  let mut interval = interval(Duration::from_secs(6));
+
+  loop {
+    interval.tick().await;
+    let events = Moderations::get_active_events().await?;
+
+    for event in events {
+      let now = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .map_err(|_| Error::from("System time before Unix Epoch"))?;
+
+      let check_action_type = match event.action_type {
+        ActionTypes::Ban => ActionTypes::Unban,
+        ActionTypes::Mute => ActionTypes::Unmute,
+        _ => continue // Skip if not a timed action
+      };
+
+      if let Some(duration) = event.duration {
+        let duration = Duration::from_secs(duration as u64);
+        if now > duration {
+          Moderations::update_case(
+            event.guild_id,
+            event.case_id,
+            false,
+            None
+          ).await?;
+          Moderations::generate_modlog(Moderations::create_case(
+            event.guild_id,
+            check_action_type,
+            false,
+            event.user_id,
+            event.user_tag.clone(),
+            format!("Duration for Case #{} has expired", event.case_id),
+            bot_.id.into(),
+            bot_.tag(),
+            SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs() as i64,
+            None
+          ).await?, &discord_.http, 865673694184996888).await?;
+
+          match check_action_type {
+            ActionTypes::Unban => {
+              let guild_id = GuildId::new(event.guild_id as u64);
+              let user_id = UserId::new(event.user_id as u64);
+              discord_.http.remove_ban(guild_id, user_id, Some(format!("Duration for Case #{} has expired", event.case_id).as_str())).await?;
+            },
+            _ => {}
+          }
+
+          let guild_id = GuildId::new(event.guild_id as u64);
+          let cached_guild_data = discord_.cache.guild(guild_id);
+
+          println!("ModerationTimer[CaseExpired]: {}:#{}:{}:{}", cached_guild_data.unwrap().name.to_owned(), event.case_id, event.user_tag, event.reason)
+        }
+      }
+    }
+  }
+}

src/internals/config.rs

@@ -1,53 +0,0 @@
-use std::sync::LazyLock;
-
-pub struct ConfigMeta {
-  pub embed_color: i32,
-  pub ready_notify: u64,
-  pub rss_channel: u64,
-  pub kon_logs: u64,
-  pub developers: Vec<u64>
-}
-
-#[cfg(feature = "production")]
-pub static BINARY_PROPERTIES: LazyLock<ConfigMeta> = LazyLock::new(ConfigMeta::new);
-
-#[cfg(not(feature = "production"))]
-pub static BINARY_PROPERTIES: LazyLock<ConfigMeta> = LazyLock::new(||
-  ConfigMeta::new()
-    .embed_color(0xf1d63c)
-    .ready_notify(865673694184996888)
-    .rss_channel(865673694184996888)
-);
-
-impl ConfigMeta {
-  fn new() -> Self {
-    Self {
-      embed_color: 0x5a99c7,
-      ready_notify: 865673694184996888,
-      rss_channel: 865673694184996888,
-      kon_logs: 1268493237912604672,
-      developers: vec![
-        190407856527376384 // toast.ts
-      ]
-    }
-  }
-
-  // Scalable functions below;
-  #[cfg(not(feature = "production"))]
-  fn embed_color(mut self, color: i32) -> Self {
-    self.embed_color = color;
-    self
-  }
-
-  #[cfg(not(feature = "production"))]
-  fn ready_notify(mut self, channel_id: u64) -> Self {
-    self.ready_notify = channel_id;
-    self
-  }
-
-  #[cfg(not(feature = "production"))]
-  fn rss_channel(mut self, channel_id: u64) -> Self {
-    self.rss_channel = channel_id;
-    self
-  }
-}

src/internals/http.rs

@@ -1,39 +1,30 @@
-use std::time::Duration;
+use std::sync::Arc;
+use once_cell::sync::Lazy;
 use reqwest::{
   Client,
-  Response,
+  header::USER_AGENT
-  Error
 };
 
-const ERROR_PREFIX: &str = "HTTPClient[Error]:";
+static CUSTOM_USER_AGENT: Lazy<String> = Lazy::new(||
+  format!("Kon/{}/Rust", super::utils::BOT_VERSION.as_str())
+);
 
-pub struct HttpClient(Client);
+pub struct HttpClient {
+  client: Arc<Client>
+}
 
 impl HttpClient {
   pub fn new() -> Self {
-    Self(Client::new())
+    Self {
+      client: Arc::new(Client::new())
+    }
   }
 
-  pub async fn get(&self, url: &str, ua: &str) -> Result<Response, Error> {
+  pub async fn get(&self, url: &str) -> Result<reqwest::Response, reqwest::Error> {
-    let response = self.0.get(url).header(
+    let req = self.client.get(url)
-        reqwest::header::USER_AGENT,
+      .header(USER_AGENT, CUSTOM_USER_AGENT.as_str())
-        format!("Kon ({}-{}) - {}/reqwest", super::utils::BOT_VERSION.as_str(), crate::GIT_COMMIT_HASH, ua)
-      )
-      .timeout(Duration::from_secs(30))
       .send()
-      .await;
+      .await?;
-
+    Ok(req)
-    match response {
-      Ok(res) => Ok(res),
-      Err(y) if y.is_timeout() => {
-        eprintln!("{ERROR_PREFIX} Request timed out for \"{}\"", url);
-        Err(y)
-      },
-      Err(y) if y.is_connect() => {
-        eprintln!("{ERROR_PREFIX} Connection failed for \"{}\"", url);
-        Err(y)
-      },
-      Err(y) => Err(y)
-    }
   }
 }

src/internals/mod.rs

@@ -1,5 +1,3 @@
-pub mod config;
-pub mod http;
-pub mod tasks;
-pub mod tsclient;
 pub mod utils;
+pub mod http;
+pub mod tsclient;

src/internals/tasks.rs

@@ -1,47 +0,0 @@
-mod rss;
-
-pub use rss::rss;
-
-use tokio::task::spawn;
-use poise::serenity_prelude::Context;
-use std::{
-  sync::{
-    Arc,
-    atomic::{
-      AtomicBool,
-      Ordering
-    }
-  },
-  future::Future
-};
-
-fn task_info(name: &str, message: &str) {
-  println!("TaskScheduler[{}]: {}", name, message)
-}
-
-fn task_err(name: &str, message: &str) {
-  eprintln!("TaskScheduler[{}:Error]: {}", name, message)
-}
-
-static TASK_RUNNING: AtomicBool = AtomicBool::new(false);
-
-pub async fn run_task<F, T>(ctx: Arc<Context>, task: F)
-where
-  F: Fn(Arc<Context>) -> T + Send + 'static,
-  T: Future<Output = Result<(), crate::Error>> + Send + 'static
-{
-  let ctx_cl = Arc::clone(&ctx);
-
-  if !TASK_RUNNING.load(Ordering::SeqCst) {
-    TASK_RUNNING.store(true, Ordering::SeqCst);
-    spawn(async move {
-      if let Err(y) = task(ctx_cl).await {
-        eprintln!("TaskScheduler[Main:Error]: Failed to execute the task, error reason: {}", y);
-        if let Some(source) = y.source() {
-          eprintln!("TaskScheduler[Main:Error]: Failed to execute the task, this is caused by: {:#?}", source);
-        }
-      }
-      TASK_RUNNING.store(false, Ordering::SeqCst);
-    });
-  }
-}

src/internals/tasks/rss.rs

@@ -1,161 +0,0 @@
-mod processor; // Process the feeds and send it off to Discord
-
-mod esxi;
-mod github;
-mod gportal;
-mod rust;
-
-use crate::{
-  Error,
-  controllers::cache::RedisController
-};
-use super::{
-  super::{
-    http::HttpClient,
-    config::BINARY_PROPERTIES
-  },
-  task_info,
-  task_err
-};
-
-use once_cell::sync::OnceCell;
-use feed_rs::parser::parse;
-use reqwest::Response;
-use regex::Regex;
-use std::sync::Arc;
-use poise::serenity_prelude::{
-  Context,
-  CreateEmbed,
-  Timestamp
-};
-use tokio::time::{
-  Duration,
-  interval
-};
-
-const TASK_NAME: &str = "RSS";
-static REDIS_EXPIRY_SECS: i64 = 7200;
-static REDIS_SERVICE: OnceCell<Arc<RedisController>> = OnceCell::new();
-
-async fn redis_() {
-  let redis = RedisController::new().await.unwrap();
-  REDIS_SERVICE.set(Arc::new(redis)).unwrap();
-}
-
-async fn get_redis() -> Arc<RedisController> {
-  if REDIS_SERVICE.get().is_none() {
-    redis_().await;
-  }
-  REDIS_SERVICE.get().unwrap().clone()
-}
-
-fn format_href_to_discord(input: &str) -> String {
-  let re = Regex::new(r#"<a href="([^"]+)">([^<]+)</a>"#).unwrap();
-  re.replace_all(input, r"[$2]($1)").to_string()
-}
-
-fn format_html_to_discord(input: String) -> String {
-  let mut output = input;
-
-  // Replace all instances of <p> and </p> with newlines
-  output = Regex::new(r#"</?\s*p\s*>"#).unwrap().replace_all(&output, "\n").to_string();
-
-  // Replace all instances of <br> and <br /> with newlines
-  output = Regex::new(r#"<\s*br\s*/?\s*>"#).unwrap().replace_all(&output, "\n").to_string();
-
-  // Replace all instances of <strong> with **
-  output = Regex::new(r#"</?\s*strong\s*>"#).unwrap().replace_all(&output, "**").to_string();
-
-  // Replace all instances of <var> and <small> with nothing
-  output = Regex::new(r#"</?\s*(var|small)\s*>"#).unwrap().replace_all(&output, "").to_string();
-
-  // Remove any other HTML tags
-  output = Regex::new(r#"<[^>]+>"#).unwrap().replace_all(&output, "").to_string();
-
-  // Replace all instances of <a href="url">text</a> with [text](url)
-  output = format_href_to_discord(&output);
-
-  output
-}
-
-async fn fetch_feed(url: &str) -> Result<Response, Error> {
-  let http = HttpClient::new();
-  let res = match http.get(url, "RSS-Monitor").await {
-    Ok(res) => res,
-    Err(y) => return Err(y.into())
-  };
-
-  Ok(res)
-}
-
-async fn save_to_redis(key: &str, value: &str) -> Result<(), Error> {
-  let redis = get_redis().await;
-  redis.set(key, value).await.unwrap();
-  if let Err(y) = redis.expire(key, REDIS_EXPIRY_SECS).await {
-    task_err("RSS", format!("[RedisExpiry]: {}", y).as_str());
-  }
-  Ok(())
-}
-
-fn embed(
-  color: u32,
-  title: String,
-  url: String,
-  description: String,
-  timestamp: Timestamp
-) -> CreateEmbed {
-  CreateEmbed::new()
-    .color(color)
-    .title(title)
-    .url(url)
-    .description(description)
-    .timestamp(timestamp)
-}
-
-const MAX_CONTENT_LENGTH: usize = 4000;
-fn trim_old_content(s: &str) -> String {
-  if s.len() > MAX_CONTENT_LENGTH {
-    s[..MAX_CONTENT_LENGTH].to_string()
-  } else {
-    s.to_string()
-  }
-}
-
-enum IncidentColorMap {
-  Update,
-  Investigating,
-  Monitoring,
-  Resolved,
-  Default
-}
-
-impl IncidentColorMap {
-  fn color(&self) -> u32 {
-    match self {
-      Self::Update => 0xABDD9E, // Madang
-      Self::Investigating => 0xA5CCE0, // French Pass
-      Self::Monitoring => 0x81CBAD, // Monte Carlo
-      Self::Resolved => 0x57F287, // Emerald
-      Self::Default => 0x81CBAD // Monte Carlo
-    }
-  }
-}
-
-pub async fn rss(ctx: Arc<Context>) -> Result<(), Error> {
-  #[cfg(feature = "production")]
-  let mut interval = interval(Duration::from_secs(300)); // Check feeds every 5 mins
-  #[cfg(not(feature = "production"))]
-  let mut interval = interval(Duration::from_secs(30)); // Check feeds every 30 secs
-  let mut first_run = true;
-  task_info(TASK_NAME, "Task loaded!");
-
-  loop {
-    interval.tick().await;
-
-    if first_run {
-      task_info(&format!("{TASK_NAME}:Processor"), "Starting up!");
-      first_run = false;
-    }
-    processor::feed_processor(&ctx).await;
-  }
-}

src/internals/tasks/rss/esxi.rs

@@ -1,79 +0,0 @@
-use crate::Error;
-use super::{
-  super::task_err,
-  REDIS_EXPIRY_SECS,
-  get_redis,
-  save_to_redis,
-  fetch_feed,
-  parse,
-  format_href_to_discord
-};
-
-use std::io::Cursor;
-use regex::Regex;
-use poise::serenity_prelude::{
-  CreateEmbed,
-  CreateEmbedAuthor,
-  Timestamp
-};
-
-pub async fn esxi_embed() -> Result<Option<CreateEmbed>, Error> {
-  let redis = get_redis().await;
-  let rkey = "RSS_ESXi";
-  let url = "https://esxi-patches.v-front.de/atom/ESXi-7.0.0.xml";
-
-  let res = fetch_feed(url).await?;
-  let data = res.text().await?;
-  let cursor = Cursor::new(data);
-
-  let feed = parse(cursor).unwrap();
-  let home_page = feed.links[0].clone().href;
-  let article = feed.entries[0].clone();
-
-  fn get_patch_version(input: &str) -> Option<String> {
-    let re = Regex::new(r#"(?i)Update\s+([0-9]+)([a-z]?)"#).unwrap();
-
-    if let Some(caps) = re.captures(input) {
-      let update_num = caps[1].to_string();
-      let letter = caps.get(2).map_or("", |m| m.as_str());
-      Some(format!("Update {}{}", update_num, letter))
-    } else {
-      None
-    }
-  }
-
-  let cached_patch = redis.get(rkey).await.unwrap().unwrap_or_default();
-
-  if cached_patch.is_empty() {
-    redis.set(rkey, &article.categories[3].term).await.unwrap();
-    if let Err(y) = redis.expire(rkey, REDIS_EXPIRY_SECS).await {
-      task_err("RSS", format!("[RedisExpiry]: {}", y).as_str());
-    }
-    return Ok(None);
-  }
-
-  if let Some(patch) = get_patch_version(&article.categories[3].term) {
-    if patch == cached_patch {
-      Ok(None)
-    } else {
-      save_to_redis(rkey, &article.categories[3].term).await?;
-      Ok(Some(CreateEmbed::new()
-        .color(0x4EFBCB)
-        .author(CreateEmbedAuthor::new(feed.title.unwrap().content).url(home_page))
-        .thumbnail(feed.logo.unwrap().uri)
-        .description(format!(
-          "{} {} for {} {} has been rolled out!\n{}",
-          article.categories[2].term,
-          article.categories[3].term,
-          article.categories[0].term,
-          article.categories[1].term,
-          format_href_to_discord(article.summary.unwrap().content.as_str())
-        ))
-        .timestamp(Timestamp::from(article.updated.unwrap())))
-      )
-    }
-  } else {
-    task_err("RSS:ESXi", &format!("Article term does not match the expected RegEx pattern! ({})", article.categories[3].term.as_str()));
-    Ok(None)
-  }
-}

src/internals/tasks/rss/github.rs

@@ -1,102 +0,0 @@
-use crate::Error;
-use super::{
-  super::task_err,
-  REDIS_EXPIRY_SECS,
-  IncidentColorMap,
-  get_redis,
-  save_to_redis,
-  fetch_feed,
-  parse,
-  embed,
-  trim_old_content,
-  format_html_to_discord
-};
-
-use std::io::Cursor;
-use regex::Regex;
-use poise::serenity_prelude::{
-  CreateEmbed,
-  Timestamp
-};
-
-pub async fn github_embed() -> Result<Option<CreateEmbed>, Error> {
-  let redis = get_redis().await;
-  let rkey = "RSS_GitHub";
-  let rkey_content = format!("{}_Content", rkey);
-  let url = "https://www.githubstatus.com/history.atom";
-
-  let res = fetch_feed(url).await?;
-  let data = res.text().await?;
-  let cursor = Cursor::new(data);
-
-  let feed = parse(cursor).unwrap();
-  let incident_page = feed.entries[0].links[0].clone().href;
-  let article = feed.entries[0].clone();
-
-  fn get_incident_id(input: &str) -> Option<String> {
-    let re = Regex::new(r#"/incidents/([a-zA-Z0-9]+)$"#).unwrap();
-
-    re.captures(input).map(|caps| caps[1].to_string())
-  }
-
-  let cached_incident = redis.get(rkey).await.unwrap().unwrap_or_default();
-  let new_content = format_html_to_discord(article.content.unwrap().body.unwrap());
-
-  let update_patt = Regex::new(r"(?i)\bupdate\b").unwrap();
-  let investigating_patt = Regex::new(r"(?i)\binvestigating\b").unwrap();
-  let resolved_patt = Regex::new(r"(?i)\bresolved\b").unwrap();
-  let date_patt = Regex::new(r"\b[A-Z][a-z]{2} \d{2}, \d{2}:\d{2} UTC\b").unwrap();
-
-  let first_entry = date_patt.split(&new_content).map(str::trim).find(|e| !e.is_empty()).unwrap_or(&new_content);
-
-  let color: u32 = if update_patt.is_match(first_entry) {
-    IncidentColorMap::Update.color()
-  } else if investigating_patt.is_match(first_entry) {
-    IncidentColorMap::Investigating.color()
-  } else if resolved_patt.is_match(first_entry) {
-    IncidentColorMap::Resolved.color()
-  } else {
-    IncidentColorMap::Default.color()
-  };
-
-  if cached_incident.is_empty() {
-    redis.set(rkey, &get_incident_id(&article.links[0].href).unwrap()).await.unwrap();
-    redis.set(&rkey_content, &new_content).await.unwrap();
-    if let Err(y) = redis.expire(rkey, REDIS_EXPIRY_SECS).await {
-      task_err("RSS", format!("[RedisExpiry]: {}", y).as_str());
-    }
-    return Ok(None);
-  }
-
-  if let Some(incident) = get_incident_id(&article.links[0].href) {
-    if incident == cached_incident {
-      let cached_content: String = redis.get(&rkey_content).await.unwrap().unwrap_or_default();
-      if cached_content == new_content {
-        Ok(None)
-      } else {
-        redis.set(&rkey_content, &new_content).await.unwrap();
-        redis.expire(&rkey_content, 21600).await.unwrap();
-        Ok(Some(embed(
-          color,
-          article.title.unwrap().content,
-          incident_page,
-          trim_old_content(&new_content),
-          Timestamp::from(article.updated.unwrap())
-        )))
-      }
-    } else {
-      save_to_redis(rkey, &incident).await?;
-      redis.set(&rkey_content, &new_content).await.unwrap();
-      Ok(Some(embed(
-        color,
-        article.title.unwrap().content,
-        incident_page,
-        trim_old_content(&new_content),
-        Timestamp::from(article.updated.unwrap())
-      )))
-    }
-  } else {
-    task_err("RSS:GitHub", &format!("Incident ID does not match the expected RegEx pattern! ({})", &article.links[0].href));
-    Ok(None)
-  }
-}

src/internals/tasks/rss/gportal.rs

@@ -1,105 +0,0 @@
-use crate::Error;
-use super::{
-  super::task_err,
-  REDIS_EXPIRY_SECS,
-  IncidentColorMap,
-  get_redis,
-  save_to_redis,
-  fetch_feed,
-  parse,
-  embed,
-  trim_old_content,
-  format_html_to_discord
-};
-
-use std::io::Cursor;
-use regex::Regex;
-use poise::serenity_prelude::{
-  CreateEmbed,
-  Timestamp
-};
-
-pub async fn gportal_embed() -> Result<Option<CreateEmbed>, Error> {
-  let redis = get_redis().await;
-  let rkey = "RSS_GPortal";
-  let rkey_content = format!("{}_Content", rkey);
-  let url = "https://status.g-portal.com/history.atom";
-
-  let res = fetch_feed(url).await?;
-  let data = res.text().await?;
-  let cursor = Cursor::new(data);
-
-  let feed = parse(cursor).unwrap();
-  let incident_page = feed.links[0].clone().href;
-  let article = feed.entries[0].clone();
-
-  fn get_incident_id(input: &str) -> Option<String> {
-    let re = Regex::new(r#"/incidents/([a-zA-Z0-9]+)$"#).unwrap();
-
-    re.captures(input).map(|caps| caps[1].to_string())
-  }
-
-  let cached_incident = redis.get(rkey).await.unwrap().unwrap_or_default();
-  let new_content = format_html_to_discord(article.content.unwrap().body.unwrap());
-
-  let update_patt = Regex::new(r"(?i)\bupdate\b").unwrap();
-  let investigating_patt = Regex::new(r"(?i)\binvestigating\b").unwrap();
-  let monitoring_patt = Regex::new(r"(?i)\bmonitoring\b").unwrap();
-  let resolved_patt = Regex::new(r"(?i)\bresolved\b").unwrap();
-  let date_patt = Regex::new(r"\b[A-Z][a-z]{2} \d{2}, \d{2}:\d{2} UTC\b").unwrap();
-
-  let first_entry = date_patt.split(&new_content).map(str::trim).find(|e| !e.is_empty()).unwrap_or(&new_content);
-
-  let color: u32 = if update_patt.is_match(first_entry) {
-    IncidentColorMap::Update.color()
-  } else if investigating_patt.is_match(first_entry) {
-    IncidentColorMap::Investigating.color()
-  } else if monitoring_patt.is_match(first_entry) {
-    IncidentColorMap::Monitoring.color()
-  } else if resolved_patt.is_match(first_entry) {
-    IncidentColorMap::Resolved.color()
-  } else {
-    IncidentColorMap::Default.color()
-  };
-
-  if cached_incident.is_empty() {
-    redis.set(rkey, &get_incident_id(&article.links[0].href).unwrap()).await.unwrap();
-    redis.set(&rkey_content, &new_content).await.unwrap();
-    if let Err(y) = redis.expire(rkey, REDIS_EXPIRY_SECS).await {
-      task_err("RSS", format!("[RedisExpiry]: {}", y).as_str());
-    }
-    return Ok(None);
-  }
-
-  if let Some(incident) = get_incident_id(&article.links[0].href) {
-    if incident == cached_incident {
-      let cached_content: String = redis.get(&rkey_content).await.unwrap().unwrap_or_default();
-      if cached_content == new_content {
-        Ok(None)
-      } else {
-        redis.set(&rkey_content, &new_content).await.unwrap();
-        redis.expire(&rkey_content, 21600).await.unwrap();
-        Ok(Some(embed(
-          color,
-          article.title.unwrap().content,
-          incident_page,
-          trim_old_content(&new_content),
-          Timestamp::from(article.updated.unwrap())
-        )))
-      }
-    } else {
-      save_to_redis(rkey, &incident).await?;
-      redis.set(&rkey_content, &new_content).await.unwrap();
-      Ok(Some(embed(
-        color,
-        article.title.unwrap().content,
-        incident_page,
-        trim_old_content(&new_content),
-        Timestamp::from(article.updated.unwrap())
-      )))
-    }
-  } else {
-    task_err("RSS:GPortal", &format!("Incident ID does not match the expected RegEx pattern! ({})", &article.links[0].href));
-    Ok(None)
-  }
-}

src/internals/tasks/rss/processor.rs

@@ -1,120 +0,0 @@
-use super::{
-  task_err,
-  TASK_NAME,
-  BINARY_PROPERTIES,
-  get_redis,
-  esxi::esxi_embed,
-  github::github_embed,
-  gportal::gportal_embed,
-  rust::rust_message
-};
-
-use regex::Regex;
-use tokio::time::{
-  Duration,
-  sleep
-};
-use poise::serenity_prelude::{
-  Context,
-  ChannelId,
-  EditMessage,
-  CreateMessage,
-  CreateEmbed,
-};
-
-  //  This is for building up the embed with the feed data
-  /* std::fs::File::create("rss_name.log").unwrap();
-  std::fs::write("rss_name.log", format!("{:#?}", feed))?; */
-
-// todo; have a reusable function for feeding RSS data and building the embed out of it.
-//       see github.rs / esxi.rs / gportal.rs for references of this idea.
-
-
-async fn process_embed(
-  ctx: &Context,
-  embed: Option<CreateEmbed>,
-  redis_key: &str,
-  content_key: &str
-) -> Result<(), crate::Error> {
-  if let Some(embed) = embed {
-    let redis = get_redis().await;
-    let channel = ChannelId::new(BINARY_PROPERTIES.rss_channel);
-
-    let msg_id_key: Option<String> = redis.get(redis_key).await?;
-    let cached_content: Option<String> = redis.get(content_key).await.unwrap_or(None);
-
-    if let Some(msg_id_key) = msg_id_key {
-      if let Ok(msg_id) = msg_id_key.parse::<u64>() {
-        if let Ok(mut message) = channel.message(&ctx.http, msg_id).await {
-          let new_description = message.embeds[0].description.clone().unwrap();
-
-          if cached_content.as_deref() != Some(&new_description) {
-            message.edit(&ctx.http, EditMessage::new().embed(embed)).await?;
-          }
-
-          sleep(Duration::from_secs(15)).await;
-
-          if Regex::new(r"(?i)\bresolved\b").unwrap().is_match(&new_description) {
-            redis.del(redis_key).await?;
-          }
-        }
-      }
-    } else {
-      let message = channel.send_message(&ctx.http, CreateMessage::new().add_embed(embed)).await?;
-      redis.set(redis_key, &message.id.to_string()).await?;
-      redis.expire(redis_key, 36000).await?;
-    }
-  }
-
-  Ok(())
-}
-
-pub async fn feed_processor(ctx: &Context) {
-  let mut log_msgs: Vec<String> = Vec::new();
-
-  match esxi_embed().await {
-    Ok(Some(embed)) => {
-      ChannelId::new(BINARY_PROPERTIES.rss_channel).send_message(&ctx.http, CreateMessage::new().add_embed(embed)).await.unwrap();
-    },
-    Ok(None) => (),
-    Err(y) => {
-      log_msgs.push(format!("**[{TASK_NAME}:ESXi:Error]:** Feed failed with the following error:```\n{}\n```", y));
-      task_err(TASK_NAME, &y.to_string())
-    }
-  }
-
-  match gportal_embed().await {
-    Ok(Some(embed)) => process_embed(ctx, Some(embed), "RSS_GPortal_MsgID", "RSS_GPortal_Content").await.unwrap(),
-    Ok(None) => (),
-    Err(y) => {
-      log_msgs.push(format!("**[{TASK_NAME}:GPortal:Error]:** Feed failed with the following error:```\n{}\n```", y));
-      task_err(TASK_NAME, &y.to_string())
-    }
-  }
-
-  match github_embed().await {
-    Ok(Some(embed)) => process_embed(ctx, Some(embed), "RSS_GitHub_MsgID", "RSS_GitHub_Content").await.unwrap(),
-    Ok(None) => (),
-    Err(y) => {
-      log_msgs.push(format!("**[{TASK_NAME}:GitHub:Error]:** Feed failed with the following error:```\n{}\n```", y));
-      task_err(TASK_NAME, &y.to_string())
-    }
-  }
-
-  match rust_message().await {
-    Ok(Some(content)) => {
-      ChannelId::new(BINARY_PROPERTIES.rss_channel).send_message(&ctx.http, CreateMessage::new().content(content)).await.unwrap();
-    },
-    Ok(None) => (),
-    Err(y) => {
-      log_msgs.push(format!("**[{TASK_NAME}:RustBlog:Error]:** Feed failed with the following error:```\n{}\n```", y));
-      task_err(TASK_NAME, &y.to_string())
-    }
-  }
-
-  if !log_msgs.is_empty() {
-    ChannelId::new(BINARY_PROPERTIES.kon_logs).send_message(
-      &ctx.http, CreateMessage::new().content(log_msgs.join("\n"))
-    ).await.unwrap();
-  }
-}

src/internals/tasks/rss/rust.rs

@@ -1,53 +0,0 @@
-use crate::Error;
-use super::{
-  task_err,
-  REDIS_EXPIRY_SECS,
-  get_redis,
-  save_to_redis,
-  fetch_feed,
-  parse
-};
-
-use std::io::Cursor;
-use regex::Regex;
-
-pub async fn rust_message() -> Result<Option<String>, Error> {
-  let redis = get_redis().await;
-  let rkey = "RSS_RustBlog";
-  let url = "https://blog.rust-lang.org/feed.xml";
-
-  let res = fetch_feed(url).await?;
-  let data = res.text().await?;
-  let cursor = Cursor::new(data);
-
-  let feed = parse(cursor).unwrap();
-  let article = feed.entries[0].clone();
-  let article_id = article.id.clone();
-
-  fn get_blog_title(input: String) -> Option<String> {
-    let re = Regex::new(r"https://blog\.rust-lang\.org/(\d{4}/\d{2}/\d{2}/[^/]+)").unwrap();
-    re.captures(input.as_str()).and_then(|caps| caps.get(1).map(|m| m.as_str().to_string()))
-  }
-
-  let cached_blog = redis.get(rkey).await.unwrap().unwrap_or_default();
-
-  if cached_blog.is_empty() {
-    redis.set(rkey, get_blog_title(article.id).unwrap().as_str()).await.unwrap();
-    if let Err(y) = redis.expire(rkey, REDIS_EXPIRY_SECS).await {
-      task_err("RSS", format!("[RedisExpiry]: {}", y).as_str());
-    }
-    return Ok(None);
-  }
-
-  if let Some(blog) = get_blog_title(article.id) {
-    if blog == cached_blog {
-      Ok(None)
-    } else {
-      save_to_redis(rkey, &blog).await?;
-      Ok(Some(format!("Rust Team has put out a new article!\n**[{}](<{}>)**", article.links[0].title.clone().unwrap(), article.links[0].href)))
-    }
-  } else {
-    task_err("RSS:RustBlog", &format!("Article URL does not match the expected RegEx pattern! ({})", article_id));
-    Ok(None)
-  }
-}

src/internals/tsclient.rs

@@ -1,23 +1,19 @@
-use tokenservice_client::{
+use tokenservice_client::{TokenService, TokenServiceApi};
-  TokenService,
-  TokenServiceApi
-};
 
-pub struct TSClient(TokenService);
+pub struct TSClient {
+  client: TokenService
+}
 
 impl TSClient {
   pub fn new() -> Self {
     let args: Vec<String> = std::env::args().collect();
-    let service = if args.len() > 1 { &args[1] } else { "kon" };
+    let service = if args.len() > 1 { args[1].as_str() } else { "kon" };
-    Self(TokenService::new(service))
+    TSClient {
+      client: TokenService::new(service)
     }
-
+  }
-  pub async fn get(&self) -> Result<TokenServiceApi, crate::Error> {
+  pub async fn get(&self) -> Result<TokenServiceApi, Box<dyn std::error::Error>> {
-    match self.0.connect().await {
+    let api = self.client.connect().await.unwrap();
-      Ok(api) => {
     Ok(api)
   }
-      Err(e) => Err(e)
-    }
-  }
 }

src/internals/utils.rs

@@ -1,41 +1,27 @@
-use poise::serenity_prelude::UserId;
+use once_cell::sync::Lazy;
-use std::sync::LazyLock;
-use tokio::sync::Mutex;
 use tokenservice_client::TokenServiceApi;
-use super::tsclient::TSClient;
 
-pub static BOT_VERSION: LazyLock<String> = LazyLock::new(|| {
+pub static EMBED_COLOR: i32 = 0x5a99c7;
-  let cargo_version = cargo_toml::Manifest::from_str(include_str!("../../Cargo.toml"))
+
-    .unwrap()
+pub static BOT_VERSION: Lazy<String> = Lazy::new(|| {
-    .package
+  let cargo_version = cargo_toml::Manifest::from_path("Cargo.toml").unwrap().package.unwrap().version.unwrap();
-    .unwrap()
-    .version
-    .unwrap();
   format!("v{}", cargo_version)
 });
 
-static TSCLIENT: LazyLock<Mutex<TSClient>> = LazyLock::new(|| Mutex::new(TSClient::new()));
-
 pub async fn token_path() -> TokenServiceApi {
-  TSCLIENT.lock().await.get().await.unwrap()
+  let client = super::tsclient::TSClient::new().get().await.unwrap();
+  client
 }
 
-pub fn mention_dev(ctx: poise::Context<'_, (), crate::Error>) -> Option<String> {
+pub fn concat_message(messages: Vec<String>) -> String {
-  let devs = super::config::BINARY_PROPERTIES.developers.clone();
+  messages.join("\n")
-  let app_owners = ctx.framework().options().owners.clone();
-
-  let mut mentions = Vec::new();
-
-  for dev in devs {
-    if app_owners.contains(&UserId::new(dev)) {
-      mentions.push(format!("<@{}>", dev));
-    }
 }
 
-  if mentions.is_empty() {
+pub fn capitalize_first(s: &str) -> String {
-    None
+  let mut chars = s.chars();
-  } else {
+  match chars.next() {
-    Some(mentions.join(", "))
+    None => String::new(),
+    Some(f) => f.to_uppercase().collect::<String>() + chars.as_str(),
   }
 }
 
@@ -59,24 +45,3 @@ pub fn format_duration(secs: u64) -> String {
 
   formatted_string
 }
-
-pub fn format_bytes(bytes: u64) -> String {
-  let units = ["B", "KB", "MB", "GB", "TB", "PB"];
-  let mut value = bytes as f64;
-  let mut unit = units[0];
-
-  for &u in &units[1..] {
-    if value < 1024.0 {
-      break;
-    }
-
-    value /= 1024.0;
-    unit = u;
-  }
-
-  if unit == "B" {
-    format!("{}{}", value, unit)
-  } else {
-    format!("{:.2}{}", value, unit)
-  }
-}

src/main.rs

@@ -1,88 +1,56 @@
 mod commands;
 mod controllers;
+mod models;
 mod internals;
-// https://cdn.toast-server.net/RustFSHiearchy.png
-// Using the new filesystem hierarchy
 
-use crate::internals::{
-  utils::{
-    BOT_VERSION,
-    token_path,
-    mention_dev
-  },
-  tasks::{
-    run_task,
-    rss
-  },
-  config::BINARY_PROPERTIES
-};
-
-use std::{
-  sync::Arc,
-  thread::current
-};
 use poise::serenity_prelude::{
   builder::{
     CreateMessage,
     CreateEmbed,
     CreateEmbedAuthor
   },
-  Ready,
   Context,
-  FullEvent,
+  Ready,
   ClientBuilder,
   ChannelId,
+  Command,
   GatewayIntents
 };
 
 type Error = Box<dyn std::error::Error + Send + Sync>;
 
-#[cfg(feature = "production")]
+static BOT_READY_NOTIFY: u64 = 865673694184996888;
-pub static GIT_COMMIT_HASH: &str = env!("GIT_COMMIT_HASH");
-pub static GIT_COMMIT_BRANCH: &str = env!("GIT_COMMIT_BRANCH");
 
-#[cfg(not(feature = "production"))]
+static CAN_DEPLOY_COMMANDS: bool = false;
-pub static GIT_COMMIT_HASH: &str = "devel";
 
 async fn on_ready(
   ctx: &Context,
   ready: &Ready,
-  _framework: &poise::Framework<(), Error>
+  framework: &poise::Framework<(), Error>
 ) -> Result<(), Error> {
-  #[cfg(not(feature = "production"))]
+  println!("Connected to API as {}", ready.user.name);
-  {
-    println!("Event[Ready][Notice]: Detected a non-production environment!");
-    let gateway = ctx.http.get_bot_gateway().await?;
-    let session = gateway.session_start_limit;
-    println!("Event[Ready][Notice]: Session limit: {}/{}", session.remaining, session.total);
-  }
 
-  println!("Event[Ready]: Build version: {} ({}:{})", *BOT_VERSION, GIT_COMMIT_HASH, GIT_COMMIT_BRANCH);
+  controllers::timers::start_timers(&ctx, ready.user.to_owned()).await.expect("Failed to start timers");
-  println!("Event[Ready]: Connected to API as {}", ready.user.name);
 
   let message = CreateMessage::new();
   let ready_embed = CreateEmbed::new()
-    .color(BINARY_PROPERTIES.embed_color)
+    .color(internals::utils::EMBED_COLOR)
     .thumbnail(ready.user.avatar_url().unwrap_or_default())
-    .author(CreateEmbedAuthor::new(format!("{} is ready!", ready.user.name)));
+    .author(CreateEmbedAuthor::new(format!("{} is ready!", ready.user.name)).clone());
 
-  ChannelId::new(BINARY_PROPERTIES.ready_notify).send_message(&ctx.http, message.add_embed(ready_embed)).await?;
+  ChannelId::new(BOT_READY_NOTIFY).send_message(&ctx.http, message.add_embed(ready_embed)).await?;
 
-  Ok(())
+  if CAN_DEPLOY_COMMANDS {
+    let builder = poise::builtins::create_application_commands(&framework.options().commands);
+    let commands = Command::set_global_commands(&ctx.http, builder).await;
+
+    match commands {
+      Ok(cmdmap) => {
+        let command_box: Vec<_> = cmdmap.iter().map(|cmd| cmd.name.clone()).collect();
+        println!("Registered commands globally: {}", command_box.join("\n- "));
+      },
+      Err(why) => println!("Error registering commands: {:?}", why)
     }
-
-async fn event_processor(
-  ctx: &Context,
-  event: &FullEvent,
-  _framework: poise::FrameworkContext<'_, (), Error>
-) -> Result<(), Error> {
-  if let FullEvent::Ready { .. } = event {
-    let thread_id = format!("{:?}", current().id());
-    let thread_num: String = thread_id.chars().filter(|c| c.is_ascii_digit()).collect();
-    println!("Event[Ready]: Task Scheduler operating on thread {}", thread_num);
-
-    let ctx = Arc::new(ctx.clone());
-    run_task(ctx.clone(), rss).await;
   }
 
   Ok(())
@@ -90,67 +58,54 @@ async fn event_processor(
 
 #[tokio::main]
 async fn main() {
+  let db = controllers::database::DatabaseController::new().await.expect("Failed to connect to database");
+
   let framework = poise::Framework::builder()
     .options(poise::FrameworkOptions {
       commands: vec![
-        commands::deploy(),
-        commands::ilo::ilo(),
         commands::ping::ping(),
+        commands::uptime::uptime(),
         commands::status::status(),
-        commands::midi::midi_to_wav(),
+        commands::gameserver::gameserver(),
-        commands::uptime::uptime()
+        // Separator here to make it easier to read and update moderation stuff below
+        commands::moderation::case(),
+        commands::moderation::update(),
+        commands::moderation::ban(),
+        commands::moderation::kick(),
+        commands::moderation::mute(),
+        commands::moderation::warn(),
       ],
-      prefix_options: poise::PrefixFrameworkOptions {
-        prefix: Some(String::from("konata")),
-        mention_as_prefix: false,
-        case_insensitive_commands: true,
-        ignore_bots: true,
-        ignore_thread_creation: true,
-        ..Default::default()
-      },
       pre_command: |ctx| Box::pin(async move {
         let get_guild_name = match ctx.guild() {
           Some(guild) => guild.name.clone(),
-          None => String::from("Direct Message")
+          None => String::from("DM")
         };
-        println!("Discord[{}]: {} ran /{}", get_guild_name, ctx.author().name, ctx.command().qualified_name);
+        println!("[{}] {} ran /{}", get_guild_name, ctx.author().name, ctx.command().qualified_name)
       }),
       on_error: |error| Box::pin(async move {
         match error {
           poise::FrameworkError::Command { error, ctx, .. } => {
             println!("PoiseCommandError({}): {}", ctx.command().qualified_name, error);
-            ctx.reply(format!(
+          }
-              "Encountered an error during command execution, ask {} to check console for more details!",
-              mention_dev(ctx).unwrap_or_default()
-            )).await.expect("Error sending message");
-          },
-          poise::FrameworkError::EventHandler { error, event, .. } => println!("PoiseEventHandlerError({}): {}", event.snake_case_name(), error),
-          poise::FrameworkError::Setup { error, .. } => println!("PoiseSetupError: {}", error),
-          poise::FrameworkError::UnknownInteraction { interaction, .. } => println!(
-            "PoiseUnknownInteractionError: {} tried to execute an unknown interaction ({})",
-            interaction.user.name,
-            interaction.data.name
-          ),
           other => println!("PoiseOtherError: {}", other)
         }
       }),
       initialize_owners: true,
-      event_handler: |ctx, event, framework, _| Box::pin(event_processor(ctx, event, framework)),
       ..Default::default()
     })
     .setup(|ctx, ready, framework| Box::pin(on_ready(ctx, ready, framework)))
     .build();
 
-  let mut client = ClientBuilder::new(
+  let mut client = ClientBuilder::new(internals::utils::token_path().await.main, GatewayIntents::GUILDS)
-    token_path().await.main,
-    GatewayIntents::GUILDS
-    | GatewayIntents::GUILD_MESSAGES
-    | GatewayIntents::MESSAGE_CONTENT
-  )
     .framework(framework)
     .await.expect("Error creating client");
 
+  {
+    let mut data = client.data.write().await;
+    data.insert::<controllers::database::DatabaseController>(db);
+  }
+
   if let Err(why) = client.start().await {
-    println!("Error starting client: {:#?}", why);
+    println!("Client error: {:?}", why);
   }
 }

src/models/gameservers.rs

@@ -0,0 +1,103 @@
+use crate::controllers::database::DatabaseController;
+
+pub struct Gameservers {
+  pub server_name: String,
+  pub game_name: String,
+  pub guild_owner: i64,
+  pub ip_address: String
+}
+
+impl Gameservers {
+  pub async fn list_servers(guild_id: u64) -> Result<Vec<Self>, tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    let rows = client.query("
+      SELECT * FROM gameservers
+      WHERE guild_owner = $1
+    ", &[&(guild_id as i64)]).await?;
+
+    let mut servers = Vec::new();
+    for row in rows {
+      servers.push(Self {
+        server_name: row.get("server_name"),
+        game_name: row.get("game_name"),
+        guild_owner: row.get("guild_owner"),
+        ip_address: row.get("ip_address")
+      });
+    }
+
+    Ok(servers)
+  }
+
+  pub async fn add_server(
+    guild_id: u64,
+    server_name: &str,
+    game_name: &str,
+    ip_address: &str
+  ) -> Result<(), tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    client.execute("
+      INSERT INTO gameservers (server_name, game_name, guild_owner, ip_address)
+      VALUES ($1, $2, $3, $4)
+    ", &[&server_name, &game_name, &(guild_id as i64), &ip_address]).await?;
+
+    Ok(())
+  }
+
+  pub async fn remove_server(guild_id: u64, server_name: &str) -> Result<(), tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    client.execute("
+      DELETE FROM gameservers
+      WHERE guild_owner = $1 AND server_name = $2
+    ", &[&(guild_id as i64), &server_name]).await?;
+
+    Ok(())
+  }
+
+  pub async fn update_server(
+    guild_id: u64,
+    server_name: &str,
+    game_name: &str,
+    ip_address: &str
+  ) -> Result<(), tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    client.execute("
+      UPDATE gameservers
+      SET game_name = $1, ip_address = $2
+      WHERE guild_owner = $3 AND server_name = $4
+    ", &[&game_name, &ip_address, &(guild_id as i64), &server_name]).await?;
+
+    Ok(())
+  }
+
+  pub async fn get_server_names(guild_id: u64) -> Result<Vec<String>, tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    let rows = client.query("
+      SELECT server_name FROM gameservers
+      WHERE guild_owner = $1
+    ", &[&(guild_id as i64)]).await?;
+  
+    let mut servers = Vec::new();
+    for row in rows {
+      servers.push(row.get("server_name"));
+    }
+  
+    Ok(servers)
+  }
+
+  pub async fn get_server_data(guild_id: u64, server_name: &str) -> Result<Vec<String>, tokio_postgres::Error> {
+    let client = DatabaseController::new().await?.client;
+    let rows = client.query("
+      SELECT * FROM gameservers
+      WHERE guild_owner = $1 AND server_name = $2
+    ", &[&(guild_id as i64), &server_name]).await?;
+
+    let mut server = Vec::new();
+    for row in rows {
+      server.push(row.get("server_name"));
+      server.push(row.get("game_name"));
+      server.push(row.get("ip_address"))
+    }
+
+    Ok(server)
+  }
+}

src/models/mod.rs

@@ -0,0 +1,2 @@
+pub mod gameservers;
+pub mod moderation_events;

src/models/moderation_events.rs

@@ -0,0 +1,215 @@
+use crate::{
+  controllers::database::DatabaseController,
+  internals::utils::{
+    EMBED_COLOR,
+    capitalize_first
+  }
+};
+
+use poise::serenity_prelude::{
+  Http,
+  Error,
+  Timestamp,
+  ChannelId,
+  CreateMessage,
+  CreateEmbed
+};
+
+#[derive(Clone)]
+pub struct Moderations {
+  pub guild_id: i64,
+  pub case_id: i32,
+  pub action_type: ActionTypes,
+  pub is_active: bool,
+  pub user_id: i64,
+  pub user_tag: String,
+  pub reason: String,
+  pub moderator_id: i64,
+  pub moderator_tag: String,
+  pub time_created: i64,
+  pub duration: Option<i64>
+}
+
+#[derive(Clone, Copy)]
+pub enum ActionTypes {
+  Ban,
+  Kick,
+  Mute,
+  Warn,
+  Unban,
+  Unmute,
+  Unknown
+}
+
+impl ActionTypes {
+  pub fn as_str(&self) -> &'static str {
+    match *self {
+      ActionTypes::Ban => "ban",
+      ActionTypes::Kick => "kick",
+      ActionTypes::Mute => "mute",
+      ActionTypes::Warn => "warn",
+      ActionTypes::Unban => "unban",
+      ActionTypes::Unmute => "unmute",
+      ActionTypes::Unknown => "unknown"
+    }
+  }
+}
+
+impl Moderations {
+  pub async fn get_active_events() -> Result<Vec<Moderations>, tokio_postgres::Error> {
+    let _db = DatabaseController::new().await?.client;
+
+    _db.execute("BEGIN", &[]).await.expect("Failed to start transaction!");
+    let stmt = _db.prepare("
+      SELECT * FROM moderation_events
+      WHERE is_active = true
+      ORDER BY duration DESC, time_created DESC;
+    ").await?;
+
+    _db.execute("COMMIT", &[]).await.expect("Failed to commit transaction!");
+    let rows = _db.query(&stmt, &[]).await?;
+
+    let mut moderations = Vec::new();
+    for row in rows {
+      moderations.push(Moderations {
+        guild_id: row.get("guild_id"),
+        case_id: row.get("case_id"),
+        action_type: match row.get::<_, &str>("action_type") {
+          "ban" => ActionTypes::Ban,
+          "kick" => ActionTypes::Kick,
+          "mute" => ActionTypes::Mute,
+          "warn" => ActionTypes::Warn,
+          "unban" => ActionTypes::Unban,
+          "unmute" => ActionTypes::Unmute,
+          _ => ActionTypes::Unknown
+        },
+        is_active: row.get("is_active"),
+        user_id: row.get("user_id"),
+        user_tag: row.get("user_tag"),
+        reason: row.get("reason"),
+        moderator_id: row.get("moderator_id"),
+        moderator_tag: row.get("moderator_tag"),
+        time_created: row.get("time_created"),
+        duration: row.get("duration")
+      });
+    }
+
+    Ok(moderations)
+  }
+
+  pub async fn generate_modlog(case: Moderations, http: &Http, channel_id: u64) -> Result<(), Error> {
+    let time_created_formatted = Timestamp::from_unix_timestamp(case.time_created).expect(" Failed to format timestamp!");
+    let modlog_embed = CreateEmbed::default()
+      .color(EMBED_COLOR)
+      .title(format!("{} • Case #{}", capitalize_first(case.action_type.as_str()), case.case_id))
+      .fields(vec![
+        ("User", format!("{}\n<@{}>", case.user_tag, case.user_id), true),
+        ("Moderator", format!("{}\n<@{}>", case.moderator_tag, case.moderator_id), true),
+        ("\u{200B}", "\u{200B}".to_string(), true),
+        ("Reason", format!("`{}`", case.reason), false)
+      ])
+      .timestamp(time_created_formatted);
+
+    ChannelId::new(channel_id).send_message(http, CreateMessage::new().embed(modlog_embed)).await?;
+
+    Ok(())
+  }
+
+  pub async fn create_case(
+    guild_id: i64,
+    action_type: ActionTypes,
+    is_active: bool,
+    user_id: i64,
+    user_tag: String,
+    reason: String,
+    moderator_id: i64,
+    moderator_tag: String,
+    time_created: i64,
+    duration: Option<i64>
+  ) -> Result<Moderations, tokio_postgres::Error> {
+    let _db = DatabaseController::new().await?.client;
+
+    // Get the current max case_id for the guild
+    let stmt = _db.prepare("
+      SELECT max_case_id FROM guild_case_ids WHERE guild_id = $1;
+    ").await?;
+    let rows = _db.query(&stmt, &[&guild_id]).await?;
+    let mut max_case_id = if let Some(row) = rows.get(0) {
+      row.get::<_, i32>("max_case_id")
+    } else {
+      0
+    };
+
+    // Increment the max case_id for the guild
+    max_case_id += 1;
+    let stmt = _db.prepare("
+      INSERT INTO guild_case_ids (guild_id, max_case_id) VALUES ($1, $2)
+      ON CONFLICT (guild_id) DO UPDATE SET max_case_id = $2;
+    ").await?;
+    _db.execute(&stmt, &[&guild_id, &max_case_id]).await?;
+
+    // Create a new case in database and return the case_id
+    let stmt = _db.prepare("
+      INSERT INTO moderation_events (
+        guild_id, case_id, action_type, is_active, user_id, user_tag, reason, moderator_id, moderator_tag, time_created, duration
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+      RETURNING case_id;
+    ").await?;
+
+    let row = _db.query(&stmt, &[
+      &guild_id,
+      &max_case_id,
+      &action_type.as_str(),
+      &is_active,
+      &user_id,
+      &user_tag,
+      &reason,
+      &moderator_id,
+      &moderator_tag,
+      &time_created,
+      &duration
+    ]).await?;
+
+    let moderations = Moderations {
+      guild_id,
+      case_id: row[0].get("case_id"),
+      action_type,
+      is_active,
+      user_id,
+      user_tag,
+      reason,
+      moderator_id,
+      moderator_tag,
+      time_created,
+      duration
+    };
+
+    Ok(moderations)
+  }
+
+  pub async fn update_case(
+    guild_id: i64,
+    case_id: i32,
+    is_active: bool,
+    reason: Option<String>
+  ) -> Result<(), tokio_postgres::Error> {
+    let _db = DatabaseController::new().await?.client;
+
+    match reason {
+      Some(reason) => {
+        _db.execute("
+          UPDATE moderation_events
+          SET is_active = $3, reason = $4 WHERE guild_id = $1 AND case_id = $2;
+        ", &[&guild_id, &case_id, &is_active, &reason]).await?;
+      },
+      None => {
+        _db.execute("
+          UPDATE moderation_events
+          SET is_active = $3 WHERE guild_id = $1 AND case_id = $2;
+        ", &[&guild_id, &case_id, &is_active]).await?;
+      }
+    }
+
+    Ok(())
+  }
+}