From 2b26503cf1cbe8d6900270fc68311a497d43dabc Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Thu, 14 Sep 2023 21:51:27 +0200 Subject: [PATCH] Fixes --- .github/workflows/build_docker_image.yaml | 6 --- Cargo.lock | 66 ++++++++++------------- Cargo.toml | 12 ++--- src/views/donate_notifications.rs | 4 +- src/views/users/mod.rs | 4 +- 5 files changed, 37 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build_docker_image.yaml b/.github/workflows/build_docker_image.yaml index da458a0..fbc3713 100644 --- a/.github/workflows/build_docker_image.yaml +++ b/.github/workflows/build_docker_image.yaml @@ -13,12 +13,6 @@ jobs: name: Checkout uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: arm64 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/Cargo.lock b/Cargo.lock index eac7bd7..989fa20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,18 +329,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -2769,9 +2768,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "sentry" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" +checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" dependencies = [ "httpdate", "native-tls", @@ -2788,9 +2787,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd" +checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" dependencies = [ "backtrace", "once_cell", @@ -2800,9 +2799,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6" +checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" dependencies = [ "hostname", "libc", @@ -2814,9 +2813,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b" +checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" dependencies = [ "once_cell", "rand 0.8.5", @@ -2827,9 +2826,9 @@ dependencies = [ [[package]] name = "sentry-debug-images" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e" +checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" dependencies = [ "findshlibs", "once_cell", @@ -2838,9 +2837,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd" +checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2848,9 +2847,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f" +checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2860,26 +2859,26 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.31.5" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f" +checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" dependencies = [ "debugid", - "getrandom 0.2.10", "hex", + "rand 0.8.5", "serde", "serde_json", "thiserror", - "time 0.3.25", + "time", "url", "uuid", ] [[package]] name = "serde" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -2896,9 +2895,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -3272,17 +3271,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.25" @@ -3430,9 +3418,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.4.0", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 1fd9153..252d476 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,14 +14,14 @@ members = [ once_cell = "1.18.0" prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", tag = "0.6.9", default-features = false, features = ["postgresql"] } -serde = { version = "1.0.175", features = ["derive"] } +serde = { version = "1.0.188", features = ["derive"] } -tokio = { version = "1.29.1", features = ["full"] } -axum = { version = "0.6.19", features = ["json"] } +tokio = { version = "1.32.0", features = ["full"] } +axum = { version = "0.6.20", features = ["json"] } axum-prometheus = "0.4.0" -chrono = "0.4.26" -sentry = { version = "0.31.5", features = ["debug-images"] } +chrono = "0.4.30" +sentry = { version = "0.31.7", features = ["debug-images"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"]} -tower-http = { version = "0.4.3", features = ["trace"] } +tower-http = { version = "0.4.4", features = ["trace"] } diff --git a/src/views/donate_notifications.rs b/src/views/donate_notifications.rs index 2f3f252..254b06d 100644 --- a/src/views/donate_notifications.rs +++ b/src/views/donate_notifications.rs @@ -28,7 +28,7 @@ async fn is_need_send( } -async fn mark_sended( +async fn mark_sent( Path(chat_id): Path, db: Database ) -> impl IntoResponse { @@ -56,5 +56,5 @@ async fn mark_sended( pub fn get_router() -> Router { Router::new() .route("/:chat_id/is_need_send", get(is_need_send)) - .route("/:chat_id", post(mark_sended)) + .route("/:chat_id", post(mark_sent)) } diff --git a/src/views/users/mod.rs b/src/views/users/mod.rs index 4db981d..d619b71 100644 --- a/src/views/users/mod.rs +++ b/src/views/users/mod.rs @@ -1,7 +1,7 @@ pub mod serializers; pub mod utils; -use axum::{Router, response::IntoResponse, routing::{get, post}, extract::{Query, Path, self}, Json, http::StatusCode}; +use axum::{Router, response::IntoResponse, routing::{get, post}, extract::{Query, Path}, Json, http::StatusCode}; use crate::prisma::{user_settings, language_to_user, user_activity}; use self::{serializers::{UserDetail, CreateOrUpdateUserData}, utils::update_languages}; @@ -73,7 +73,7 @@ async fn get_user( async fn create_or_update_user( db: Database, - extract::Json(data): extract::Json, + Json(data): Json, ) -> impl IntoResponse { let user = db.user_settings() .upsert(