fix: update branch from main
This commit is contained in:
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -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]]
|
||||
|
||||
@@ -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, .. }
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -616,6 +616,8 @@ mod test {
|
||||
nickname: None,
|
||||
roles: Some(vec![role_id.clone()]),
|
||||
timeout: None,
|
||||
can_publish: None,
|
||||
can_receive: None
|
||||
},
|
||||
vec![],
|
||||
)
|
||||
|
||||
@@ -195,6 +195,7 @@ mod test {
|
||||
name: "Voice Channel".to_string(),
|
||||
description: None,
|
||||
nsfw: Some(false),
|
||||
voice: None
|
||||
},
|
||||
true,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user