Cargo.toml

@@ -1,28 +1,21 @@
 [package]
 name = "ji-chan"
 version = "0.1.0"
-authors = ["ElnuDev <elnu@elnu.com>"]
-edition = "2024"
-description = "Ji-chan (字ちゃん), the Discord bot and website manager for Tegaki Tuesday, the weekly Japanese handwriting challenge. https://tegakituesday.com/"
-homepage = "https://tegakituesday.com/"
-repository = "https://git.elnu.com/tegakituesday/ji-chan"
-license = "GPL-3.0"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 dotenv = "0.15"
-rand = "0.9"
+rand = "0.8"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 serde_json = "1.0"
-reqwest = "0.12"
+reqwest = "0.11"
 slug = "0.1"
 unicode_hfwidth = "0.2"
 fs_extra = "1.3"
-poise = "0.5.7"
-clap = { version = "4.5.32", features = ["derive"] }
-lazy_static = "1.5.0"
+poise = "0.5.5"
 
 [dependencies.tokio]
 version = "1.32"

flake.lock

@@ -1,12 +1,30 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742669843,
-        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+        "lastModified": 1692913444,
+        "narHash": "sha256-1SvMQm2DwofNxXVtNWWtIcTh7GctEVrS/Xel/mdc6iY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
+        "rev": "18324978d632ffc55ef1d928e81630c620f4f447",
         "type": "github"
       },
       "original": {
@@ -18,11 +36,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736320768,
-        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
+        "lastModified": 1681358109,
+        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
+        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
         "type": "github"
       },
       "original": {
@@ -40,14 +58,15 @@
     },
     "rust-overlay": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1742870002,
-        "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=",
+        "lastModified": 1692929460,
+        "narHash": "sha256-zdN6UVtEml7t0WQHVy0avsE+TWJLklXnqJyiPaOa8u0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6",
+        "rev": "673e2d3d2a3951adc6f5e3351c9fce6ad130baed",
         "type": "github"
       },
       "original": {
@@ -55,6 +74,21 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -40,8 +40,6 @@ Some utility commands:
           version = "0.1.0";
           nativeBuildInputs = with pkgs; [ pkg-config ];
           buildInputs = with pkgs; [ openssl ];
-          # rustPlatform.fetchCargoTarball is deprecated in favor of rustPlatform.fetchCargoVendor.
-          useFetchCargoVendor = true;
           cargoHash = "sha256-eKsQsOIiZDpDOGLMcpU+dL/e/UBEnbQIgcVPKi5xpC8=";
           meta = with nixpkgs.lib; {
             homepage = "https://tegakituesday.com";
@@ -52,71 +50,5 @@ Some utility commands:
           };
         };
       };
-      nixosModules.default = { config, ... }: let
-        lib = nixpkgs.lib;
-      in {
-        options.services.ji-chan = {
-          enable = lib.mkEnableOption (lib.mdDoc "ji-chan service");
-          package = lib.mkOption {
-            type = lib.types.package;
-            default = self.packages.${system}.ji-chan;
-            defaultText = "pkgs.ji-chan";
-            description = lib.mdDoc ''
-              The ji-chan package that should be used.
-            '';
-          };
-          domain = lib.mkOption {
-            type = lib.types.str;
-            default = "tegakituesday.com";
-            description = lib.mdDoc ''
-              Website domain
-            '';
-          };
-          token = lib.mkOption {
-            type = lib.types.str;
-            description = lib.mdDoc ''
-              Discord token
-            '';
-          };
-          prefix = lib.mkOption {
-            type = lib.types.str;
-            description = lib.mdDoc ''
-              Traditional text command prefix, including space, if any
-            '';
-          };
-          hugo = lib.mkOption {
-            type = lib.types.str;
-            description = lib.mdDoc ''
-              Path to Hugo project where site rebuilds
-            '';
-          };
-          guildData = lib.mkOption {
-            type = lib.types.str;
-            description = lib.mdDoc ''
-              Path to guild data JSON file
-            '';
-          };
-        };
-        config.systemd.services.ji-chan = let
-          cfg = config.services.ji-chan;
-          pkg = self.packages.${system}.ji-chan;
-        in lib.mkIf cfg.enable {
-          description = pkg.meta.description;
-          after = [ "network.target" ];
-          wantedBy = [ "network.target" ];
-          serviceConfig = {
-            ExecStart = ''
-              ${cfg.package}/bin/ji-chan \
-                --domain ${cfg.domain} \
-                --token ${cfg.token} \
-                --prefix ${cfg.prefix} \
-                --hugo ${cfg.hugo} \
-                --guildData ${cfg.guildData}
-            '';
-            Restart = "always";
-            DynamicUser = true;
-          };
-        };
-      };
     };
 }

src/commands/challenge.rs

@@ -1,5 +1,4 @@
 use crate::utils::*;
-use crate::ARGS;
 use serde_json::Map;
 
 use crate::serenity;
@@ -22,7 +21,7 @@ use std::path::Path;
 pub async fn challenge(ctx: Context<'_>) -> Result<(), Error> {
     ctx.say(format!(
         "Tegaki Tuesday #{n}: <https://{domain}/{n}>",
-        domain = ARGS.domain,
+        domain = get_domain(),
         n = get_challenge_number()
     ))
     .await?;
@@ -200,7 +199,7 @@ pub async fn submit(ctx: Context<'_>, submission: serenity::Attachment) -> Resul
         let thank_you = &format!(
             "Thank you for submitting! You can view your submission at <https://{domain}/{}>",
             challenge_number,
-            domain = ARGS.domain
+            domain = get_domain()
         );
         let mut repost_here = true;
         match ctx {
@@ -263,7 +262,7 @@ pub async fn submit(ctx: Context<'_>, submission: serenity::Attachment) -> Resul
                 channel
                     .send_message(&ctx.serenity_context().http, |m| {
                         m.embed(|e| {
-                            let domain = &ARGS.domain;
+                            let domain = get_domain();
                             let n = get_challenge_number();
                             let mut description = format!(
                                 "New submission to [Tegaki Tuesday #{n}](https://{domain}/{n})!"
@@ -345,7 +344,7 @@ pub async fn images(ctx: Context<'_>) -> Result<(), Error> {
             to_fullwidth(&(i + 1).to_string()),
             challenge_number,
             image,
-            domain = ARGS.domain
+            domain = get_domain()
         ));
     }
     ctx.say(message).await?;

src/commands/meta.rs

@@ -1,8 +1,10 @@
+use crate::utils::get_domain;
 use crate::Context;
 use crate::Error;
-use crate::ARGS;
 use poise::command;
 
+use std::env;
+
 // TODO: Implement proper help text for command-specific help,
 // see https://github.com/kangalioo/poise/blob/90ac24a8ef621ec6dc3fc452762dc9cfa144f693/examples/framework_usage/main.rs#L18-L38
 #[command(
@@ -31,8 +33,8 @@ __**Kanji 漢字**__
 :game_die: `{p}kyoiku <grade|all>` Random Kyōiku kanji
 :game_die: `{p}jlpt <level|all>` Random JLPT kanji
 :game_die: `{p}hyogai <group|all>` Random Hyōgai kanji",
-        p = ARGS.prefix,
-        domain = ARGS.domain,
+        p = env::var("PREFIX").unwrap(),
+        domain = get_domain(),
     );
     ctx.say(message).await?;
     Ok(())

src/commands/owner.rs

@@ -2,10 +2,10 @@
 
 use crate::Context;
 use crate::Error;
-use crate::ARGS;
 use poise::command;
 
 use serde_json::json;
+use std::env;
 
 use crate::utils::*;
 
@@ -100,7 +100,7 @@ pub async fn announcechallenge(ctx: Context<'_>) -> Result<(), Error> {
     let message = format!("Welcome to the **{n}{th}** weekly **Tegaki Tuesday** (手書きの火曜日) handwriting challenge! :pen_fountain: The prompt is available in both Japanese and English on the website at <https://{domain}/{n}>.
 
 You can make submissions in both languages, but please submit in your target language first. Submissions can be submitted by uploading the image to this channel along with the `{p}submit` command. By submitting, you agree to having your work posted to the website under the Attribution-ShareAlike 4.0 Unported (CC BY-SA 4.0) license, attributed to your Discord account. (<https://creativecommons.org/licenses/by-sa/4.0>).",
-        domain = ARGS.domain,
+        domain = get_domain(),
         n = challenge_number,
         th = match challenge_number % 10 {
             1 => "ˢᵗ",
@@ -108,7 +108,7 @@ You can make submissions in both languages, but please submit in your target lan
             3 => "ʳᵈ",
             _ => "ᵗʰ"
         },
-        p = ARGS.prefix
+        p = env::var("PREFIX").unwrap()
     );
     send(ctx, &message, true, false).await?;
     ctx.say("Announced!").await?;

src/main.rs

@@ -1,8 +1,7 @@
 mod commands;
 mod utils;
 
-use std::env::{self, VarError};
-use lazy_static::lazy_static;
+use std::env;
 
 type Error = Box<dyn std::error::Error + Send + Sync>;
 type Context<'a> = poise::Context<'a, Data, Error>;
@@ -13,7 +12,6 @@ pub struct Data {}
 use commands::{challenge::*, kanji::*, meta::*, owner::*};
 use poise::serenity_prelude as serenity;
 use poise::serenity_prelude::model::gateway::GatewayIntents;
-use clap::Parser;
 
 #[poise::command(prefix_command)]
 async fn register(ctx: Context<'_>) -> Result<(), Error> {
@@ -21,50 +19,12 @@ async fn register(ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
 }
 
-#[derive(Parser)]
-#[clap(author, version, about)]
-struct Arguments {
-    #[clap(long, help = "Website domain", default_value = "tegakituesday.com")]
-    pub domain: String,
-    #[clap(long = "token", help = "Discord token")]
-    pub discord_token: String,
-    #[clap(long, help = "Traditional text command prefix, including space, if any", default_value = "-h")]
-    pub prefix: String,
-    #[clap(long, help = "Path to Hugo project where site rebuilds")]
-    pub hugo: String,
-    #[clap(long = "guilds", help = "Guild data JSON file", default_value = "guilds.json")]
-    pub guild_data: String,
-}
-
-impl Arguments {
-    fn from_dotenv() -> Result<Self, VarError> {
-        Ok(Self {
-            domain: env::var("DOMAIN")?,
-            discord_token: env::var("DISCORD_TOKEN")?,
-            prefix: env::var("PREFIX")?,
-            hugo: env::var("HUGO")?.into(),
-            guild_data: env::var("GUILD_DATA")?.into(),
-        })
-    }
-}
-
-lazy_static! {
-    static ref ARGS: Arguments = {
-        match env::args().count() {
-            1 => {
-                // This will load the environment variables located at `./.env`, relative to
-                // the CWD. See `./.env.example` for an example on how to structure this.
-                dotenv::dotenv().expect("Failed to load .env file");
-
-                Arguments::from_dotenv().unwrap()
-            },
-            _ => Arguments::parse(),
-        }
-    };
-}
-
 #[tokio::main]
 async fn main() {
+    // This will load the environment variables located at `./.env`, relative to
+    // the CWD. See `./.env.example` for an example on how to structure this.
+    dotenv::dotenv().expect("Failed to load .env file");
+
     // Initialize the logger to use environment variables.
     //
     // In this case, a good default is setting the environment variable
@@ -99,12 +59,12 @@ async fn main() {
                 so(),
             ],
             prefix_options: poise::PrefixFrameworkOptions {
-                prefix: Some(ARGS.prefix.clone()),
+                prefix: Some(env::var("PREFIX").expect("Expected a prefix in the environment")),
                 ..Default::default()
             },
             ..Default::default()
         })
-        .token(&ARGS.discord_token)
+        .token(std::env::var("DISCORD_TOKEN").expect("Expected a token in the environment"))
         .intents(
             GatewayIntents::GUILD_MESSAGES
                 | GatewayIntents::DIRECT_MESSAGES

src/utils.rs

@@ -1,7 +1,6 @@
 use crate::serenity;
 use crate::Context;
 use crate::Error;
-use crate::ARGS;
 use rand::seq::IteratorRandom;
 use serde_json::Map;
 use serde_json::Value;
@@ -53,7 +52,7 @@ mod tests {
 }
 
 pub fn get_challenge_number() -> i32 {
-    let challenge_dir = format!("{}/content/challenges", ARGS.hugo);
+    let challenge_dir = format!("{}/content/challenges", env::var("HUGO").unwrap());
     let paths = fs::read_dir(challenge_dir).unwrap();
     let mut max = 0;
     for path in paths {
@@ -73,12 +72,20 @@ pub fn get_challenge_number() -> i32 {
     max
 }
 
+pub fn get_domain() -> String {
+    env::var("DOMAIN").unwrap()
+}
+
+pub fn get_hugo_path() -> String {
+    env::var("HUGO").unwrap()
+}
+
 pub fn get_submission_images_dir() -> String {
-    format!("{}/assets/{}", ARGS.hugo, get_challenge_number())
+    format!("{}/assets/{}", get_hugo_path(), get_challenge_number())
 }
 
 pub fn get_submission_data_path(challenge: i32) -> String {
-    format!("{}/data/challenges/{}.json", ARGS.hugo, challenge)
+    format!("{}/data/challenges/{}.json", get_hugo_path(), challenge)
 }
 
 pub fn get_current_submission_data_path() -> String {
@@ -146,13 +153,17 @@ pub fn to_fullwidth(string: &str) -> String {
 
 pub fn rebuild_site() {
     Command::new("./build.sh")
-        .current_dir(&ARGS.hugo)
+        .current_dir(get_hugo_path())
         .status()
         .expect("Failed to rebuild site");
 }
 
+pub fn get_guild_data_path() -> String {
+    env::var("GUILD_DATA").unwrap()
+}
+
 pub fn get_guild_data() -> Map<String, Value> {
-    let guild_data_path = &ARGS.guild_data;
+    let guild_data_path = get_guild_data_path();
     let guild_data_json = match File::open(&guild_data_path) {
         Ok(mut file) => {
             let mut json = String::new();
@@ -176,7 +187,7 @@ pub fn set_guild_data(guild_data: Map<String, Value>) {
     let mut guild_data_file = OpenOptions::new()
         .write(true)
         .truncate(true)
-        .open(&ARGS.guild_data)
+        .open(get_guild_data_path())
         .unwrap();
     guild_data_file
         .write_all(
@@ -237,7 +248,7 @@ pub async fn send(ctx: Context<'_>, message: &str, ping: bool, pin: bool) -> Res
 }
 
 pub fn random_from_string(string: &str) -> char {
-    string.chars().choose(&mut rand::rng()).unwrap()
+    string.chars().choose(&mut rand::thread_rng()).unwrap()
 }
 
 pub fn get_so_diagram(kanji: char) -> String {
@@ -357,7 +368,7 @@ pub async fn random_kanji(
             if subcategory == "ALL" {
                 let subcategory_key = subcategories
                     .keys()
-                    .choose(&mut rand::rng())
+                    .choose(&mut rand::thread_rng())
                     .unwrap();
                 let list = subcategories[subcategory_key].as_str().unwrap();
                 let kanji = random_from_string(list);
@@ -429,7 +440,6 @@ pub async fn leaderboard(ctx: &Context<'_>) -> Result<(), Error> {
     let mut file = std::fs::OpenOptions::new()
         .create(true)
         .write(true)
-        .truncate(true)
         .open(env::var("LEADERBOARD").unwrap())
         .unwrap();
     file.write_all(leaderboard_html.as_bytes())?;