clean up

Author: getchoo

Cargo.lock

@@ -23,7 +23,6 @@ eyre = "0.6.11"
 log = "0.4.20"
 poise = "0.6.1"
 octocrab = "0.37.0"
-owo-colors = "4.0.0"
 redis = { version = "0.25.2", features = ["tokio-comp", "tokio-rustls-comp"] }
 regex = "1.10.3"
 reqwest = { version = "0.12.2", default-features = false, features = [
@@ -37,7 +36,17 @@ tokio = { version = "1.35.1", features = [
 	"rt-multi-thread",
 	"signal",
 ] }
-url = { version = "2.5.0", features = ["serde"] }
+
+[lints.rust]
+unsafe_code = "forbid"
+
+[lints.clippy]
+complexity = "warn"
+correctness = "deny"
+pedantic = "warn"
+perf = "warn"
+style = "warn"
+suspicious = "deny"
 
 [profile.release]
 codegen-units = 1

Cargo.toml

@@ -6,7 +6,7 @@ use gray_matter::{engine, Matter};
 
 include!("src/tags.rs");
 
-/// generate the ChoiceParameter enum and tag data we will use in the `tag` command
+/// generate the `ChoiceParameter` enum and tag data we will use in the `tag` command
 #[allow(dead_code)]
 fn main() {
 	let out_dir = env::var_os("OUT_DIR").unwrap();

build.rs

@@ -1,12 +1,12 @@
-use std::sync::{Arc, OnceLock};
+use std::sync::OnceLock;
 
 use eyre::{Context, OptionExt, Result};
 use log::debug;
 use octocrab::Octocrab;
 
-fn octocrab() -> &'static Arc<Octocrab> {
-	static OCTOCRAB: OnceLock<Arc<Octocrab>> = OnceLock::new();
-	OCTOCRAB.get_or_init(octocrab::instance)
+fn octocrab() -> &'static Octocrab {
+	static OCTOCRAB: OnceLock<Octocrab> = OnceLock::new();
+	OCTOCRAB.get_or_init(Octocrab::default)
 }
 
 pub async fn get_latest_prism_version() -> Result<String> {

src/api/github.rs

@@ -3,6 +3,7 @@ use std::sync::OnceLock;
 use eyre::Result;
 use log::debug;
 use reqwest::{Client, Response};
+use serde::de::DeserializeOwned;
 
 pub mod dadjoke;
 pub mod github;
@@ -44,3 +45,10 @@ pub async fn bytes_from_url(url: &str) -> Result<Vec<u8>> {
 	let bytes = resp.bytes().await?;
 	Ok(bytes.to_vec())
 }
+
+pub async fn json_from_url<T: DeserializeOwned>(url: &str) -> Result<T> {
+	let resp = get_url(url).await?;
+
+	let json = resp.json().await?;
+	Ok(json)
+}

src/api/mod.rs

@@ -6,7 +6,7 @@ const PASTE_GG: &str = "https://api.paste.gg/v1";
 const PASTES: &str = "/pastes";
 
 #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Deserialize, Serialize)]
-enum Status {
+pub enum Status {
 	#[serde(rename = "success")]
 	Success,
 	#[serde(rename = "error")]
@@ -15,10 +15,10 @@ enum Status {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Response<T> {
-	status: Status,
+	pub status: Status,
 	pub result: Option<Vec<T>>,
-	error: Option<String>,
-	message: Option<String>,
+	pub error: Option<String>,
+	pub message: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -27,12 +27,11 @@ pub struct Files {
 	pub name: Option<String>,
 }
 
-pub async fn get_files(id: &str) -> Result<Response<Files>> {
+pub async fn files_from(id: &str) -> Result<Response<Files>> {
 	let url = format!("{PASTE_GG}{PASTES}/{id}/files");
 	debug!("Making request to {url}");
-	let resp = super::client().get(url).send().await?;
-	resp.error_for_status_ref()?;
-	let resp: Response<Files> = resp.json().await?;
+
+	let resp: Response<Files> = super::json_from_url(&url).await?;
 
 	if resp.status == Status::Error {
 		let message = resp

src/api/paste_gg.rs

@@ -11,17 +11,15 @@ pub struct Message {
 const PLURAL_KIT: &str = "https://api.pluralkit.me/v2";
 const MESSAGES: &str = "/messages";
 
-pub async fn get_sender(message_id: MessageId) -> Result<UserId> {
+pub async fn sender_from(message_id: MessageId) -> Result<UserId> {
 	let url = format!("{PLURAL_KIT}{MESSAGES}/{message_id}");
-
 	debug!("Making request to {url}");
-	let resp = super::client().get(url).send().await?;
-	resp.error_for_status_ref()?;
 
-	let data: Message = resp.json().await?;
+	let resp: Message = super::json_from_url(&url).await?;
+
 	let id: u64 =
-		data.sender.parse().wrap_err_with(|| {
-			format!("Couldn't parse response from PluralKit as a UserId! Here's the response:\n{data:#?}")
+		resp.sender.parse().wrap_err_with(|| {
+			format!("Couldn't parse response from PluralKit as a UserId! Here's the response:\n{resp:#?}")
 		})?;
 	let sender = UserId::from(id);
 

src/api/pluralkit.rs

@@ -14,7 +14,7 @@ pub struct MinecraftPackageJson {
 const META: &str = "https://meta.prismlauncher.org/v1";
 const MINECRAFT_PACKAGEJSON: &str = "/net.minecraft/package.json";
 
-pub async fn get_latest_minecraft_version() -> Result<String> {
+pub async fn latest_minecraft_version() -> Result<String> {
 	let url = format!("{META}{MINECRAFT_PACKAGEJSON}");
 
 	debug!("Making request to {url}");

src/api/prism_meta.rs

@@ -1,6 +1,5 @@
-use crate::Context;
+use crate::{Context, Error};
 
-use eyre::Result;
 use log::trace;
 use poise::samples::HelpConfiguration;
 
@@ -9,7 +8,7 @@ use poise::samples::HelpConfiguration;
 pub async fn help(
 	ctx: Context<'_>,
 	#[description = "Provide information about a specific command"] command: Option<String>,
-) -> Result<()> {
+) -> Result<(), Error> {
 	trace!("Running help command");
 
 	let configuration = HelpConfiguration {

src/commands/general/help.rs

@@ -1,12 +1,11 @@
-use crate::api::dadjoke;
-use crate::Context;
+use crate::{api::dadjoke, Context, Error};
 
 use eyre::Result;
 use log::trace;
 
 /// It's a joke
 #[poise::command(slash_command, prefix_command, track_edits = true)]
-pub async fn joke(ctx: Context<'_>) -> Result<()> {
+pub async fn joke(ctx: Context<'_>) -> Result<(), Error> {
 	trace!("Running joke command");
 
 	ctx.defer().await?;

src/commands/general/joke.rs

@@ -1,13 +1,13 @@
-use crate::{consts::Colors, Context};
+use crate::{consts::Colors, Context, Error};
 
-use eyre::{eyre, Context as _, OptionExt, Result};
+use eyre::{eyre, Context as _, OptionExt};
 use log::trace;
 use poise::serenity_prelude::CreateEmbed;
 use poise::CreateReply;
 
 /// Returns the number of members in the server
 #[poise::command(slash_command, prefix_command, guild_only = true, track_edits = true)]
-pub async fn members(ctx: Context<'_>) -> Result<()> {
+pub async fn members(ctx: Context<'_>) -> Result<(), Error> {
 	trace!("Running members command");
 
 	ctx.defer().await?;
@@ -29,7 +29,7 @@ pub async fn members(ctx: Context<'_>) -> Result<()> {
 	let embed = CreateEmbed::new()
 		.title(format!("{member_count} total members!",))
 		.description(format!("{online_count} online members",))
-		.color(Colors::BLUE);
+		.color(Colors::Blue);
 	let reply = CreateReply::default().embed(embed);
 
 	ctx.send(reply).await?;

src/commands/general/members.rs

@@ -1,11 +1,10 @@
-use crate::Context;
+use crate::{Context, Error};
 
-use eyre::Result;
 use log::trace;
 
 /// Replies with pong!
 #[poise::command(slash_command, prefix_command, track_edits = true, ephemeral)]
-pub async fn ping(ctx: Context<'_>) -> Result<()> {
+pub async fn ping(ctx: Context<'_>) -> Result<(), Error> {
 	trace!("Running ping command!");
 	ctx.say("Pong!").await?;
 	Ok(())

src/commands/general/ping.rs

@@ -1,7 +1,5 @@
-use crate::api::rory;
-use crate::Context;
+use crate::{api::rory, Context, Error};
 
-use eyre::Result;
 use log::trace;
 use poise::serenity_prelude::{CreateEmbed, CreateEmbedFooter};
 use poise::CreateReply;
@@ -11,7 +9,7 @@ use poise::CreateReply;
 pub async fn rory(
 	ctx: Context<'_>,
 	#[description = "specify a Rory ID"] id: Option<u64>,
-) -> Result<()> {
+) -> Result<(), Error> {
 	trace!("Running rory command");
 
 	ctx.defer().await?;

src/commands/general/rory.rs

@@ -1,6 +1,5 @@
-use crate::{utils, Context};
+use crate::{utils, Context, Error};
 
-use eyre::Result;
 use log::trace;
 use poise::serenity_prelude::{CreateEmbed, CreateMessage};
 
@@ -15,18 +14,12 @@ use poise::serenity_prelude::{CreateEmbed, CreateMessage};
 pub async fn say(
 	ctx: Context<'_>,
 	#[description = "the message content"] content: String,
-) -> Result<()> {
+) -> Result<(), Error> {
 	let channel = ctx.channel_id();
 	channel.say(ctx, &content).await?;
 	ctx.say("I said what you said!").await?;
 
-	if let Some(channel_id) = ctx
-		.data()
-		.config
-		.discord_config()
-		.channels()
-		.log_channel_id()
-	{
+	if let Some(channel_id) = ctx.data().config.discord.channels.log_channel_id {
 		let author = utils::embed_author_from_user(ctx.author());
 
 		let embed = CreateEmbed::default()

src/commands/general/say.rs

@@ -1,13 +1,12 @@
-use crate::{api, consts::Colors, Context};
+use crate::{api, consts::Colors, Context, Error};
 
-use eyre::Result;
 use log::trace;
 use poise::serenity_prelude::CreateEmbed;
 use poise::CreateReply;
 
 /// Returns GitHub stargazer count
 #[poise::command(slash_command, prefix_command, track_edits = true)]
-pub async fn stars(ctx: Context<'_>) -> Result<()> {
+pub async fn stars(ctx: Context<'_>) -> Result<(), Error> {
 	trace!("Running stars command");
 
 	ctx.defer().await?;
@@ -27,7 +26,7 @@ pub async fn stars(ctx: Context<'_>) -> Result<()> {
 
 	let embed = CreateEmbed::new()
 		.title(format!("⭐ {count} total stars!"))
-		.color(Colors::YELLOW);
+		.color(Colors::Yellow);
 	let reply = CreateReply::default().embed(embed);
 
 	ctx.send(reply).await?;

src/commands/general/stars.rs

@@ -1,10 +1,10 @@
 #![allow(non_camel_case_types, clippy::upper_case_acronyms)]
-use crate::{consts::Colors, tags::Tag, Context};
+use crate::{consts::Colors, tags::Tag, Context, Error};
 use std::env;
 use std::str::FromStr;
 use std::sync::OnceLock;
 
-use eyre::{eyre, Result};
+use eyre::eyre;
 use log::trace;
 use poise::serenity_prelude::{Color, CreateEmbed, User};
 use poise::CreateReply;
@@ -26,7 +26,7 @@ pub async fn tag(
 	ctx: Context<'_>,
 	#[description = "the tag to send"] name: Choice,
 	#[description = "a user to mention"] user: Option<User>,
-) -> Result<()> {
+) -> Result<(), Error> {
 	trace!("Running tag command");
 
 	let tag_id = name.as_str();

src/commands/general/tag.rs

@@ -1,6 +1,4 @@
-use crate::Data;
-
-use eyre::Report;
+use crate::{Data, Error};
 
 mod general;
 mod moderation;
@@ -32,7 +30,7 @@ macro_rules! module_macro {
 module_macro!(general);
 module_macro!(moderation);
 
-pub type Command = poise::Command<Data, Report>;
+pub type Command = poise::Command<Data, Error>;
 
 pub fn get() -> Vec<Command> {
 	vec![