chore(deps): update all (major) (#19)

* chore(deps): update all * fix: update mongodb --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Infiniwave <[email protected]>
nextania · Aug 13, 2024 · 8cdad39 · 8cdad39
1 parent 5f00151
commit 8cdad39
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 280 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: upgrade
       run: rustup override set nightly
     - name: nightly-clippy

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
 async-trait = "0.1.73"
 futures-util = "0.3.28"
 
-dashmap = "5.5.0"
+dashmap = "6.0.0"
 lazy_static = "1.4.0"
 once_cell = "1.18.0"
 
@@ -24,8 +24,8 @@ log = "0.4.20"
 
 async-tungstenite = "0.27.0"
 
-mongodb = "2.6.0"
-jsonwebtoken = "8.3.0"
+mongodb = "3.0.0"
+jsonwebtoken = "9.0.0"
 redis = { version = "0.26.0", features = ["async-std-comp"] }
 
 serde = { version = "1.0.183", features = ["derive"] }

diff --git a/src/services/database/calls.rs b/src/services/database/calls.rs
@@ -20,7 +20,7 @@ impl Call {
         let database = super::get_database();
         database
             .collection::<Call>("calls")
-            .insert_one(self.clone(), None)
+            .insert_one(self.clone())
             .await?;
         Ok(())
     }
@@ -39,7 +39,6 @@ impl Call {
                         "ended_at": chrono::Utc::now().timestamp_millis(),
                     },
                 },
-                None,
             )
             .await?;
         Ok(())

diff --git a/src/services/database/channels.rs b/src/services/database/channels.rs
@@ -56,12 +56,9 @@ impl Channel {
         let database = super::get_database();
         let channel = database
             .collection::<Channel>("channels")
-            .find_one(
-                doc! {
-                    "id": id,
-                },
-                None,
-            )
+            .find_one(doc! {
+                "id": id,
+            })
             .await?;
         match channel {
             Some(channel) => Ok(channel),
@@ -94,7 +91,8 @@ impl Channel {
                     .build();
                 let messages: Vec<_> = database
                     .collection::<Message>("messages")
-                    .find(query, options)
+                    .find(query)
+                    .with_options(options)
                     .await?
                     .collect()
                     .await;

diff --git a/src/services/database/events.rs b/src/services/database/events.rs
@@ -129,12 +129,9 @@ pub async fn get_event(event_id: String) -> Result<Event> {
     let database = super::get_database();
     let event = database
         .collection::<Event>("events")
-        .find_one(
-            doc! {
-                "id": event_id,
-            },
-            None,
-        )
+        .find_one(doc! {
+            "id": event_id,
+        })
         .await?;
     match event {
         Some(event) => Ok(event),

diff --git a/src/services/database/infractions.rs b/src/services/database/infractions.rs
@@ -45,7 +45,7 @@ pub async fn create_ban(
     };
     database
         .collection::<Infraction>("infraction")
-        .insert_one(ban, None)
+        .insert_one(ban)
         .await?;
     Ok(())
 }
@@ -54,17 +54,14 @@ pub async fn is_banned(user_id: String, space_id: String) -> Result<bool> {
     let database = super::get_database();
     let bans = database
         .collection::<Infraction>("infractions")
-        .find(
-            doc! {
-                "member_id": user_id,
-                "space_id": space_id,
-                "expires_at": {
-                    "$gt": chrono::Utc::now().timestamp_millis()
-                },
-                "infraction_type": "BAN"
+        .find(doc! {
+            "member_id": user_id,
+            "space_id": space_id,
+            "expires_at": {
+                "$gt": chrono::Utc::now().timestamp_millis()
             },
-            None,
-        )
+            "infraction_type": "BAN"
+        })
         .await?;
     let is_banned = bans.count().await > 0;
     Ok(is_banned)
@@ -74,13 +71,10 @@ pub async fn revoke_ban(ban_id: String) -> Result<()> {
     let database = super::get_database();
     database
         .collection::<Infraction>("infractions")
-        .delete_one(
-            doc! {
-                "id": ban_id,
-                "infraction_type": "BAN"
-            },
-            None,
-        )
+        .delete_one(doc! {
+            "id": ban_id,
+            "infraction_type": "BAN"
+        })
         .await?;
     Ok(())
 }