diff --git a/Cargo.lock b/Cargo.lock index 890eb89..7014914 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -257,7 +257,7 @@ dependencies = [ "eyre", "indenter", "once_cell", - "owo-colors", + "owo-colors 3.5.0", "tracing-error", ] @@ -268,7 +268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", - "owo-colors", + "owo-colors 3.5.0", "tracing-core", "tracing-error", ] @@ -515,9 +515,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -1136,6 +1136,12 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +[[package]] +name = "owo-colors" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1388,10 +1394,12 @@ dependencies = [ "color-eyre", "dotenvy", "env_logger", + "eyre", "gray_matter", "log", "octocrab", "once_cell", + "owo-colors 4.0.0", "poise", "rand", "redis 0.24.0", diff --git a/Cargo.toml b/Cargo.toml index 8c3f3df..13040b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,10 +19,12 @@ async-trait = "0.1.77" color-eyre = "0.6.2" dotenvy = "0.15.7" env_logger = "0.11.1" +eyre = "0.6.11" log = "0.4.20" poise = "0.6.1" octocrab = "0.33.3" once_cell = "1.19.0" +owo-colors = "4.0.0" rand = "0.8.5" redis = { version = "0.24.0", features = ["tokio-comp", "tokio-rustls-comp"] } redis-macros = "0.2.1" diff --git a/src/api/dadjoke.rs b/src/api/dadjoke.rs index aecbb5e..b80d5ec 100644 --- a/src/api/dadjoke.rs +++ b/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; diff --git a/src/api/pluralkit.rs b/src/api/pluralkit.rs index 9370418..4c18a6b 100644 --- a/src/api/pluralkit.rs +++ b/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; diff --git a/src/api/prism_meta.rs b/src/api/prism_meta.rs index aaa21ea..de6c04b 100644 --- a/src/api/prism_meta.rs +++ b/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}; diff --git a/src/api/rory.rs b/src/api/rory.rs index 7dd95c5..7e2a1a6 100644 --- a/src/api/rory.rs +++ b/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}; diff --git a/src/commands/general/joke.rs b/src/commands/general/joke.rs index f1790a0..e31c395 100644 --- a/src/commands/general/joke.rs +++ b/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)] diff --git a/src/commands/general/members.rs b/src/commands/general/members.rs index 99a3c03..adbd5c2 100644 --- a/src/commands/general/members.rs +++ b/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; diff --git a/src/commands/general/ping.rs b/src/commands/general/ping.rs index 41634dc..8e46531 100644 --- a/src/commands/general/ping.rs +++ b/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)] diff --git a/src/commands/general/rory.rs b/src/commands/general/rory.rs index 5047a83..ae61ab6 100644 --- a/src/commands/general/rory.rs +++ b/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; diff --git a/src/commands/general/say.rs b/src/commands/general/say.rs index 796d55b..645cf4e 100644 --- a/src/commands/general/say.rs +++ b/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 diff --git a/src/commands/general/stars.rs b/src/commands/general/stars.rs index c1b850c..2cd9013 100644 --- a/src/commands/general/stars.rs +++ b/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; diff --git a/src/commands/general/tag.rs b/src/commands/general/tag.rs index d07c821..a636ad5 100644 --- a/src/commands/general/tag.rs +++ b/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; diff --git a/src/commands/mod.rs b/src/commands/mod.rs index c13691d..00130a7 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -1,6 +1,6 @@ use crate::Data; -use color_eyre::eyre::Report; +use eyre::Report; use poise::Command; mod general; diff --git a/src/handlers/error.rs b/src/handlers/error.rs index 2884ed9..4dce9b5 100644 --- a/src/handlers/error.rs +++ b/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); diff --git a/src/handlers/event/analyze_logs/issues.rs b/src/handlers/event/analyze_logs/issues.rs index 79968dd..11208c7 100644 --- a/src/handlers/event/analyze_logs/issues.rs +++ b/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; diff --git a/src/handlers/event/analyze_logs/mod.rs b/src/handlers/event/analyze_logs/mod.rs index aa25679..15df9eb 100644 --- a/src/handlers/event/analyze_logs/mod.rs +++ b/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, diff --git a/src/handlers/event/analyze_logs/providers/0x0.rs b/src/handlers/event/analyze_logs/providers/0x0.rs index 9a81771..fe8c7f0 100644 --- a/src/handlers/event/analyze_logs/providers/0x0.rs +++ b/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; diff --git a/src/handlers/event/analyze_logs/providers/attachment.rs b/src/handlers/event/analyze_logs/providers/attachment.rs index b69640b..892f19b 100644 --- a/src/handlers/event/analyze_logs/providers/attachment.rs +++ b/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> { diff --git a/src/handlers/event/analyze_logs/providers/haste.rs b/src/handlers/event/analyze_logs/providers/haste.rs index 885d70e..c72e3b3 100644 --- a/src/handlers/event/analyze_logs/providers/haste.rs +++ b/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; diff --git a/src/handlers/event/analyze_logs/providers/mclogs.rs b/src/handlers/event/analyze_logs/providers/mclogs.rs index 6663940..96a9108 100644 --- a/src/handlers/event/analyze_logs/providers/mclogs.rs +++ b/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; diff --git a/src/handlers/event/analyze_logs/providers/mod.rs b/src/handlers/event/analyze_logs/providers/mod.rs index 8185056..2d13d6d 100644 --- a/src/handlers/event/analyze_logs/providers/mod.rs +++ b/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"] diff --git a/src/handlers/event/analyze_logs/providers/paste_gg.rs b/src/handlers/event/analyze_logs/providers/paste_gg.rs index a5a53c9..92063b9 100644 --- a/src/handlers/event/analyze_logs/providers/paste_gg.rs +++ b/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; diff --git a/src/handlers/event/analyze_logs/providers/pastebin.rs b/src/handlers/event/analyze_logs/providers/pastebin.rs index 0d870ab..75b9c89 100644 --- a/src/handlers/event/analyze_logs/providers/pastebin.rs +++ b/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; diff --git a/src/handlers/event/delete_on_reaction.rs b/src/handlers/event/delete_on_reaction.rs index cd8b65e..a15e113 100644 --- a/src/handlers/event/delete_on_reaction.rs +++ b/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<()> { diff --git a/src/handlers/event/eta.rs b/src/handlers/event/eta.rs index dcf9dbe..db6cc41 100644 --- a/src/handlers/event/eta.rs +++ b/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; diff --git a/src/handlers/event/expand_link.rs b/src/handlers/event/expand_link.rs index 3c41c61..05f6be0 100644 --- a/src/handlers/event/expand_link.rs +++ b/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; diff --git a/src/handlers/event/mod.rs b/src/handlers/event/mod.rs index 5ad4baa..508b411 100644 --- a/src/handlers/event/mod.rs +++ b/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; diff --git a/src/handlers/event/pluralkit.rs b/src/handlers/event/pluralkit.rs index 12f3fc7..0089403 100644 --- a/src/handlers/event/pluralkit.rs +++ b/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; diff --git a/src/handlers/event/support_onboard.rs b/src/handlers/event/support_onboard.rs index 3c7a6a1..4308de6 100644 --- a/src/handlers/event/support_onboard.rs +++ b/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, diff --git a/src/main.rs b/src/main.rs index 31051ff..6a8825f 100644 --- a/src/main.rs +++ b/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; diff --git a/src/storage/mod.rs b/src/storage/mod.rs index ab2c63a..a1c17e3 100644 --- a/src/storage/mod.rs +++ b/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}; diff --git a/src/utils/resolve_message.rs b/src/utils/resolve_message.rs index f20d337..58657f5 100644 --- a/src/utils/resolve_message.rs +++ b/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::{