summaryrefslogtreecommitdiff
path: root/src/commands/general
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands/general')
-rw-r--r--src/commands/general/ask.rs2
-rw-r--r--src/commands/general/bing.rs2
-rw-r--r--src/commands/general/config.rs4
-rw-r--r--src/commands/general/convert.rs2
-rw-r--r--src/commands/general/mod.rs2
-rw-r--r--src/commands/general/random.rs2
-rw-r--r--src/commands/general/version.rs2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/commands/general/ask.rs b/src/commands/general/ask.rs
index 7775fb7..75560e0 100644
--- a/src/commands/general/ask.rs
+++ b/src/commands/general/ask.rs
@@ -1,6 +1,6 @@
use crate::{consts, utils, Context};
-use color_eyre::eyre::{Context as _, Result};
+use eyre::{Context as _, Result};
/// Ask teawie a question!
#[poise::command(prefix_command, slash_command)]
diff --git a/src/commands/general/bing.rs b/src/commands/general/bing.rs
index 93c630b..d55d8ee 100644
--- a/src/commands/general/bing.rs
+++ b/src/commands/general/bing.rs
@@ -1,6 +1,6 @@
use crate::Context;
-use color_eyre::eyre::Result;
+use eyre::Result;
/// Make sure the wie is alive
#[poise::command(prefix_command)]
diff --git a/src/commands/general/config.rs b/src/commands/general/config.rs
index b60683b..ddc5cda 100644
--- a/src/commands/general/config.rs
+++ b/src/commands/general/config.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
use crate::{storage, Context};
use storage::{Properties, Settings};
-use color_eyre::eyre::{eyre, Result};
+use eyre::{OptionExt as _, Result};
use log::debug;
use poise::serenity_prelude::{CreateEmbed, GuildChannel, ReactionType};
use poise::{ChoiceParameter, CreateReply};
@@ -148,7 +148,7 @@ pub async fn get(
) -> Result<()> {
let gid = &ctx
.guild_id()
- .ok_or_else(|| eyre!("Failed to get GuildId from context!"))?;
+ .ok_or_eyre("Failed to get GuildId from context!")?;
let settings = ctx.data().storage.get_guild_settings(gid).await?;
let value = prop_to_val(&setting, &settings);
diff --git a/src/commands/general/convert.rs b/src/commands/general/convert.rs
index 1dd7f60..5e14175 100644
--- a/src/commands/general/convert.rs
+++ b/src/commands/general/convert.rs
@@ -1,7 +1,7 @@
use crate::Context;
use bottomify::bottom;
-use color_eyre::eyre::Result;
+use eyre::Result;
use poise::serenity_prelude::constants::MESSAGE_CODE_LIMIT;
#[allow(clippy::unused_async)]
diff --git a/src/commands/general/mod.rs b/src/commands/general/mod.rs
index 1031d5b..c872272 100644
--- a/src/commands/general/mod.rs
+++ b/src/commands/general/mod.rs
@@ -1,6 +1,6 @@
use crate::Data;
-use color_eyre::eyre::Report;
+use eyre::Report;
use poise::Command;
mod ask;
diff --git a/src/commands/general/random.rs b/src/commands/general/random.rs
index 477001e..7c7ceff 100644
--- a/src/commands/general/random.rs
+++ b/src/commands/general/random.rs
@@ -1,6 +1,6 @@
use crate::{api, consts, utils, Context};
-use color_eyre::eyre::Result;
+use eyre::Result;
#[allow(clippy::unused_async)]
#[poise::command(slash_command, subcommands("lore", "teawie", "shiggy"))]
diff --git a/src/commands/general/version.rs b/src/commands/general/version.rs
index 202607c..e392903 100644
--- a/src/commands/general/version.rs
+++ b/src/commands/general/version.rs
@@ -1,7 +1,7 @@
use crate::colors::Colors;
use crate::Context;
-use color_eyre::eyre::Result;
+use eyre::Result;
use poise::serenity_prelude::CreateEmbed;
use poise::CreateReply;