summaryrefslogtreecommitdiff
path: root/src/events
diff options
context:
space:
mode:
authorseth <[email protected]>2024-12-19 16:26:18 -0500
committerGitHub <[email protected]>2024-12-19 21:26:18 +0000
commit2ae2b978f3fad7a58cb129333b36a210bb200488 (patch)
treeef12b9e1a29462c4de6b787fcf9c34d80b563b9f /src/events
parent77309844e6b890544bc4eea7f03bbafe493ba61e (diff)
jolly winter cleanup (#251)
* ci: bump DeterminateSystems/nix-installer-action from 13 to 16 Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 13 to 16. - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v13...v16) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump serde from 1.0.209 to 1.0.215 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.209 to 1.0.215. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.209...v1.0.215) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump serde_json from 1.0.127 to 1.0.133 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.127 to 1.0.133. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.127...v1.0.133) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump tokio from 1.40.0 to 1.41.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.41.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * crates: bump reqwest from 0.12.7 to 0.12.9 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.12.7 to 0.12.9. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.7...v0.12.9) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * nix: update flake.lock * ci: bump DeterminateSystems/magic-nix-cache-action from 7 to 8 Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 7 to 8. - [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases) - [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v7...v8) --- updated-dependencies: - dependency-name: DeterminateSystems/magic-nix-cache-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * treewide: debrand * nix: adopt new darwin sdk * nix: drop treefmt * nix: misc formatting changes * ci: cleanup * nix: pass version info to static builds * nix: mv {derivation,package}.nix * eyre -> anyhow * remove 2024 edition warnings * format with rustfmt * remove optional commands * ci: don't include internal variables in job names * nix: enable for lto builds --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: getchoo-bot[bot] <183349775+getchoo-bot[bot]@users.noreply.github.com>
Diffstat (limited to 'src/events')
-rw-r--r--src/events/guild.rs2
-rw-r--r--src/events/message.rs11
-rw-r--r--src/events/mod.rs2
-rw-r--r--src/events/pinboard.rs12
-rw-r--r--src/events/reactboard.rs10
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