From 48e0b48ea90869c68e6ca67d0ee398022eb9b872 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Thu, 1 May 2025 16:58:35 +0100
Subject: [PATCH] fix: update branch from main

---
 Cargo.lock                                        | 4 ++--
 crates/core/database/src/models/messages/model.rs | 2 +-
 crates/core/database/src/voice/mod.rs             | 7 ++++++-
 crates/delta/src/routes/channels/message_send.rs  | 2 ++
 crates/delta/src/routes/invites/invite_fetch.rs   | 1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca5b8cd5..668dad17 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4451,10 +4451,10 @@ dependencies = [
  "fnv",
  "lazy_static",
  "proc-macro2",
- "quote 1.0.38",
+ "quote 1.0.40",
  "regex-syntax 0.8.5",
  "rustc_version",
- "syn 2.0.94",
+ "syn 2.0.101",
 ]
 
 [[package]]
diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs
index 9eb85c2a..a5bef95c 100644
--- a/crates/core/database/src/models/messages/model.rs
+++ b/crates/core/database/src/models/messages/model.rs
@@ -477,7 +477,7 @@ impl Message {
         }
 
         // Validate the mentions go to users in the channel/server
-        if !mentions.is_empty() {
+        if !user_mentions.is_empty() {
             #[allow(deprecated)]
             match channel {
                 Channel::DirectMessage { ref recipients, .. }
diff --git a/crates/core/database/src/voice/mod.rs b/crates/core/database/src/voice/mod.rs
index 05eabdb7..077283d4 100644
--- a/crates/core/database/src/voice/mod.rs
+++ b/crates/core/database/src/voice/mod.rs
@@ -244,9 +244,14 @@ pub async fn update_voice_state(
 pub async fn get_voice_channel_members(channel_id: &str) -> Result<Option<Vec<String>>> {
     get_connection()
         .await?
-        .smembers(format!("vc_members:{}", channel_id))
+        .smembers::<_, Option<Vec<String>>>(format!("vc_members:{}", channel_id))
         .await
         .to_internal_error()
+        .map(|opt| opt.and_then(|v| if v.is_empty() {
+            None
+        } else {
+            Some(v)
+        }))
 }
 
 pub async fn get_voice_state(
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index e0e8f315..4f8c625b 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -616,6 +616,8 @@ mod test {
                     nickname: None,
                     roles: Some(vec![role_id.clone()]),
                     timeout: None,
+                    can_publish: None,
+                    can_receive: None
                 },
                 vec![],
             )
diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index fb89fd3b..641741b9 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -195,6 +195,7 @@ mod test {
                 name: "Voice Channel".to_string(),
                 description: None,
                 nsfw: Some(false),
+                voice: None
             },
             true,
         )