Add Mario Kart randomizer command

Cargo.lock

@@ -1407,7 +1407,6 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 [[package]]
 name = "manifold"
 version = "8.0.0"
-source = "git+https://code.orbiter-radio.uk/discord/manifold.git#a9fb91c7718a5b21310f2c9a196ee66081d72054"
 dependencies = [
  "built",
  "chrono",

Dockerfile

@@ -1,15 +0,0 @@
-FROM rust:latest AS builder
-WORKDIR /usr/src/hal
-COPY . .
-RUN cargo install --path .
-
-FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y libpq5 libssl3 && rm -rf /var/lib/apt/lists/*
-RUN mkdir -pv /srv/hal
-COPY --from=builder /usr/local/cargo/bin/hal /srv/hal
-RUN chmod a+x /srv/hal/hal
-COPY --from=builder /usr/src/hal/config /srv/hal/config
-COPY --from=builder /usr/src/hal/txt /srv/hal/txt
-RUN find /srv/hal/
-WORKDIR /srv/hal
-CMD ["./hal", "-e", "development"]

compose.yaml

@@ -1,17 +0,0 @@
-services:
-  hal:
-    depends_on:
-      psql:
-        condition: service_started
-        restart: true
-    build: .
-    environment:
-      - DISCORD_TOKEN=${DISCORD_TOKEN}
-      - RUST_LOG=warn
-  psql:
-    image: postgres
-    restart: always
-    # set shared memory limit when using docker compose
-    shm_size: 128mb
-    environment:
-      POSTGRES_PASSWORD: "7ZhUVzr7sxcPEEDMdxfEryW4NTZX5C2ufzZd3r2s25xULgH7FWXJVts"

config/development.hal.json

@@ -2,10 +2,10 @@
   "prefix": "!",
   "nickname": "Hal 9000",
   "database": {
-    "host": "psql",
-    "user": "postgres",
+    "host": "127.0.0.1",
+    "user": "badgey_development",
     "pass": "7ZhUVzr7sxcPEEDMdxfEryW4NTZX5C2ufzZd3r2s25xULgH7FWXJVts",
-    "database_name": "postgres",
+    "database_name": "hal_development",
     "port": 5432
   },
   "channels": {

src/hal/commands/fun.rs

@@ -4,7 +4,7 @@ use rand::rngs::StdRng;
 use rand::SeedableRng;
 use rand::seq::IndexedRandom;
 
-use crate::hal::models::mario_kart_randomizer::MarioKartRandomizer;
+use crate::hal::commands::mario_kart_randomizer::MarioKartRandomizer;
 
 #[poise::command(slash_command, prefix_command)]
 async fn bikeshed(ctx: ManifoldContext<'_>) -> ManifoldResult<()> {
@@ -42,28 +42,14 @@ async fn randommk(context: ManifoldContext<'_>, count: u32, balance: bool, insid
 
     for combo in combos {
         context.send(|c| { 
-            c
-                .content(format!("{combo_number}. {0}, {1}, {2}, {3}", combo.character, combo.body, combo.tires, combo.glider))
-                .embed(|embed| {
-                    embed
-                        .url("https://mkrandomizer.awsxdr.com/")
-                        .image(format!("https://mkrandomizer.awsxdr.com/images/characters/{0}.png", combo.character))
-                })
-                .embed(|embed| {
-                    embed
-                        .url("https://mkrandomizer.awsxdr.com/")
-                        .image(format!("https://mkrandomizer.awsxdr.com/images/bodies/{0}.png", combo.body))
-                })
-                .embed(|embed| {
-                    embed
-                        .url("https://mkrandomizer.awsxdr.com/")
-                        .image(format!("https://mkrandomizer.awsxdr.com/images/tires/{0}.png", combo.tires))
-                })
-                .embed(|embed| {
-                    embed
-                        .url("https://mkrandomizer.awsxdr.com/")
-                        .image(format!("https://mkrandomizer.awsxdr.com/images/gliders/{0}.png", combo.glider))
-                })
+            c.embed(|embed| {
+                embed
+                    .title(format!("{combo_number}. {0}, {1}, {2}, {3}", combo.character, combo.body, combo.tires, combo.glider))
+                    .image(format!("https://mkrandomizer.awsxdr.com/images/characters/{0}.png", combo.character))
+                    .image(format!("https://mkrandomizer.awsxdr.com/images/bodies/{0}.png", combo.body))
+                    .image(format!("https://mkrandomizer.awsxdr.com/images/tires/{0}.png", combo.tires))
+                    .image(format!("https://mkrandomizer.awsxdr.com/images/gliders/{0}.png", combo.glider))
+            })
         }).await?;
 
         combo_number += 1;

src/hal/commands/mario_kart_randomizer.rs

@@ -58,7 +58,7 @@ impl MarioKartRandomizer {
 
         let selection_slice = &scored_combinations[min as usize..max as usize];
 
-        for _ in 0..count {
+        for _ in 1..count {
             let combo = selection_slice.choose(&mut random).unwrap();
             result.push(combo.combination.clone());
         }
@@ -71,7 +71,7 @@ impl MarioKartRandomizer {
             get_kart_combinations() 
         } else { 
             let stats = get_item_stats();
-            get_kart_combinations().iter().filter(|k| { !stats.bodies[&k.body].inside_drift }).cloned().collect() 
+            get_kart_combinations().iter().filter(|k| { stats.bodies[&k.body].inside_drift }).cloned().collect() 
         }
     }
 

src/hal/commands/mod.rs

@@ -1,5 +1,6 @@
 mod utility;
 mod fun;
+mod mario_kart_randomizer;
 
 use manifold::{ManifoldData};
 use manifold::error::{ManifoldError};

src/hal/mod.rs

@@ -16,8 +16,6 @@ pub async fn run(arguments: ArgMatches) {
     let git_info: String = built_info::GIT_VERSION.unwrap_or("unknown").to_string();
     let version_string = format!("Hal 9000 Bot version {ver} built at {time} from revision {rev}", ver=built_info::PKG_VERSION, time=built_info::BUILT_TIME_UTC, rev=git_info).to_string();
 
-    warn!("HAL Client initialising...");
-
     let client = match manifold::prepare_client::<HalHandler>(arguments, GatewayIntents::all(), commands::collect_commands(), version_string, MIGRATIONS).await {
         Ok(c) => c,
         Err(e) => {
@@ -26,7 +24,5 @@ pub async fn run(arguments: ArgMatches) {
         }
     };
 
-    warn!("HAL Client connecting...");
-
     let _ = client.build().await.unwrap().start().await;
 }

src/hal/models/mod.rs

@@ -1,2 +1 @@
 pub mod reminder;
-pub mod mario_kart_randomizer;