cargo fmt

Cargo.lock

@@ -17,6 +17,12 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -57,6 +63,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -163,6 +178,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -188,6 +212,36 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -370,6 +424,9 @@ name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "envconfig"
@@ -417,6 +474,28 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -429,12 +508,29 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -501,6 +597,17 @@ dependencies = [
  "futures-util",
 ]
 
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.31"
@@ -558,6 +665,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.2"
@@ -584,6 +702,7 @@ dependencies = [
  "diesel-async",
  "dotenvy",
  "envconfig",
+ "serde",
  "teloxide",
  "tokio",
 ]
@@ -599,6 +718,20 @@ name = "hashbrown"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.2",
+]
 
 [[package]]
 name = "heck"
@@ -612,6 +745,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -621,6 +763,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -962,6 +1113,17 @@ version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
+[[package]]
+name = "libsqlite3-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.9.3"
@@ -1133,6 +1295,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -1231,7 +1399,7 @@ dependencies = [
  "hmac",
  "md-5",
  "memchr",
- "rand",
+ "rand 0.9.0",
  "sha2",
  "stringprep",
 ]
@@ -1317,17 +1485,38 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
- "rand_chacha",
+ "rand_chacha 0.9.0",
- "rand_core",
+ "rand_core 0.9.3",
  "zerocopy",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.9.0"
@@ -1335,7 +1524,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -1344,7 +1542,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.2",
 ]
 
 [[package]]
@@ -1630,6 +1828,9 @@ name = "smallvec"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "socket2"
@@ -1641,6 +1842,159 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0"
+dependencies = [
+ "bytes",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.15.2",
+ "hashlink",
+ "indexmap 2.8.0",
+ "log",
+ "memchr",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck",
+ "hex",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sqlx-core",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn",
+ "tempfile",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
+dependencies = [
+ "atoi",
+ "base64",
+ "bitflags",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540"
+dependencies = [
+ "atoi",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "serde_urlencoded",
+ "sqlx-core",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -1730,6 +2084,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
+ "sqlx",
  "teloxide-core",
  "teloxide-macros",
  "thiserror",
@@ -1789,7 +2144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
  "fastrand",
- "getrandom",
+ "getrandom 0.3.2",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -1929,7 +2284,7 @@ dependencies = [
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand",
+ "rand 0.9.0",
  "socket2",
  "tokio",
  "tokio-util",
@@ -1993,10 +2348,23 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.33"
@@ -2087,7 +2455,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.2",
 ]
 
 [[package]]
@@ -2281,6 +2649,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -2299,6 +2676,21 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -2331,6 +2723,12 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -2343,6 +2741,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -2355,6 +2759,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -2379,6 +2789,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -2391,6 +2807,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -2403,6 +2825,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -2415,6 +2843,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"

Cargo.toml

@@ -10,5 +10,6 @@ diesel = { version = "2.2.8", features = ["postgres"] }
 diesel-async = { version = "0.5.2", features = ["bb8", "postgres"] }
 dotenvy = "0.15.7"
 envconfig = "0.11.0"
-teloxide = { version = "0.14.0", features = ["macros"] }
+serde = { version = "1.0.219", features = ["derive", "serde_derive"] }
+teloxide = { version = "0.14.0", features = ["macros", "postgres-storage-nativetls"] }
 tokio = { version = "1.44.1", features = ["rt-multi-thread", "macros"] }

migrations/2025-04-03-130758_message_literal_map/down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS messages;

migrations/2025-04-03-130758_message_literal_map/up.sql

@@ -0,0 +1,7 @@
+CREATE TABLE messages (
+    id SERIAL PRIMARY KEY,
+    chat_id BIGINT NOT NULL,
+    message_id BIGINT NOT NULL,
+    token VARCHAR(255) NOT NULL,
+    UNIQUE (chat_id, message_id)
+);

migrations/2025-04-03-134446_token_map/down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS literals;

migrations/2025-04-03-134446_token_map/up.sql

@@ -0,0 +1,5 @@
+CREATE TABLE literals (
+    id SERIAL PRIMARY KEY,
+    token VARCHAR(255) UNIQUE NOT NULL,
+    value TEXT
+);

migrations/2025-04-03-135748_litral_value_not_null/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE literals
+ALTER COLUMN value DROP NOT NULL;

migrations/2025-04-03-135748_litral_value_not_null/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE literals
+ALTER COLUMN value SET NOT NULL;

src/admin.rs

@@ -1,13 +1,10 @@
 use teloxide::{
-    dispatching::dialogue::GetChatId,
-    payloads::SendMessageSetters,
     prelude::*,
-    types::InputFile,
     utils::{command::BotCommands, render::RenderMessageTextHelper},
 };
 
-use crate::LogMsg;
 use crate::db::DB;
+use crate::LogMsg;
 
 // These are should not appear in /help
 #[derive(BotCommands, Clone)]

src/db.rs

@@ -5,16 +5,13 @@ use crate::Config;
 use self::models::*;
 
 use diesel::prelude::*;
-//use diesel::query_dsl::methods::FilterDsl;
+use diesel_async::pooled_connection::bb8::Pool;
-//use diesel::{prelude::*, r2d2::{ConnectionManager, Pool}};
+use diesel_async::pooled_connection::AsyncDieselConnectionManager;
 use diesel_async::AsyncPgConnection;
 use diesel_async::RunQueryDsl;
-use diesel_async::pooled_connection::AsyncDieselConnectionManager;
-use diesel_async::pooled_connection::bb8::Pool;
 
 #[derive(Clone)]
 pub struct DB {
-    //pool: Pool<ConnectionManager<AsyncPgConnection>>
     pool: diesel_async::pooled_connection::bb8::Pool<AsyncPgConnection>,
 }
 
@@ -22,18 +19,12 @@ impl DB {
     pub async fn new<S: Into<String>>(db_url: S) -> Self {
         let config = AsyncDieselConnectionManager::<diesel_async::AsyncPgConnection>::new(db_url);
         let pool = Pool::builder().build(config).await.unwrap();
-        //let mg = diesel::r2d2::ConnectionManager::new(db_url);
-        //let pool = diesel::r2d2::Pool::builder()
-        //    .max_size(15)
-        //    .build(mg)
-        //    .unwrap();
         DB { pool }
     }
 
     pub async fn get_users(&mut self) -> Vec<User> {
         use self::schema::users::dsl::*;
         let mut conn = self.pool.get().await.unwrap();
-        //let mut conn = AsyncPgConnection::establish(&std::env::var("DATABASE_URL").unwrap()).await.unwrap();
         users
             .filter(id.gt(0))
             .load::<User>(&mut conn)
@@ -44,8 +35,6 @@ impl DB {
     pub async fn set_admin(&mut self, userid: i64, isadmin: bool) {
         use self::schema::users::dsl::*;
         let connection = &mut self.pool.get().await.unwrap();
-        //diesel::update(users).filter(id.eq(userid)).set(is_admin.eq(true)).execute(connection);
-        //diesel::update(users).filter(id.eq(userid)).set(is_admin.eq(true)).load(connection).await.unwrap();
         diesel::update(users)
             .filter(id.eq(userid))
             .set(is_admin.eq(isadmin))
@@ -74,4 +63,109 @@ impl DB {
                 .unwrap(),
         }
     }
+
+    pub async fn get_message(
+        &mut self,
+        chatid: i64,
+        messageid: i32,
+    ) -> Result<Option<Message>, Box<dyn std::error::Error>> {
+        use self::schema::messages::dsl::*;
+        let conn = &mut self.pool.get().await.unwrap();
+
+        let msg = messages
+            .filter(chat_id.eq(chatid))
+            .filter(message_id.eq(messageid as i64))
+            .first::<Message>(conn)
+            .await
+            .optional()?;
+
+        Ok(msg)
+    }
+
+    pub async fn get_message_literal(
+        &mut self,
+        chatid: i64,
+        messageid: i32,
+    ) -> Result<Option<String>, Box<dyn std::error::Error>> {
+        let msg = self.get_message(chatid, messageid).await?;
+        Ok(msg.map(|m| m.token))
+    }
+
+    pub async fn set_message_literal(
+        &mut self,
+        chatid: i64,
+        messageid: i32,
+        literal: &str,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        use self::schema::messages::dsl::*;
+        let conn = &mut self.pool.get().await?;
+
+        let msg = self.clone().get_message(chatid, messageid).await?;
+
+        match msg {
+            Some(msg) => {
+                diesel::update(messages)
+                    .filter(id.eq(msg.id))
+                    .set(token.eq(literal))
+                    .execute(conn)
+                    .await?;
+            }
+            None => {
+                diesel::insert_into(messages)
+                    .values((
+                        chat_id.eq(chatid),
+                        message_id.eq(messageid as i64),
+                        token.eq(literal),
+                    ))
+                    .execute(conn)
+                    .await?;
+            }
+        };
+
+        Ok(())
+    }
+
+    async fn get_literal(
+        &mut self,
+        literal: &str,
+    ) -> Result<Option<Literal>, Box<dyn std::error::Error>> {
+        use self::schema::literals::dsl::*;
+        let conn = &mut self.pool.get().await.unwrap();
+
+        let literal = literals
+            .filter(token.eq(literal))
+            .first::<Literal>(conn)
+            .await
+            .optional()?;
+
+        Ok(literal)
+    }
+
+    pub async fn get_literal_value(
+        &mut self,
+        literal: &str,
+    ) -> Result<Option<String>, Box<dyn std::error::Error>> {
+        let literal = self.get_literal(literal).await?;
+
+        Ok(literal.map(|l| l.value))
+    }
+
+    pub async fn set_literal(
+        &mut self,
+        literal: &str,
+        valuestr: &str,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        use self::schema::literals::dsl::*;
+        let conn = &mut self.pool.get().await.unwrap();
+
+        diesel::insert_into(literals)
+            .values((token.eq(literal), value.eq(valuestr)))
+            .on_conflict(token)
+            .do_update()
+            .set(value.eq(valuestr))
+            .execute(conn)
+            .await?;
+
+        Ok(())
+    }
 }

src/db/models.rs

@@ -4,6 +4,23 @@
 #![allow(clippy::all)]
 
 use diesel::prelude::*;
+#[derive(Queryable, Debug)]
+#[diesel(table_name = literals)]
+pub struct Literal {
+    pub id: i32,
+    pub token: String,
+    pub value: String,
+}
+
+#[derive(Queryable, Debug)]
+#[diesel(table_name = messages)]
+pub struct Message {
+    pub id: i32,
+    pub chat_id: i64,
+    pub message_id: i64,
+    pub token: String,
+}
+
 #[derive(Queryable, Debug)]
 #[diesel(table_name = users)]
 pub struct User {

src/db/schema.rs

@@ -1,8 +1,29 @@
 // @generated automatically by Diesel CLI.
 
+diesel::table! {
+    literals (id) {
+        id -> Int4,
+        #[max_length = 255]
+        token -> Varchar,
+        value -> Text,
+    }
+}
+
+diesel::table! {
+    messages (id) {
+        id -> Int4,
+        chat_id -> Int8,
+        message_id -> Int8,
+        #[max_length = 255]
+        token -> Varchar,
+    }
+}
+
 diesel::table! {
     users (id) {
         id -> Int8,
         is_admin -> Bool,
     }
 }
+
+diesel::allow_tables_to_appear_in_same_query!(literals, messages, users,);

src/main.rs

@@ -1,11 +1,14 @@
 pub mod admin;
 pub mod db;
 
-use crate::admin::{AdminCommands, admin_command_handler};
+use crate::admin::{admin_command_handler, AdminCommands};
-use crate::admin::{SecretCommands, secret_command_handler};
+use crate::admin::{secret_command_handler, SecretCommands};
 use crate::db::DB;
 
 use envconfig::Envconfig;
+use serde::{Deserialize, Serialize};
+use teloxide::dispatching::dialogue::serializer::Json;
+use teloxide::dispatching::dialogue::{InMemStorage, PostgresStorage};
 use teloxide::{
     payloads::SendMessageSetters,
     prelude::*,
@@ -13,6 +16,8 @@ use teloxide::{
     utils::{command::BotCommands, render::RenderMessageTextHelper},
 };
 
+type BotDialogue = Dialogue<State, PostgresStorage<Json>>;
+
 #[derive(Envconfig)]
 struct Config {
     #[envconfig(from = "BOT_TOKEN")]
@@ -43,6 +48,16 @@ impl LogMsg for <teloxide::Bot as teloxide::prelude::Requester>::SendMessage {
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
+pub enum State {
+    #[default]
+    Start,
+    Edit {
+        literal: String,
+        lang: String,
+    },
+}
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     dotenvy::dotenv()?;
@@ -50,16 +65,32 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let bot = Bot::new(&config.bot_token);
     let db = DB::new(&config.db_url).await;
+    let db_url2 = config.db_url.clone();
+    let state_mgr = PostgresStorage::open(&db_url2, 8, Json).await?;
 
     let handler = dptree::entry()
         .inspect(|u: Update| {
             eprintln!("{u:#?}"); // Print the update to the console with inspect
         })
         .branch(command_handler(config))
+        .branch(
+            Update::filter_message()
+                .filter_async(async |msg: Message, mut db: DB| {
+                    let user = db.get_or_init_user(msg.from.unwrap().id.0 as i64).await;
+                    user.is_admin
+                })
+                .enter_dialogue::<Message, PostgresStorage<Json>, State>()
+                .branch(
+                    Update::filter_message()
+                        .filter(|msg: Message| msg.text().unwrap_or("") == "edit")
+                        .endpoint(edit_msg_cmd_handler),
+                )
+                .branch(dptree::case![State::Edit { literal, lang }].endpoint(edit_msg_handler)),
+        )
         .branch(Update::filter_message().endpoint(echo));
 
     Dispatcher::builder(bot, handler)
-        .dependencies(dptree::deps![db])
+        .dependencies(dptree::deps![db, state_mgr])
         .enable_ctrlc_handler()
         .build()
         .dispatch()
@@ -68,7 +99,78 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-fn command_handler(config: Config) -> Handler<'static, DependencyMap, Result<(), teloxide::RequestError>, teloxide::dispatching::DpHandlerDescription> {
+async fn edit_msg_cmd_handler(
+    bot: Bot,
+    mut db: DB,
+    dialogue: BotDialogue,
+    msg: Message,
+) -> Result<(), teloxide::RequestError> {
+    match msg.reply_to_message() {
+        Some(replied) => {
+            let msgid = replied.id;
+            // look for message in db and set text
+            let literal = match db
+                .get_message_literal(msg.chat.id.0, msgid.0)
+                .await
+                .unwrap()
+            {
+                Some(l) => l,
+                None => {
+                    bot.send_message(msg.chat.id, "No such message found to edit. Look if you replying bot's message and this message is supposed to be editable").await?;
+                    return Ok(());
+                }
+            };
+            // TODO: language selector will be implemented in future 😈
+            let lang = "ru".to_string();
+            dialogue
+                .update(State::Edit { literal, lang })
+                .await
+                .unwrap();
+            bot.send_message(
+                msg.chat.id,
+                "Ok, now you have to send message text (formatting supported)",
+            )
+            .await?;
+        }
+        None => {
+            bot.send_message(msg.chat.id, "You have to reply to message to edit it")
+                .await?;
+        }
+    };
+    Ok(())
+}
+
+async fn edit_msg_handler(
+    bot: Bot,
+    mut db: DB,
+    dialogue: BotDialogue,
+    (literal, lang): (String, String),
+    msg: Message,
+) -> Result<(), teloxide::RequestError> {
+    match msg.html_text() {
+        Some(text) => {
+            db.set_literal(&literal, &text).await.unwrap();
+            bot.send_message(msg.chat.id, "Updated text of message!")
+                .await
+                .unwrap();
+            dialogue.exit().await.unwrap();
+        }
+        None => {
+            bot.send_message(msg.chat.id, "Send text!").await.unwrap();
+        }
+    }
+
+    Ok(())
+}
+
+fn command_handler(
+    config: Config,
+) -> Handler<
+    'static,
+    DependencyMap,
+    Result<(), teloxide::RequestError>,
+    teloxide::dispatching::DpHandlerDescription,
+> {
     Update::filter_message()
         .branch(
             dptree::entry()
@@ -98,11 +200,25 @@ async fn user_command_handler(
     msg: Message,
     cmd: UserCommands,
 ) -> Result<(), teloxide::RequestError> {
-    let user = db.get_or_init_user(msg.from.clone().unwrap().id.0 as i64);
+    let user = db
+        .get_or_init_user(msg.from.clone().unwrap().id.0 as i64)
+        .await;
     println!("MSG: {}", msg.html_text().unwrap());
     match cmd {
         UserCommands::Start => {
-            bot.send_photo(msg.chat.id, InputFile::file_id("AgACAgIAAxkBAANRZ-2EJWUdkgwG4tfJfNwut4bssVkAAunyMRvTJ2FLn4FTtVdyfOoBAAMCAANzAAM2BA")).await?;
+            let literal = "start";
+            let text = db
+                .get_literal_value(literal)
+                .await
+                .unwrap()
+                .unwrap_or("Please, set content of this message".into());
+            let msg = bot
+                .send_message(msg.chat.id, text)
+                .parse_mode(teloxide::types::ParseMode::Html)
+                .await?;
+            db.set_message_literal(msg.chat.id.0, msg.id.0, literal)
+                .await
+                .unwrap();
             Ok(())
         }
         UserCommands::Help => {
@@ -110,10 +226,6 @@ async fn user_command_handler(
                 .await?;
             Ok(())
         }
-        _ => {
-            bot.send_message(msg.chat.id, "Not yet implemented").await?;
-            Ok(())
-        }
     }
 }