refactor: don't use re-exports of eyre & owo-colors

src/api/dadjoke.rs

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use log::debug;
 use reqwest::StatusCode;
 

src/api/pluralkit.rs

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Context, Result};
+use eyre::{eyre, Context, Result};
 use log::debug;
 use poise::serenity_prelude::{MessageId, UserId};
 use reqwest::StatusCode;

src/api/prism_meta.rs

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Context, Result};
+use eyre::{eyre, Context, Result};
 use log::debug;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};

src/api/rory.rs

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Context, Result};
+use eyre::{eyre, Context, Result};
 use log::debug;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};

src/commands/general/joke.rs

@@ -1,7 +1,7 @@
 use crate::api::dadjoke;
 use crate::Context;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 
 /// It's a joke
 #[poise::command(slash_command, prefix_command)]

src/commands/general/members.rs

@@ -1,6 +1,6 @@
 use crate::{consts, Context};
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use poise::serenity_prelude::CreateEmbed;
 use poise::CreateReply;
 

src/commands/general/ping.rs

@@ -1,6 +1,6 @@
 use crate::Context;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 
 /// Replies with pong!
 #[poise::command(slash_command, prefix_command, ephemeral)]

src/commands/general/rory.rs

@@ -1,7 +1,7 @@
 use crate::api::rory;
 use crate::Context;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 use poise::serenity_prelude::{CreateEmbed, CreateEmbedFooter};
 use poise::CreateReply;
 

src/commands/general/say.rs

@@ -1,6 +1,6 @@
 use crate::Context;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use poise::serenity_prelude::{CreateEmbed, CreateEmbedAuthor, CreateMessage};
 
 /// Say something through the bot

src/commands/general/stars.rs

@@ -1,6 +1,6 @@
 use crate::{consts, Context};
 
-use color_eyre::eyre::{Context as _, Result};
+use eyre::{Context as _, Result};
 use poise::serenity_prelude::CreateEmbed;
 use poise::CreateReply;
 

src/commands/general/tag.rs

@@ -3,7 +3,7 @@ use crate::tags::Tag;
 use crate::{consts, Context};
 use std::env;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use poise::serenity_prelude::{Color, CreateEmbed, User};
 use poise::CreateReply;

src/commands/mod.rs

@@ -1,6 +1,6 @@
 use crate::Data;
 
-use color_eyre::eyre::Report;
+use eyre::Report;
 use poise::Command;
 
 mod general;

src/handlers/error.rs

@@ -1,7 +1,7 @@
-use crate::consts::COLORS;
+use crate::consts;
 use crate::Data;
 
-use color_eyre::eyre::Report;
+use eyre::Report;
 use log::error;
 use poise::serenity_prelude::{CreateEmbed, Timestamp};
 use poise::{CreateReply, FrameworkError};
@@ -24,7 +24,7 @@ pub async fn handle(error: FrameworkError<'_, Data, Report>) {
 				.title("Something went wrong!")
 				.description("oopsie")
 				.timestamp(Timestamp::now())
-				.color(COLORS["red"]);
+				.color(consts::COLORS["red"]);
 
 			let reply = CreateReply::default().embed(embed);
 

src/handlers/event/analyze_logs/issues.rs

@@ -1,6 +1,6 @@
 use crate::Data;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 use once_cell::sync::Lazy;
 use regex::Regex;
 

src/handlers/event/analyze_logs/mod.rs

@@ -1,7 +1,7 @@
 use crate::consts::COLORS;
 use crate::Data;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 use log::debug;
 use poise::serenity_prelude::{
 	Context, CreateAllowedMentions, CreateEmbed, CreateMessage, Message,

src/handlers/event/analyze_logs/providers/0x0.rs

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::StatusCode;

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

@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use eyre::Result;
 use poise::serenity_prelude::Message;
 
 pub async fn find(message: &Message) -> Result<Option<String>> {

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

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::StatusCode;

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

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::StatusCode;

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

@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use eyre::Result;
 use poise::serenity_prelude::Message;
 
 #[path = "0x0.rs"]

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

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::StatusCode;

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

@@ -1,6 +1,6 @@
 use crate::api::REQWEST_CLIENT;
 
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::StatusCode;

src/handlers/event/delete_on_reaction.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::{Context as _, Result};
+use eyre::{Context as _, Result};
 use poise::serenity_prelude::{Context, InteractionType, Reaction};
 
 pub async fn handle(ctx: &Context, reaction: &Reaction) -> Result<()> {

src/handlers/event/eta.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use eyre::Result;
 use once_cell::sync::Lazy;
 use poise::serenity_prelude::{Context, Message};
 use rand::seq::SliceRandom;

src/handlers/event/expand_link.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::Result;
+use eyre::Result;
 use poise::serenity_prelude::{Context, CreateAllowedMentions, CreateMessage, Message};
 
 use crate::utils;

src/handlers/event/mod.rs

@@ -1,6 +1,6 @@
 use crate::{api, Data};
 
-use color_eyre::eyre::{Report, Result};
+use eyre::{Report, Result};
 use log::{debug, info};
 use poise::serenity_prelude::{ActivityData, Context, FullEvent, OnlineStatus};
 use poise::FrameworkContext;

src/handlers/event/pluralkit.rs

@@ -1,7 +1,7 @@
 use crate::{api, Data};
 use std::time::Duration;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 use log::debug;
 use poise::serenity_prelude::{Context, Message};
 use tokio::time::sleep;

src/handlers/event/support_onboard.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::{eyre, Result};
+use eyre::{eyre, Result};
 use log::debug;
 use poise::serenity_prelude::{
 	ChannelType, Context, CreateAllowedMentions, CreateMessage, GuildChannel,

src/main.rs

@@ -5,15 +5,14 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use color_eyre::eyre::{eyre, Context as _, Report, Result};
-use color_eyre::owo_colors::OwoColorize;
-
+use eyre::{eyre, Context as _, Report, Result};
 use log::{info, warn};
 
 use poise::{
 	serenity_prelude as serenity, EditTracker, Framework, FrameworkOptions, PrefixFrameworkOptions,
 };
 
+use owo_colors::OwoColorize;
 use redis::ConnectionLike;
 
 use tokio::signal::ctrl_c;

src/storage/mod.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use color_eyre::eyre::Result;
+use eyre::Result;
 use log::{debug, info};
 use poise::serenity_prelude::UserId;
 use redis::{AsyncCommands as _, Client, FromRedisValue, ToRedisArgs};

src/utils/resolve_message.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use color_eyre::eyre::{eyre, Context as _, Result};
+use eyre::{eyre, Context as _, Result};
 use log::debug;
 use once_cell::sync::Lazy;
 use poise::serenity_prelude::{