clean up

src/handlers/error.rs

@@ -1,8 +1,7 @@
-use crate::{consts::Colors, Data};
+use crate::{consts::Colors, Data, Error};
 
 use std::fmt::Write;
 
-use eyre::Report;
 use log::error;
 use poise::serenity_prelude::{CreateEmbed, Timestamp};
 use poise::{CreateReply, FrameworkError};
@@ -16,7 +15,7 @@ macro_rules! writelne {
 	}
 }
 
-pub async fn handle(error: FrameworkError<'_, Data, Report>) {
+pub async fn handle(error: FrameworkError<'_, Data, Error>) {
 	match error {
 		FrameworkError::Setup {
 			error, framework, ..
@@ -34,7 +33,7 @@ pub async fn handle(error: FrameworkError<'_, Data, Report>) {
 				.title("Something went wrong!")
 				.description("oopsie")
 				.timestamp(Timestamp::now())
-				.color(Colors::RED);
+				.color(Colors::Red);
 
 			let reply = CreateReply::default().embed(embed);
 

src/handlers/event/analyze_logs/issues.rs

@@ -198,7 +198,9 @@ async fn outdated_launcher(log: &str, data: &Data) -> Result<Issue> {
 		if let Ok(version) = storage.launcher_version().await {
 			version
 		} else {
-			api::github::get_latest_prism_version().await?
+			let version = api::github::get_latest_prism_version().await?;
+			storage.cache_launcher_version(&version).await?;
+			version
 		}
 	} else {
 		trace!("Not caching launcher version, as we're running without a storage backend");

src/handlers/event/analyze_logs/mod.rs

@@ -48,10 +48,10 @@ pub async fn handle(ctx: &Context, message: &Message, data: &Data) -> Result<()>
 
 		if issues.is_empty() {
 			e = e
-				.color(Colors::GREEN)
+				.color(Colors::Green)
 				.description("No issues found automatically");
 		} else {
-			e = e.color(Colors::RED);
+			e = e.color(Colors::Red);
 
 			for (title, description) in issues {
 				e = e.field(title, description, false);

src/handlers/event/analyze_logs/providers/paste_gg.rs

@@ -19,7 +19,7 @@ impl super::LogProvider for PasteGG {
 	}
 
 	async fn fetch(&self, content: &str) -> Result<String> {
-		let files = paste_gg::get_files(content).await?;
+		let files = paste_gg::files_from(content).await?;
 		let result = files
 			.result
 			.ok_or_eyre("Got an empty result from paste.gg!")?;

src/handlers/event/expand_link.rs

@@ -4,7 +4,7 @@ use poise::serenity_prelude::{Context, CreateAllowedMentions, CreateMessage, Mes
 use crate::utils;
 
 pub async fn handle(ctx: &Context, message: &Message) -> Result<()> {
-	let embeds = utils::resolve_message::from_message(ctx, message).await?;
+	let embeds = utils::messages::from_message(ctx, message).await?;
 
 	if !embeds.is_empty() {
 		let allowed_mentions = CreateAllowedMentions::new().replied_user(false);

src/handlers/event/mod.rs

@@ -1,6 +1,5 @@
-use crate::{api, Data};
+use crate::{api, Data, Error};
 
-use eyre::{Report, Result};
 use log::{debug, info, trace};
 use poise::serenity_prelude::{ActivityData, Context, FullEvent, OnlineStatus};
 use poise::FrameworkContext;
@@ -10,20 +9,20 @@ mod delete_on_reaction;
 mod eta;
 mod expand_link;
 mod give_role;
-pub mod pluralkit;
+mod pluralkit;
 mod support_onboard;
 
 pub async fn handle(
 	ctx: &Context,
 	event: &FullEvent,
-	_: FrameworkContext<'_, Data, Report>,
+	_: FrameworkContext<'_, Data, Error>,
 	data: &Data,
-) -> Result<()> {
+) -> Result<(), Error> {
 	match event {
 		FullEvent::Ready { data_about_bot } => {
 			info!("Logged in as {}!", data_about_bot.user.name);
 
-			let latest_minecraft_version = api::prism_meta::get_latest_minecraft_version().await?;
+			let latest_minecraft_version = api::prism_meta::latest_minecraft_version().await?;
 			let activity = ActivityData::playing(format!("Minecraft {latest_minecraft_version}"));
 
 			info!("Setting presence to activity {activity:#?}");

src/handlers/event/pluralkit.rs

@@ -15,7 +15,7 @@ pub async fn is_message_proxied(message: &Message) -> Result<bool> {
 	);
 	sleep(PK_DELAY).await;
 
-	let proxied = api::pluralkit::get_sender(message.id).await.is_ok();
+	let proxied = api::pluralkit::sender_from(message.id).await.is_ok();
 
 	Ok(proxied)
 }
@@ -36,7 +36,7 @@ pub async fn handle(_: &Context, msg: &Message, storage: &Storage) -> Result<()>
 	);
 	sleep(PK_DELAY).await;
 
-	if let Ok(sender) = api::pluralkit::get_sender(msg.id).await {
+	if let Ok(sender) = api::pluralkit::sender_from(msg.id).await {
 		storage.store_user_plurality(sender).await?;
 	}