chore: bump dependencies

swmff · Jan 3, 2025 · e1035d5 · e1035d5
1 parent 3ba03d2
commit e1035d5
Show file tree

Hide file tree

Showing 27 changed files with 315 additions and 296 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/authbeam/Cargo.toml b/crates/authbeam/Cargo.toml
@@ -15,15 +15,15 @@ sqlite = ["databeam/sqlite"]
 default = ["databeam/sqlite"]    # for development
 
 [dependencies]
-axum = { version = "0.7.9", features = ["macros"] }
-axum-macros = "0.4.2"
-serde = { version = "1.0.216", features = ["derive"] }
+axum = { version = "0.8.1", features = ["macros"] }
+axum-macros = "0.5.0"
+serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
 tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
 dotenv = "0.15.0"
-axum-extra = { version = "0.9.6", features = ["cookie"] }
+axum-extra = { version = "0.10.0", features = ["cookie", "multipart"] }
 regex = "1.11.1"
-reqwest = "0.12.10"
+reqwest = "0.12.12"
 hcaptcha-no-wasm = { version = "3.0.1" }
 mime_guess = "2.0.5"
 citrus-client = { version = "0.1.0" }

diff --git a/crates/authbeam/src/api/mod.rs b/crates/authbeam/src/api/mod.rs
@@ -33,78 +33,81 @@ pub fn routes(database: Database) -> Router {
     Router::new()
         // relationships
         .route(
-            "/relationships/follow/:id",
+            "/relationships/follow/{id}",
             post(relationships::follow_request),
         )
         .route(
-            "/relationships/friend/:id",
+            "/relationships/friend/{id}",
             post(relationships::friend_request),
         )
         .route(
-            "/relationships/block/:id",
+            "/relationships/block/{id}",
             post(relationships::block_request),
         )
         .route(
-            "/relationships/current/:id",
+            "/relationships/current/{id}",
             delete(relationships::delete_request),
         )
         // profiles
         .route(
-            "/profile/:id/tokens/generate",
+            "/profile/{id}/tokens/generate",
             post(profile::generate_token_request),
         )
-        .route("/profile/:id/tokens", post(profile::update_tokens_request))
-        .route("/profile/:id/tier", post(profile::update_tier_request))
-        .route("/profile/:id/group", post(profile::update_group_request))
-        .route("/profile/:id/coins", post(profile::update_coins_request))
+        .route("/profile/{id}/tokens", post(profile::update_tokens_request))
+        .route("/profile/{id}/tier", post(profile::update_tier_request))
+        .route("/profile/{id}/group", post(profile::update_group_request))
+        .route("/profile/{id}/coins", post(profile::update_coins_request))
         .route(
-            "/profile/:id/password",
+            "/profile/{id}/password",
             post(profile::update_password_request),
         )
         .route(
-            "/profile/:id/username",
+            "/profile/{id}/username",
             post(profile::update_username_request),
         )
         .route(
-            "/profile/:id/metadata",
+            "/profile/{id}/metadata",
             post(profile::update_metdata_request),
         )
-        .route("/profile/:id/metadata", put(profile::patch_metdata_request))
-        .route("/profile/:id/badges", post(profile::update_badges_request))
-        .route("/profile/:id/labels", post(profile::update_labels_request))
-        .route("/profile/:id/banner", get(profile::banner_request))
-        .route("/profile/:id/avatar", get(profile::avatar_request))
-        .route("/profile/:id", delete(profile::delete_request))
-        .route("/profile/:id", get(profile::get_request))
+        .route(
+            "/profile/{id}/metadata",
+            put(profile::patch_metdata_request),
+        )
+        .route("/profile/{id}/badges", post(profile::update_badges_request))
+        .route("/profile/{id}/labels", post(profile::update_labels_request))
+        .route("/profile/{id}/banner", get(profile::banner_request))
+        .route("/profile/{id}/avatar", get(profile::avatar_request))
+        .route("/profile/{id}", delete(profile::delete_request))
+        .route("/profile/{id}", get(profile::get_request))
         // mail
         .route("/mail", post(mail::create_request))
-        .route("/mail/:id/state", post(mail::update_state_request))
-        .route("/mail/:id", delete(mail::delete_request))
+        .route("/mail/{id}/state", post(mail::update_state_request))
+        .route("/mail/{id}", delete(mail::delete_request))
         // items
         .route("/items", post(items::create_request))
-        .route("/item/:id/buy", post(items::buy_request))
-        .route("/item/:id", post(items::update_item_request))
-        .route("/item/:id/status", post(items::update_status_request))
+        .route("/item/{id}/buy", post(items::buy_request))
+        .route("/item/{id}", post(items::update_item_request))
+        .route("/item/{id}/status", post(items::update_status_request))
         .route(
-            "/item/:id/content",
+            "/item/{id}/content",
             post(items::update_item_content_request),
         )
-        .route("/item/:id", delete(items::delete_request))
+        .route("/item/{id}", delete(items::delete_request))
         // notifications
-        .route("/notifications/:id", delete(notifications::delete_request))
+        .route("/notifications/{id}", delete(notifications::delete_request))
         .route(
             "/notifications/clear",
             delete(notifications::delete_all_request),
         )
         // warnings
         .route("/warnings", post(warnings::create_request))
-        .route("/warnings/:id", delete(warnings::delete_request))
+        .route("/warnings/{id}", delete(warnings::delete_request))
         // ipbans
         .route("/ipbans", post(ipbans::create_request))
-        .route("/ipbans/:id", delete(ipbans::delete_request))
+        .route("/ipbans/{id}", delete(ipbans::delete_request))
         // ipblocks
         .route("/ipblocks", post(ipblocks::create_request))
-        .route("/ipblocks/:id", delete(ipblocks::delete_request))
+        .route("/ipblocks/{id}", delete(ipblocks::delete_request))
         // me
         .route("/me/tokens/generate", post(me::generate_token_request))
         .route("/me/tokens", post(me::update_tokens_request))

diff --git a/crates/authbeam/src/avif.rs b/crates/authbeam/src/avif.rs
@@ -1,5 +1,4 @@
 use axum::{
-    async_trait,
     body::Bytes,
     extract::{FromRequest, Request},
     http::{header::CONTENT_TYPE, StatusCode},
@@ -15,7 +14,6 @@ use std::{fs::File, io::BufWriter};
 /// * `image/webp`
 pub struct Image(pub Bytes);
 
-#[async_trait]
 impl<S> FromRequest<S> for Image
 where
     Bytes: FromRequest<S>,

diff --git a/crates/citrus-client/Cargo.toml b/crates/citrus-client/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 rust-version = "1.83"
 
 [dependencies]
-reqwest = "0.12.10"
-serde = "1.0.216"
+reqwest = "0.12.12"
+serde = "1.0.217"
 serde_json = "1.0.134"
 toml = "0.8.19"
diff --git a/crates/databeam/Cargo.toml b/crates/databeam/Cargo.toml
@@ -16,7 +16,7 @@ default = ["sqlite"]
 
 [dependencies]
 redis = "0.27.6"
-serde = { version = "1.0.216", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.134"
 toml = "0.8.19"
 rainbeam-shared = "0.2.0"

diff --git a/crates/langbeam/Cargo.toml b/crates/langbeam/Cargo.toml
@@ -9,7 +9,7 @@ repository = "/~https://github.com/swmff/rainbeam"
 license = "MIT"
 
 [dependencies]
-serde = { version = "1.0.216", features = ["serde_derive"] }
+serde = { version = "1.0.217", features = ["serde_derive"] }
 serde_json = "1.0.134"
 rainbeam-shared = "0.2.0"
 pathbufd = "0.1.4"
diff --git a/crates/rainbeam-core/Cargo.toml b/crates/rainbeam-core/Cargo.toml
@@ -16,10 +16,10 @@ sqlite = ["databeam/sqlite", "authbeam/sqlite"]
 default = ["databeam/sqlite", "authbeam/sqlite"]
 
 [dependencies]
-axum = { version = "0.7.9", features = ["macros", "form"] }
-axum-extra = { version = "0.9.6", features = ["cookie"] }
-reqwest = { version = "0.12.10", features = ["json", "stream"] }
-serde = { version = "1.0.216", features = ["derive"] }
+axum = { version = "0.8.1", features = ["macros", "form"] }
+axum-extra = { version = "0.10.0", features = ["cookie"] }
+reqwest = { version = "0.12.12", features = ["json", "stream"] }
+serde = { version = "1.0.217", features = ["derive"] }
 tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.8.19"
 serde_json = "1.0.134"

diff --git a/crates/rainbeam/Cargo.toml b/crates/rainbeam/Cargo.toml
@@ -19,10 +19,10 @@ mimalloc = []
 [dependencies]
 askama = { version = "0.12.1", features = ["with-axum"] }
 askama_axum = "0.4.0"
-axum = { version = "0.7.9", features = ["macros", "form"] }
-axum-extra = { version = "0.9.6", features = ["cookie"] }
-reqwest = { version = "0.12.10", features = ["json", "stream"] }
-serde = { version = "1.0.216", features = ["derive"] }
+axum = { version = "0.8.1", features = ["macros", "form"] }
+axum-extra = { version = "0.10.0", features = ["cookie"] }
+reqwest = { version = "0.12.12", features = ["json", "stream"] }
+serde = { version = "1.0.217", features = ["derive"] }
 tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.8.19"
 tower-http = { version = "0.6.2", features = ["fs", "trace"] }

diff --git a/crates/rainbeam/src/main.rs b/crates/rainbeam/src/main.rs
@@ -89,7 +89,7 @@ pub async fn main() {
         .nest("/api/v0/util", routing::api::util::routes(database.clone()))
         .nest("/api/v1", routing::api::routes(database.clone()))
         // pages
-        .nest("/", routing::pages::routes(database.clone()).await)
+        .merge(routing::pages::routes(database.clone()).await)
         // ...
         .nest_service(
             "/.well-known",

diff --git a/crates/rb/Cargo.toml b/crates/rb/Cargo.toml
@@ -19,10 +19,10 @@ mimalloc = []
 [dependencies]
 askama = { version = "0.12.1", features = ["with-axum"] }
 askama_axum = "0.4.0"
-axum = { version = "0.7.9", features = ["macros", "form"] }
-axum-extra = { version = "0.9.6", features = ["cookie"] }
-reqwest = { version = "0.12.10", features = ["json", "stream"] }
-serde = { version = "1.0.216", features = ["derive"] }
+axum = { version = "0.8.1", features = ["macros", "form"] }
+axum-extra = { version = "0.10.0", features = ["cookie"] }
+reqwest = { version = "0.12.12", features = ["json", "stream"] }
+serde = { version = "1.0.217", features = ["derive"] }
 tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.8.19"
 tower-http = { version = "0.6.2", features = ["fs", "trace"] }

diff --git a/crates/rb/src/routing/api/chats.rs b/crates/rb/src/routing/api/chats.rs
@@ -18,14 +18,14 @@ use axum_extra::extract::cookie::CookieJar;
 
 pub fn routes(database: Database) -> Router {
     Router::new()
-        .route("/from_user/:id", post(create_request))
-        // .route("/:id", get(get_request))
-        .route("/:id/last", get(get_last_message_request))
-        .route("/:id/messages", get(get_messages_request))
-        .route("/:id/name", post(edit_name_request))
-        .route("/:id/add", post(add_friend_request))
-        .route("/:id", delete(delete_request))
-        .route("/:id/report", post(report_request))
+        .route("/from_user/{id}", post(create_request))
+        // .route("/{id}", get(get_request))
+        .route("/{id}/last", get(get_last_message_request))
+        .route("/{id}/messages", get(get_messages_request))
+        .route("/{id}/name", post(edit_name_request))
+        .route("/{id}/add", post(add_friend_request))
+        .route("/{id}", delete(delete_request))
+        .route("/{id}/report", post(report_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/circles.rs b/crates/rb/src/routing/api/circles.rs
@@ -21,20 +21,20 @@ pub fn routes(database: Database) -> Router {
     Router::new()
         // global
         .route("/", post(create_request))
-        .route("/:id", get(get_request))
+        .route("/{id}", get(get_request))
         // specific
-        // .route("/:name", put(edit_request))
-        .route("/:id/metadata", post(edit_metadata_request))
-        .route("/:id", delete(delete_request))
-        .route("/:id/report", post(report_request))
+        // .route("/{name}", put(edit_request))
+        .route("/{id}/metadata", post(edit_metadata_request))
+        .route("/{id}", delete(delete_request))
+        .route("/{id}/report", post(report_request))
         // members
-        .route("/:id/accept_invite", post(accept_invite_request))
-        .route("/:id/invite/:username", post(send_invite_request))
-        .route("/:id/kick/:username", post(kick_member_request))
-        .route("/:id/leave", post(leave_request))
+        .route("/{id}/accept_invite", post(accept_invite_request))
+        .route("/{id}/invite/{username}", post(send_invite_request))
+        .route("/{id}/kick/{username}", post(kick_member_request))
+        .route("/{id}/leave", post(leave_request))
         // as a profile
-        .route("/:id/avatar", get(avatar_request))
-        .route("/:id/banner", get(banner_request))
+        .route("/{id}/avatar", get(avatar_request))
+        .route("/{id}/banner", get(banner_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/comments.rs b/crates/rb/src/routing/api/comments.rs
@@ -17,11 +17,11 @@ use axum_extra::extract::cookie::CookieJar;
 pub fn routes(database: Database) -> Router {
     Router::new()
         .route("/", post(create_request))
-        .route("/:id", get(get_request))
-        .route("/:id", put(edit_request))
-        .route("/:id", delete(delete_request))
-        .route("/:id/report", post(report_request))
-        .route("/:id/ipblock", post(ipblock_request))
+        .route("/{id}", get(get_request))
+        .route("/{id}", put(edit_request))
+        .route("/{id}", delete(delete_request))
+        .route("/{id}/report", post(report_request))
+        .route("/{id}/ipblock", post(ipblock_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/messages.rs b/crates/rb/src/routing/api/messages.rs
@@ -17,10 +17,10 @@ use axum_extra::extract::cookie::CookieJar;
 pub fn routes(database: Database) -> Router {
     Router::new()
         .route("/", post(create_request))
-        .route("/:id", get(get_request))
-        .route("/:id", put(edit_request))
-        .route("/:id", delete(delete_request))
-        .route("/:id/report", post(report_request))
+        .route("/{id}", get(get_request))
+        .route("/{id}", put(edit_request))
+        .route("/{id}", delete(delete_request))
+        .route("/{id}/report", post(report_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/profiles.rs b/crates/rb/src/routing/api/profiles.rs
@@ -19,8 +19,8 @@ use axum::{
 
 pub fn routes(database: Database) -> Router {
     Router::new()
-        .route("/:username/report", post(report_request))
-        .route("/:username/export", get(export_request)) // staff
+        .route("/{username}/report", post(report_request))
+        .route("/{username}/export", get(export_request)) // staff
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/questions.rs b/crates/rb/src/routing/api/questions.rs
@@ -17,12 +17,12 @@ use axum_extra::extract::cookie::CookieJar;
 pub fn routes(database: Database) -> Router {
     Router::new()
         .route("/", post(create_request))
-        .route("/:id", get(get_request))
-        .route("/:id", delete(delete_request))
-        .route("/inbox/:id/clear", post(delete_inbox_request))
+        .route("/{id}", get(get_request))
+        .route("/{id}", delete(delete_request))
+        .route("/inbox/{id}/clear", post(delete_inbox_request))
         .route("/inbox/me/clear", post(delete_my_inbox_request))
-        .route("/:id/report", post(report_request))
-        .route("/:id/ipblock", post(ipblock_request))
+        .route("/{id}/report", post(report_request))
+        .route("/{id}/ipblock", post(ipblock_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/reactions.rs b/crates/rb/src/routing/api/reactions.rs
@@ -14,9 +14,9 @@ use axum_extra::extract::cookie::CookieJar;
 
 pub fn routes(database: Database) -> Router {
     Router::new()
-        .route("/:id", post(create_request))
-        .route("/:id", get(get_request))
-        .route("/:id", delete(delete_request))
+        .route("/{id}", post(create_request))
+        .route("/{id}", get(get_request))
+        .route("/{id}", delete(delete_request))
         // ...
         .with_state(database)
 }

diff --git a/crates/rb/src/routing/api/responses.rs b/crates/rb/src/routing/api/responses.rs
@@ -19,14 +19,14 @@ use rainbeam::model::ResponseEditWarning;
 pub fn routes(database: Database) -> Router {
     Router::new()
         .route("/", post(create_request))
-        .route("/:id", get(get_request))
-        .route("/:id", post(edit_request))
-        .route("/:id/tags", post(edit_tags_request))
-        .route("/:id/context", post(edit_context_request))
-        .route("/:id/context/warning", post(edit_warning_request))
-        .route("/:id", delete(delete_request))
-        .route("/:id/unsend", post(unsend_request))
-        .route("/:id/report", post(report_request))
+        .route("/{id}", get(get_request))
+        .route("/{id}", post(edit_request))
+        .route("/{id}/tags", post(edit_tags_request))
+        .route("/{id}/context", post(edit_context_request))
+        .route("/{id}/context/warning", post(edit_warning_request))
+        .route("/{id}", delete(delete_request))
+        .route("/{id}/unsend", post(unsend_request))
+        .route("/{id}/report", post(report_request))
         // timelines
         .route("/timeline/home", get(home_timeline_request))
         // ...

diff --git a/crates/rb/src/routing/api/util.rs b/crates/rb/src/routing/api/util.rs
@@ -1,12 +1,12 @@
 use authbeam::api::profile::read_image;
 use crate::database::Database;
-use askama_axum::IntoResponse;
 use axum::{
     body::Body,
     extract::{Query, State},
     http::HeaderMap,
     routing::{get, post},
     Json, Router,
+    response::IntoResponse,
 };
 use serde::{Deserialize, Serialize};
 use pathbufd::pathd;