From 3d07413690c551d9f034c93af85ae8da5a495e14 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 20 Apr 2024 02:31:40 +0000
Subject: spring cleaning (#165)

* treewide: lightly refactor everything

* once_cell -> std::sync

* remove build.rs

we can get our target at runtime

* commands::copypasta: refactor selection

* drop owo_colors

* reactboard: always remove author from count

* commands: better handle behavior outside of guilds

* ci: garnix -> gha

* nix: drop flake-parts & pre-commit-hooks

* nix: fix rust flags in derivation

* add gha badge to readme

* ci: fail when format changes are made

* ci: only run on push to main

* nix: fix nil script

* nix: add libiconv to darwin deps

* ci: disable fail-fast

* nix: fix actionlint & static checks

* ci: add release gates

* nix: fix nil check again

* ci: give release gates unique names

* ci: only build static packages in docker workflow

* nix: move dev outputs to subflake

* fix some typos

* nix: cleanup checks & dev shell

* add editorconfig
---
 src/commands/general/version.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/commands/general/version.rs')

diff --git a/src/commands/general/version.rs b/src/commands/general/version.rs
index e392903..5f8eac9 100644
--- a/src/commands/general/version.rs
+++ b/src/commands/general/version.rs
@@ -1,16 +1,13 @@
-use crate::colors::Colors;
-use crate::Context;
+use crate::{consts::Colors, Context, Error};
 
-use eyre::Result;
-use poise::serenity_prelude::CreateEmbed;
-use poise::CreateReply;
+use std::env::consts::{ARCH, OS};
+
+use poise::{serenity_prelude::CreateEmbed, CreateReply};
 
 /// Get version info
 #[poise::command(slash_command)]
-pub async fn version(ctx: Context<'_>) -> Result<()> {
+pub async fn version(ctx: Context<'_>) -> Result<(), Error> {
 	let sha = option_env!("GIT_SHA").unwrap_or("main");
-	let target = option_env!("TARGET").unwrap_or("Unknown");
-
 	let revision_url = format!(
 		"[{}]({}/tree/{})",
 		sha,
@@ -18,15 +15,16 @@ pub async fn version(ctx: Context<'_>) -> Result<()> {
 		sha,
 	);
 
+	let os_info = format!("{ARCH}-{OS}");
+
 	let fields = [
 		(
 			"Version:",
 			option_env!("CARGO_PKG_VERSION").unwrap_or("not found"),
 			false,
 		),
-		("Target:", target, false),
+		("OS:", &os_info, false),
 		("Revision:", &revision_url, false),
-		("User Agent:", &crate::api::USER_AGENT, false),
 	];
 
 	let embed = CreateEmbed::new()
-- 
cgit v1.2.3