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/api/guzzle.rs | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'src/api/guzzle.rs')

diff --git a/src/api/guzzle.rs b/src/api/guzzle.rs
index 437dbe6..c5093da 100644
--- a/src/api/guzzle.rs
+++ b/src/api/guzzle.rs
@@ -1,31 +1,19 @@
-use crate::api::REQWEST_CLIENT;
-
-use eyre::{eyre, Result};
+use eyre::Result;
 use log::debug;
-use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
-struct GuzzleResponse {
-	pub url: String,
+struct RandomTeawieResponse {
+	url: String,
 }
 
 const GUZZLE: &str = "https://api.mydadleft.me";
 const RANDOM_TEAWIE: &str = "/random_teawie";
 
-pub async fn get_random_teawie() -> Result<String> {
-	let req = REQWEST_CLIENT
-		.get(format!("{GUZZLE}{RANDOM_TEAWIE}"))
-		.build()?;
-
-	debug!("Making request to {}", req.url());
-	let resp = REQWEST_CLIENT.execute(req).await?;
-	let status = resp.status();
+pub async fn random_teawie() -> Result<String> {
+	let url = format!("{GUZZLE}{RANDOM_TEAWIE}");
+	debug!("Making request to {url}");
+	let json: RandomTeawieResponse = super::get_json(&url).await?;
 
-	if let StatusCode::OK = status {
-		let data: GuzzleResponse = resp.json().await?;
-		Ok(data.url)
-	} else {
-		Err(eyre!("Failed to get random Teawie with {status}"))
-	}
+	Ok(json.url)
 }
-- 
cgit v1.2.3