diff options
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/guild.rs | 2 | ||||
| -rw-r--r-- | src/events/message.rs | 11 | ||||
| -rw-r--r-- | src/events/mod.rs | 2 | ||||
| -rw-r--r-- | src/events/pinboard.rs | 12 | ||||
| -rw-r--r-- | src/events/reactboard.rs | 10 |
5 files changed, 17 insertions, 20 deletions
diff --git a/src/events/guild.rs b/src/events/guild.rs index 06af978..a677f04 100644 --- a/src/events/guild.rs +++ b/src/events/guild.rs @@ -1,7 +1,7 @@ use crate::{client::Data, storage}; use storage::settings::Settings; -use eyre::Result; +use anyhow::Result; use log::{debug, warn}; use poise::serenity_prelude::{Guild, UnavailableGuild}; diff --git a/src/events/message.rs b/src/events/message.rs index e115eb9..6f1e441 100644 --- a/src/events/message.rs +++ b/src/events/message.rs @@ -1,6 +1,6 @@ -use crate::{client::Data, consts}; +use crate::client::Data; -use eyre::{eyre, Result}; +use anyhow::{anyhow, Result}; use log::{debug, warn}; use poise::serenity_prelude::{Context, Message}; @@ -20,7 +20,7 @@ async fn should_echo(ctx: &Context, msg: &Message, data: &Data) -> Result<bool> let gid = msg .guild_id - .ok_or_else(|| eyre!("Couldn't get GuildId from {}!", msg.id))?; + .ok_or_else(|| anyhow!("Couldn't get GuildId from {}!", msg.id))?; if let Some(storage) = &data.storage { let settings = storage.get_guild_settings(&gid).await?; @@ -36,9 +36,6 @@ async fn should_echo(ctx: &Context, msg: &Message, data: &Data) -> Result<bool> let content = &msg.content; Ok(content == "🗿" - || consts::TEAMOJIS.contains(&content.as_str()) || content.to_ascii_lowercase() == "moyai" - || content - .to_ascii_lowercase() - .contains("twitter's recommendation algorithm")) + || content.to_ascii_lowercase() == "twitter's recommendation algorithm") } diff --git a/src/events/mod.rs b/src/events/mod.rs index 390c3a8..5b4c88d 100644 --- a/src/events/mod.rs +++ b/src/events/mod.rs @@ -1,6 +1,6 @@ use crate::{client::Data, consts}; -use eyre::Result; +use anyhow::Result; use log::{debug, info}; use poise::serenity_prelude::{self as serenity, CreateBotAuthParameters}; use serenity::FullEvent; diff --git a/src/events/pinboard.rs b/src/events/pinboard.rs index bb0dfe0..e1a092e 100644 --- a/src/events/pinboard.rs +++ b/src/events/pinboard.rs @@ -1,6 +1,6 @@ use crate::{client::Data, utils}; -use eyre::{eyre, Context as _, OptionExt as _, Result}; +use anyhow::{anyhow, Context as _, Result}; use log::{debug, warn}; use poise::serenity_prelude::{ ChannelId, Context, CreateAllowedMentions, CreateMessage, Message, MessageType, User, @@ -43,20 +43,20 @@ pub async fn handle(ctx: &Context, message: &Message, data: &Data) -> Result<()> let reference_id = message .clone() .message_reference - .ok_or_eyre("Couldn't get referenced message of pin!")? + .context("Couldn't get referenced message of pin!")? .message_id - .ok_or_eyre("Couldn't get id of referenced message of pin!")?; + .context("Couldn't get id of referenced message of pin!")?; let pins = message .channel_id .pins(ctx) .await - .wrap_err("Couldn't get a list of pins!?")?; + .context("Couldn't get a list of pins!?")?; let pin = pins .iter() .find(|pin| pin.id == reference_id) - .ok_or_else(|| eyre!("Couldn't find a pin for message {reference_id}!"))?; + .ok_or_else(|| anyhow!("Couldn't find a pin for message {reference_id}!"))?; redirect(ctx, pin, &message.author, &target).await?; pin.unpin(ctx).await?; @@ -75,7 +75,7 @@ async fn redirect(ctx: &Context, pin: &Message, pinner: &User, target: &ChannelI target .send_message(&ctx.http, message) .await - .wrap_err("Couldn't redirect message")?; + .context("Couldn't redirect message")?; Ok(()) } diff --git a/src/events/reactboard.rs b/src/events/reactboard.rs index c27bd80..fc806ac 100644 --- a/src/events/reactboard.rs +++ b/src/events/reactboard.rs @@ -1,7 +1,7 @@ use crate::{client::Data, storage, utils}; use storage::reactboard::ReactBoardEntry; -use eyre::{eyre, Context as _, Result}; +use anyhow::{Context as _, Result}; use log::{debug, warn}; use poise::serenity_prelude::{ Context, CreateMessage, EditMessage, GuildId, Message, MessageReaction, Reaction, @@ -12,15 +12,15 @@ pub async fn handle(ctx: &Context, reaction: &Reaction, data: &Data) -> Result<( let msg = reaction .message(&ctx.http) .await - .wrap_err("Couldn't get reaction from message!")?; + .context("Couldn't get reaction from message!")?; let matched = msg .clone() .reactions .into_iter() .find(|r| r.reaction_type == reaction.emoji) - .ok_or_else(|| { - eyre!( + .with_context(|| { + format!( "Couldn't find any matching reactions for {} in message {}!", reaction.emoji.as_data(), msg.id @@ -109,7 +109,7 @@ async fn send_to_reactboard( ctx.http .get_message(entry.posted_channel_id, entry.posted_message_id) .await - .wrap_err_with(|| { + .with_context(|| { format!( "Couldn't get previous message from ReactBoardEntry {} in Redis DB!", entry.original_message_id |
