aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock48
-rw-r--r--Cargo.toml29
-rw-r--r--calc/Cargo.toml14
-rw-r--r--calc/src/calc.pest (renamed from src/commands/calc.pest)0
-rw-r--r--calc/src/lib.rs189
-rw-r--r--src/bot.rs10
-rw-r--r--src/commands/game.rs5
-rw-r--r--src/commands/roll.rs212
-rw-r--r--src/db/mod.rs10
-rw-r--r--src/db/models.rs10
-rw-r--r--src/lib.rs3
-rw-r--r--src/log_setup.rs9
-rw-r--r--src/util/mod.rs20
13 files changed, 290 insertions, 269 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 62136b0..7daddff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1308,9 +1308,9 @@ dependencies = [
[[package]]
name = "matrixmultiply"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
dependencies = [
"autocfg",
"rawpointer",
@@ -1632,9 +1632,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
-version = "2.7.10"
+version = "2.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
dependencies = [
"memchr",
"thiserror",
@@ -1643,9 +1643,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.7.10"
+version = "2.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
dependencies = [
"pest",
"pest_generator",
@@ -1653,9 +1653,9 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.10"
+version = "2.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
dependencies = [
"pest",
"pest_meta",
@@ -1666,9 +1666,9 @@ dependencies = [
[[package]]
name = "pest_meta"
-version = "2.7.10"
+version = "2.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
dependencies = [
"once_cell",
"pest",
@@ -2249,9 +2249,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "safe_arch"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
dependencies = [
"bytemuck",
]
@@ -2657,9 +2657,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "statrs"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d08e5e1748192713cc281da8b16924fb46be7b0c2431854eadc785823e5696e"
+checksum = "b35a062dbadac17a42e0fc64c27f419b25d6fae98572eb43c8814c9e873d7721"
dependencies = [
"approx",
"lazy_static",
@@ -3025,8 +3025,6 @@ dependencies = [
"itertools",
"lazy_static",
"log",
- "pest",
- "pest_derive",
"poise",
"rand",
"regex",
@@ -3036,10 +3034,10 @@ dependencies = [
"serenity",
"sha1",
"songbird",
- "statrs",
"symphonia",
"tap",
"thiserror",
+ "thulani_calc",
"time",
"timeago",
"tokio",
@@ -3048,6 +3046,18 @@ dependencies = [
]
[[package]]
+name = "thulani_calc"
+version = "0.1.0"
+dependencies = [
+ "lazy_static",
+ "pest",
+ "pest_derive",
+ "rand",
+ "statrs",
+ "thiserror",
+]
+
+[[package]]
name = "time"
version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3751,9 +3761,9 @@ dependencies = [
[[package]]
name = "wide"
-version = "0.7.17"
+version = "0.7.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0e39d2c603fdc0504b12b458cf1f34e0b937ed2f4f2dc20796e3e86f34e11f"
+checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692"
dependencies = [
"bytemuck",
"safe_arch",
diff --git a/Cargo.toml b/Cargo.toml
index a4037c8..3c8d901 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,17 @@
+[workspace]
+members = [
+ "calc"
+]
+
+[workspace.package]
+authors = ["Nathan Perry <np@npry.dev>"]
+edition = "2021"
+
[package]
name = "thulani"
version = "0.3.1"
-authors = ["Nathan Perry <np@npry.dev>"]
-edition = "2021"
+edition.workspace = true
+authors.workspace = true
default-run = "thulani"
[[bin]]
@@ -14,8 +23,17 @@ default = ["db", "games"]
db = ["dep:diesel", "dep:diesel-async", "dep:diesel_async_migrations", "dep:tokio-postgres", "dep:deadpool-postgres"]
games = []
-[dependencies]
+[workspace.dependencies]
lazy_static = "1.4"
+rand = "0.8"
+
+thulani_calc.path = "calc"
+
+[dependencies]
+lazy_static.workspace = true
+rand.workspace = true
+thulani_calc.workspace = true
+
anyhow = "1.0"
thiserror = "1.0"
log = "0.4"
@@ -24,7 +42,6 @@ dotenv = "0.15"
chrono = "0.4"
time = "0.3"
fern = { version = "0.6", features = ["colored"] }
-rand = "0.8"
reqwest = { version = "0.11", features = ["json"] }
sha1 = { version = "0.10", features = ["std"] }
regex = "1.10"
@@ -32,14 +49,10 @@ itertools = "0.12"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
timeago = "0.4"
-statrs = "0.16"
fnv = "1.0"
clap = { version = "4.5", features = ["derive"] }
-pest = "2.7"
-pest_derive = "2.7"
-
envconfig = "0.10"
envconfig_derive = "0.10"
diff --git a/calc/Cargo.toml b/calc/Cargo.toml
new file mode 100644
index 0000000..fe2ecc3
--- /dev/null
+++ b/calc/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "thulani_calc"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+
+[dependencies]
+pest = "2.7"
+pest_derive = "2.7"
+thiserror = "1.0"
+statrs = "0.16"
+
+lazy_static.workspace = true
+rand.workspace = true
diff --git a/src/commands/calc.pest b/calc/src/calc.pest
index 07eeddb..07eeddb 100644
--- a/src/commands/calc.pest
+++ b/calc/src/calc.pest
diff --git a/calc/src/lib.rs b/calc/src/lib.rs
new file mode 100644
index 0000000..05b83a9
--- /dev/null
+++ b/calc/src/lib.rs
@@ -0,0 +1,189 @@
+use lazy_static::lazy_static;
+use pest::iterators::Pair;
+use rand::Rng;
+
+#[derive(pest_derive::Parser)]
+#[grammar = "calc.pest"]
+pub struct Calc;
+
+#[derive(Copy, Clone, thiserror::Error, Debug, PartialEq, Eq, Hash)]
+pub enum CalcError {
+ #[error("pest was unable to parse the input")]
+ Pest,
+
+ #[error("invalid number format")]
+ NumberFormat,
+
+ #[error("bad argument count")]
+ ArgCount,
+}
+
+impl Calc {
+ pub fn eval<S: AsRef<str>>(s: S) -> Result<f64, CalcError> {
+ use pest::{
+ iterators::Pairs,
+ pratt_parser::PrattParser,
+ Parser,
+ };
+
+ use self::Rule::*;
+
+ lazy_static! {
+ static ref CLIMBER: PrattParser<Rule> = {
+ use pest::pratt_parser::{
+ Assoc::*,
+ Op,
+ };
+
+ PrattParser::new()
+ .op(Op::infix(add, Left) | Op::infix(sub, Left) | Op::infix(modulo, Left))
+ .op(Op::infix(mul, Left) | Op::infix(div, Left))
+ .op(Op::infix(dice, Left))
+ .op(Op::infix(pow, Right))
+ .op(Op::postfix(EOI)) // discarded below
+ };
+ }
+
+ let result = Calc::parse(calc, s.as_ref()).map_err(|_| CalcError::Pest)?;
+
+ fn eval_single_pair(pair: Pair<Rule>) -> Result<f64, CalcError> {
+ let result = match pair.as_rule() {
+ oct | hex | binary => {
+ let base = match pair.as_rule() {
+ hex => 16,
+ oct => 8,
+ binary => 2,
+ _ => unreachable!(),
+ };
+
+ u64::from_str_radix(&pair.as_str()[2..], base)
+ .map_err(|_| CalcError::NumberFormat)? as f64
+ },
+ float => pair.as_str().parse::<f64>().map_err(|_| CalcError::NumberFormat)?,
+ expr | num => eval_expr(pair.into_inner())?,
+ unary_expr => {
+ let mut p = pair.into_inner();
+
+ let op = p.next().ok_or(CalcError::ArgCount)?;
+ let arg = eval_expr(p)?;
+
+ match op.as_rule() {
+ log => arg.ln(),
+ sqrt => arg.sqrt(),
+ sgn => arg.signum(),
+
+ sin => arg.sin(),
+ cos => arg.cos(),
+ tan => arg.tan(),
+ asin => arg.asin(),
+ acos => arg.acos(),
+ atan => arg.atan(),
+
+ sinh => arg.sinh(),
+ cosh => arg.cosh(),
+ tanh => arg.tanh(),
+ asinh => arg.asinh(),
+ acosh => arg.acosh(),
+ atanh => arg.atanh(),
+
+ exp => arg.exp(),
+ abs => arg.abs(),
+ ceil => arg.ceil(),
+ floor => arg.floor(),
+ round => arg.round(),
+ _ => unreachable!(),
+ }
+ },
+ binary_expr => {
+ let mut p = pair.into_inner();
+
+ let op = p.next().ok_or(CalcError::ArgCount)?;
+
+ let arg1 = eval_single_pair(p.next().ok_or(CalcError::ArgCount)?)?;
+ let arg2 = eval_single_pair(p.next().ok_or(CalcError::ArgCount)?)?;
+
+ assert!(p.next().is_none());
+
+ match op.as_rule() {
+ min => arg1.min(arg2),
+ max => arg1.max(arg2),
+ atan2 => arg1.atan2(arg2),
+ _ => unreachable!(),
+ }
+ },
+ suffix_expr => {
+ let mut p = pair.into_inner();
+
+ let arg = eval_expr(p.next().ok_or(CalcError::ArgCount)?.into_inner())?;
+ let op = p.next().ok_or(CalcError::ArgCount)?;
+
+ assert!(p.next().is_none());
+
+ match op.as_rule() {
+ factorial => statrs::function::gamma::gamma(arg + 1.),
+ _ => unreachable!(),
+ }
+ },
+ _ => unreachable!(),
+ };
+
+ Ok(result)
+ }
+
+ pub fn eval_expr(p: Pairs<Rule>) -> Result<f64, CalcError> {
+ CLIMBER
+ .map_primary(eval_single_pair)
+ .map_infix(|lhs, op, rhs| {
+ let lhs = lhs?;
+ let rhs = rhs?;
+
+ let result = match op.as_rule() {
+ add => lhs + rhs,
+ sub => lhs - rhs,
+ mul => lhs * rhs,
+ div => lhs / rhs,
+ pow => lhs.powf(rhs),
+ dice => {
+ let dice_count = lhs as usize;
+ let dice_faces = rhs as usize;
+
+ let mut rng = rand::thread_rng();
+ (0..dice_count)
+ .map(|_| rng.gen_range(1..(dice_faces + 1)))
+ .sum::<usize>() as f64
+ },
+ _ => unreachable!(),
+ };
+
+ Ok(result)
+ })
+ .map_postfix(|arg, _post| arg) // discard EOI
+ .parse(p)
+ }
+
+ eval_expr(result)
+ }
+}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ #[test]
+ fn test_calc_basics() {
+ assert_eq!(3., Calc::eval("1 + 2").unwrap());
+ assert_eq!(3.0f64.ln(), Calc::eval("log 3").unwrap());
+ assert!(6. - Calc::eval("3!").unwrap() < 0.0001);
+ assert_eq!(3., Calc::eval("max 3 2").unwrap());
+ }
+
+ #[test]
+ fn test_binary_unary() {
+ assert_eq!(3.0f64.ln(), Calc::eval("max log 3 log 2").unwrap());
+ }
+
+ #[test]
+ fn test_prefix_suffix() {
+ assert!(6. - Calc::eval("abs 3!").unwrap() < 0.0001);
+ }
+}
diff --git a/src/bot.rs b/src/bot.rs
index 6a2ae72..4942c98 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -57,10 +57,8 @@ use crate::{
err_msg,
util,
util::OAUTH_URL,
- Error,
PoiseContext,
PoiseData,
- Result,
};
pub struct HttpKey;
@@ -151,8 +149,8 @@ lazy_static! {
let restrict_path = CONFIG.restrict.as_ref().unwrap_or(&default_path);
let restrict_ids = File::open(restrict_path)
- .map_err(Error::from)
- .and_then(|f| serde_json::from_reader::<_, Vec<u64>>(f).map_err(Error::from));
+ .map_err(anyhow::Error::from)
+ .and_then(|f| serde_json::from_reader::<_, Vec<u64>>(f).map_err(anyhow::Error::from));
if let Err(ref e) = restrict_ids {
warn!("opening restrict file: {}", e);
@@ -211,7 +209,7 @@ fn on_err(err: FrameworkError<PoiseData, anyhow::Error>) -> BoxFuture<()> {
fn noop<U, E>(
_ctx: PrefixContext<'_, U, E>,
- ) -> BoxFuture<core::result::Result<(), FrameworkError<U, E>>> {
+ ) -> BoxFuture<Result<(), FrameworkError<U, E>>> {
Box::pin(async { Ok(()) })
}
@@ -365,7 +363,7 @@ fn after_handle(ctx: PoiseContext) -> BoxFuture<()> {
})
}
-pub async fn run() -> Result<()> {
+pub async fn run() -> anyhow::Result<()> {
let token = &CONFIG.discord.auth.token;
let sb_config = songbird::Config::default();
diff --git a/src/commands/game.rs b/src/commands/game.rs
index 3b16fd3..ba9ac69 100644
--- a/src/commands/game.rs
+++ b/src/commands/game.rs
@@ -36,7 +36,6 @@ use crate::{
bot::HttpKey,
util,
PoiseContext,
- Result,
CONFIG,
};
@@ -125,7 +124,7 @@ enum GameStatus {
impl FromStr for GameStatus {
type Err = anyhow::Error;
- fn from_str(s: &str) -> Result<Self> {
+ fn from_str(s: &str) -> anyhow::Result<Self> {
use std::char;
if s.starts_with('y') {
@@ -404,7 +403,7 @@ async fn _game(
Ok(())
}
-async fn load_spreadsheet(client: &reqwest::Client) -> Result<Vec<Vec<String>>> {
+async fn load_spreadsheet(client: &reqwest::Client) -> anyhow::Result<Vec<Vec<String>>> {
let mut u = SPREADSHEET_URL.clone();
u.query_pairs_mut()
diff --git a/src/commands/roll.rs b/src/commands/roll.rs
index abd7466..fd3102c 100644
--- a/src/commands/roll.rs
+++ b/src/commands/roll.rs
@@ -1,214 +1,18 @@
-use lazy_static::lazy_static;
-use log::{
- debug,
- error,
-};
-use pest::iterators::Pair;
-use rand::prelude::*;
-use std::result::Result as StdResult;
-use thiserror::Error;
-
-use crate::{
- util,
- PoiseContext,
-};
-
-#[derive(pest_derive::Parser)]
-#[grammar = "commands/calc.pest"]
-struct Calc;
-
-#[derive(Copy, Clone, Error, Debug, PartialEq, Eq, Hash)]
-pub(crate) enum CalcError {
- #[error("pest was unable to parse the input")]
- Pest,
-
- #[error("invalid number format")]
- NumberFormat,
-
- #[error("bad argument count")]
- ArgCount,
-}
-
-impl Calc {
- fn eval<S: AsRef<str>>(s: S) -> StdResult<f64, CalcError> {
- use pest::{
- iterators::Pairs,
- pratt_parser::PrattParser,
- Parser,
- };
-
- use self::Rule::*;
-
- lazy_static! {
- static ref CLIMBER: PrattParser<Rule> = {
- use pest::pratt_parser::{
- Assoc::*,
- Op,
- };
-
- PrattParser::new()
- .op(Op::infix(add, Left) | Op::infix(sub, Left) | Op::infix(modulo, Left))
- .op(Op::infix(mul, Left) | Op::infix(div, Left))
- .op(Op::infix(dice, Left))
- .op(Op::infix(pow, Right))
- .op(Op::postfix(EOI)) // discarded below
- };
- }
-
- let result = Calc::parse(calc, s.as_ref()).map_err(|_| CalcError::Pest)?;
-
- fn eval_single_pair(pair: Pair<Rule>) -> StdResult<f64, CalcError> {
- let result = match pair.as_rule() {
- oct | hex | binary => {
- let base = match pair.as_rule() {
- hex => 16,
- oct => 8,
- binary => 2,
- _ => unreachable!(),
- };
-
- u64::from_str_radix(&pair.as_str()[2..], base)
- .map_err(|_| CalcError::NumberFormat)? as f64
- },
- float => pair.as_str().parse::<f64>().map_err(|_| CalcError::NumberFormat)?,
- expr | num => eval_expr(pair.into_inner())?,
- unary_expr => {
- let mut p = pair.into_inner();
-
- let op = p.next().ok_or(CalcError::ArgCount)?;
- let arg = eval_expr(p)?;
-
- match op.as_rule() {
- log => arg.ln(),
- sqrt => arg.sqrt(),
- sgn => arg.signum(),
-
- sin => arg.sin(),
- cos => arg.cos(),
- tan => arg.tan(),
- asin => arg.asin(),
- acos => arg.acos(),
- atan => arg.atan(),
-
- sinh => arg.sinh(),
- cosh => arg.cosh(),
- tanh => arg.tanh(),
- asinh => arg.asinh(),
- acosh => arg.acosh(),
- atanh => arg.atanh(),
-
- exp => arg.exp(),
- abs => arg.abs(),
- ceil => arg.ceil(),
- floor => arg.floor(),
- round => arg.round(),
- _ => unreachable!(),
- }
- },
- binary_expr => {
- let mut p = pair.into_inner();
-
- let op = p.next().ok_or(CalcError::ArgCount)?;
-
- let arg1 = eval_single_pair(p.next().ok_or(CalcError::ArgCount)?)?;
- let arg2 = eval_single_pair(p.next().ok_or(CalcError::ArgCount)?)?;
-
- assert!(p.next().is_none());
-
- match op.as_rule() {
- min => arg1.min(arg2),
- max => arg1.max(arg2),
- atan2 => arg1.atan2(arg2),
- _ => unreachable!(),
- }
- },
- suffix_expr => {
- let mut p = pair.into_inner();
-
- let arg = eval_expr(p.next().ok_or(CalcError::ArgCount)?.into_inner())?;
- let op = p.next().ok_or(CalcError::ArgCount)?;
-
- assert!(p.next().is_none());
-
- match op.as_rule() {
- factorial => statrs::function::gamma::gamma(arg + 1.),
- _ => unreachable!(),
- }
- },
- _ => unreachable!(),
- };
-
- Ok(result)
- }
-
- fn eval_expr(p: Pairs<Rule>) -> StdResult<f64, CalcError> {
- CLIMBER
- .map_primary(eval_single_pair)
- .map_infix(|lhs, op, rhs| {
- let lhs = lhs?;
- let rhs = rhs?;
-
- let result = match op.as_rule() {
- add => lhs + rhs,
- sub => lhs - rhs,
- mul => lhs * rhs,
- div => lhs / rhs,
- pow => lhs.powf(rhs),
- dice => {
- let dice_count = lhs as usize;
- let dice_faces = rhs as usize;
-
- let mut rng = thread_rng();
- (0..dice_count)
- .map(|_| rng.gen_range(1..(dice_faces + 1)))
- .sum::<usize>() as f64
- },
- _ => unreachable!(),
- };
-
- Ok(result)
- })
- .map_postfix(|arg, _post| arg) // discard EOI
- .parse(p)
- }
-
- eval_expr(result)
- }
-}
-
-#[cfg(test)]
-mod test {
- use super::*;
-
- #[test]
- fn test_calc_basics() {
- assert_eq!(3., Calc::eval("1 + 2").unwrap());
- assert_eq!(3.0f64.ln(), Calc::eval("log 3").unwrap());
- assert!(6. - Calc::eval("3!").unwrap() < 0.0001);
- assert_eq!(3., Calc::eval("max 3 2").unwrap());
- }
-
- #[test]
- fn test_binary_unary() {
- assert_eq!(3.0f64.ln(), Calc::eval("max log 3 log 2").unwrap());
- }
-
- #[test]
- fn test_prefix_suffix() {
- assert!(6. - Calc::eval("abs 3!").unwrap() < 0.0001);
- }
-}
+use crate::util;
/// Roll some number of dice or perform a calculation.
#[poise::command(prefix_command, guild_only, aliases("calc", "calculate"))]
-pub async fn roll(ctx: PoiseContext<'_>, #[rest] rest: String) -> anyhow::Result<()> {
- match Calc::eval(&rest) {
+pub async fn roll<U: Send + Sync>(
+ ctx: poise::Context<'_, U, anyhow::Error>,
+ #[rest] rest: String,
+) -> anyhow::Result<()> {
+ match thulani_calc::Calc::eval(&rest) {
Ok(result) => {
- debug!("got calc result '{}'", result);
+ log::debug!("got calc result '{}'", result);
util::reply(ctx, result.to_string()).await?;
},
Err(e) => {
- error!("error encountered reading calc '{}': {}", rest, e);
+ log::error!("error encountered reading calc '{}': {}", rest, e);
util::reply(ctx, "I COULDN'T READ THAT YOU FUCK").await?;
},
}
diff --git a/src/db/mod.rs b/src/db/mod.rs
index 0a6ec9c..74f67b1 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -4,7 +4,11 @@ use std::{
str::FromStr,
};
-use anyhow::anyhow;
+use anyhow::{
+ anyhow,
+ Error,
+ Result,
+};
use chrono::{
DateTime,
NaiveDate,
@@ -34,10 +38,6 @@ use serenity::FutureExt;
pub use self::models::*;
use self::schema::*;
-use crate::{
- Error,
- Result,
-};
mod models;
mod schema;
diff --git a/src/db/models.rs b/src/db/models.rs
index 1165368..603887e 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -1,3 +1,7 @@
+use anyhow::{
+ Error,
+ Result,
+};
use chrono::naive::NaiveDateTime;
use diesel::{
prelude::*,
@@ -11,11 +15,7 @@ use diesel_async::{
};
use sha1::Digest;
-use crate::{
- db::schema::*,
- Error,
- Result,
-};
+use crate::db::schema::*;
#[derive(Queryable, Identifiable, PartialEq, Debug, Clone)]
#[diesel(table_name = memes)]
diff --git a/src/lib.rs b/src/lib.rs
index b9009be..13a93e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,8 +25,5 @@ pub use crate::{
util::*,
};
-pub type Error = anyhow::Error;
-pub type Result<T> = anyhow::Result<T>;
-
pub type PoiseData = ();
pub type PoiseContext<'a> = poise::Context<'a, PoiseData, anyhow::Error>;
diff --git a/src/log_setup.rs b/src/log_setup.rs
index 780ab78..e483c2d 100644
--- a/src/log_setup.rs
+++ b/src/log_setup.rs
@@ -1,14 +1,9 @@
-use crate::{
- Error,
- Result,
-};
-
use fern::colors::{
Color,
ColoredLevelConfig,
};
-pub fn init(file_output: bool) -> Result<()> {
+pub fn init(file_output: bool) -> anyhow::Result<()> {
let colors = ColoredLevelConfig::new()
.info(Color::Green)
.debug(Color::BrightBlue)
@@ -52,5 +47,5 @@ pub fn init(file_output: bool) -> Result<()> {
);
}
- logger.apply().map_err(Error::from)
+ logger.apply().map_err(anyhow::Error::from)
}
diff --git a/src/util/mod.rs b/src/util/mod.rs
index f362ff7..f959a37 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -32,7 +32,6 @@ use url::Url;
use crate::{
commands::playback::songbird,
PoiseContext,
- Result,
CONFIG,
};
@@ -47,7 +46,7 @@ pub async fn currently_playing(ctx: PoiseContext<'_>) -> bool {
call.queue().current().is_some()
}
-pub async fn users_listening(ctx: &Context) -> Result<bool> {
+pub async fn users_listening(ctx: &Context) -> anyhow::Result<bool> {
let channel = CONFIG.discord.voice_channel().to_channel(&ctx).await?;
let res = channel
@@ -100,12 +99,12 @@ pub fn err_msg<'a, U, E>(err: &'a FrameworkError<U, E>) -> Option<&'a Message> {
}
#[inline]
-pub fn tts(ctx: PoiseContext<'_>) -> Option<bool> {
+pub fn tts<U, E>(ctx: poise::Context<'_, U, E>) -> Option<bool> {
msg(ctx).map(|msg| msg.tts)
}
#[inline]
-pub fn unwrap_tts(ctx: PoiseContext<'_>) -> bool {
+pub fn unwrap_tts<U, E>(ctx: poise::Context<'_, U, E>) -> bool {
tts(ctx).unwrap_or(false)
}
@@ -115,12 +114,15 @@ pub async fn send(
channel: ChannelId,
text: impl AsRef<str>,
tts: bool,
-) -> Result<()> {
+) -> anyhow::Result<()> {
send_result(ctx, channel, text, tts).await.map(|_| ())
}
#[inline]
-pub async fn reply(ctx: PoiseContext<'_>, text: impl AsRef<str>) -> Result<poise::ReplyHandle> {
+pub async fn reply<U, E>(
+ ctx: poise::Context<'_, U, E>,
+ text: impl AsRef<str>,
+) -> Result<poise::ReplyHandle, serenity::Error> {
let handle =
poise::send_reply(ctx, CreateReply::default().tts(unwrap_tts(ctx)).content(text.as_ref()))
.await?;
@@ -129,7 +131,7 @@ pub async fn reply(ctx: PoiseContext<'_>, text: impl AsRef<str>) -> Result<poise
}
#[inline]
-pub async fn react(ctx: PoiseContext<'_>, react: ReactionType) -> Result<Reaction> {
+pub async fn react(ctx: PoiseContext<'_>, react: ReactionType) -> anyhow::Result<Reaction> {
let react = msg(ctx).ok_or_else(|| anyhow::anyhow!("elp"))?.react(ctx, react).await?;
Ok(react)
}
@@ -139,7 +141,7 @@ pub async fn send_result(
channel: ChannelId,
text: impl AsRef<str>,
tts: bool,
-) -> Result<MessageId> {
+) -> anyhow::Result<MessageId> {
let text = text.as_ref();
debug!("sending message {:?} to channel {:?} (tts: {})", text, channel, tts);
@@ -170,7 +172,7 @@ lazy_static! {
.unwrap();
}
-pub async fn ytdl_url(uri: &str) -> Result<String> {
+pub async fn ytdl_url(uri: &str) -> anyhow::Result<String> {
use serde_json::Value;
use tokio::process::Command;
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-10 19:22:12 -0400