From b643a6a235b0c1c9902b97421f24eff2b0d0a5ac Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 9 Aug 2024 23:35:41 -0400
Subject: tree-wide: end of summer cleanup (#214)

* api: refactor & rename module to http

* client: split from main.rs

* tree-wide: use eyre::Report as error

* nix: alejandra -> nixfmt

* nix: start using treefmt-nix

* nix: simplify flake

* nix: refactor derivation & docker image

* nix: remove overlay

* ci: update & cleanup workflows

* commands: assign all commands automatically

* commands/copypasta: remove

* http/teawie: update response struct for upstream rust rewrite

* handlers: rename modules to events; flatten

* crates: rename self to teawie-bot

* nix: fenix -> rust-overlay

i want a specific rust version grrrrrrr

* ci: pin rust to 1.79

this is what our nix dev shell uses and what we can compile on. it seems
the time crate doesn't like v1.80 of the compiler :(

* ci: always run release gates

* nix: fix static toolchain

* nix: rust-overlay -> nixpkgs

* ci: adopt actions-rust-lang actions

* nix: use docker arch names for containers

* crates/time: 0.3.30 -> 0.3.36

fixes building on rust 1.80.0
---
 src/commands/mod.rs | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/commands/mod.rs')

diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index e8cac33..b8d0381 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,4 +1,4 @@
-use crate::{Data, Error};
+use crate::client::{Data, Error};
 
 mod general;
 mod moderation;
@@ -17,24 +17,13 @@ macro_rules! cmd {
 	};
 }
 
-pub fn to_vec() -> Vec<Command> {
-	vec![
-		cmd!(general, ask),
-		cmd!(general, bing),
-		cmd!(general, config),
-		cmd!(general, convert),
-		cmd!(general, emoji),
-		cmd!(general, pfp),
-		cmd!(general, random),
-		cmd!(general, version),
-		cmd!(moderation, clear_messages),
-		cmd!(optional, copypasta),
-		cmd!(optional, teawiespam),
-		cmd!(optional, uwurandom),
-	]
+pub fn all() -> Vec<Command> {
+	let mut all_commands = global();
+	all_commands.append(&mut optional());
+	all_commands
 }
 
-pub fn to_vec_global() -> Vec<Command> {
+pub fn global() -> Vec<Command> {
 	vec![
 		cmd!(general, ask),
 		cmd!(general, bing),
@@ -48,10 +37,6 @@ pub fn to_vec_global() -> Vec<Command> {
 	]
 }
 
-pub fn to_vec_optional() -> Vec<Command> {
-	vec![
-		cmd!(optional, copypasta),
-		cmd!(optional, teawiespam),
-		cmd!(optional, uwurandom),
-	]
+pub fn optional() -> Vec<Command> {
+	vec![cmd!(optional, teawiespam), cmd!(optional, uwurandom)]
 }
-- 
cgit v1.2.3