diff --git a/Cargo.lock b/Cargo.lock index de573b2..ad2d737 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -438,7 +438,7 @@ dependencies = [ "sled", "streem", "teloxide", - "thiserror 1.0.69", + "thiserror 2.0.6", "time", "tokio", "toml", @@ -453,15 +453,16 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.1.12" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ - "itertools 0.9.0", + "include_dir", + "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.90", ] [[package]] @@ -2079,6 +2080,25 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.3" @@ -2145,15 +2165,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2544,12 +2555,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -[[package]] -name = "never" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" - [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -3813,6 +3818,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + [[package]] name = "serde_with_macros" version = "1.5.2" @@ -4103,21 +4118,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "teloxide" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63345cf32a8850ebddcdd769dc2d5193d5e231262d5dada264b79da01a664da" +checksum = "5f79dd283eb21b90451c03fa7c7f83b9985130efb876b33bad89a2c208ccbc16" dependencies = [ "aquamarine", "bytes", "derive_more", "dptree", + "either", "futures", "log", "mime", "pin-project", "serde", "serde_json", - "serde_with_macros", "teloxide-core", "teloxide-macros", "thiserror 1.0.69", @@ -4129,9 +4144,9 @@ dependencies = [ [[package]] name = "teloxide-core" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303db260110c238e3af77bb9dff18bf7a5b5196f783059b0852aab75f91d5a16" +checksum = "9e1642a7ef10e7af63b8298c8d13c0f986d4fc646d42649ff060359607f62f69" dependencies = [ "bitflags 1.3.2", "bytes", @@ -4141,14 +4156,13 @@ dependencies = [ "futures", "log", "mime", - "never", "once_cell", "pin-project", "rc-box", "reqwest 0.11.27", "serde", "serde_json", - "serde_with_macros", + "serde_with", "take_mut", "takecell", "thiserror 1.0.69", @@ -4160,9 +4174,9 @@ dependencies = [ [[package]] name = "teloxide-macros" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1d653b093dba5e44cada57a516f572167df37b8a619443e59c8c517bb6d804" +checksum = "7e2d33d809c3e7161a9ab18bedddf98821245014f0a78fa4d2c9430b2ec018c1" dependencies = [ "heck 0.4.1", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index e5ae133..523f3e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,12 +67,12 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sled = "0.34.7" streem = "0.2.0" -teloxide = { version = "0.12.0", default-features = false, features = [ +teloxide = { version = "0.13.0", default-features = false, features = [ "ctrlc_handler", "macros", "rustls", ] } -thiserror = "1.0" +thiserror = "2.0" time = { version = "0.3.17", features = ["serde"] } tracing = "0.1" tracing-error = "0.2" diff --git a/src/telegram.rs b/src/telegram.rs index 9a80edc..273ce99 100644 --- a/src/telegram.rs +++ b/src/telegram.rs @@ -75,7 +75,8 @@ pub(crate) fn start(admin_handle: String, db: Db, token: &str) { fn is_admin(admin_handle: &str, message: &Message) -> bool { message - .from() + .from + .as_ref() .and_then(|user| user.username.as_deref()) .map(|username| username == admin_handle) .unwrap_or(false)