forked from jmug/stoatchat
feat: - track call length
- move voice and video limits to config - seperate VoiceInformation into model and db model - fix build scripts
This commit is contained in:
@@ -1,19 +1,24 @@
|
||||
use std::collections::HashSet;
|
||||
|
||||
use futures::TryFutureExt;
|
||||
use livekit_api::services::room::{RoomClient, UpdateParticipantOptions};
|
||||
use livekit_protocol::ParticipantPermission;
|
||||
use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
|
||||
use revolt_database::{
|
||||
events::client::EventV1,
|
||||
util::{permissions::{perms, DatabasePermissionQuery}, reference::Reference},
|
||||
voice::{get_channel_node, get_user_voice_channel_in_server, move_user, set_channel_node, set_user_moved_from_voice, sync_user_voice_permissions, VoiceClient},
|
||||
util::{
|
||||
permissions::{perms, DatabasePermissionQuery},
|
||||
reference::Reference,
|
||||
},
|
||||
voice::{
|
||||
get_channel_node, get_user_voice_channel_in_server, set_channel_node,
|
||||
set_user_moved_from_voice, set_user_moved_to_voice, sync_user_voice_permissions,
|
||||
VoiceClient,
|
||||
},
|
||||
Database, File, PartialMember, User,
|
||||
};
|
||||
use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
|
||||
use revolt_models::v0::{self, FieldsMember};
|
||||
|
||||
use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
|
||||
use revolt_result::{create_error, Result, ToRevoltError};
|
||||
use revolt_permissions::{
|
||||
calculate_channel_permissions, calculate_server_permissions, ChannelPermission,
|
||||
};
|
||||
use revolt_result::{create_error, Result};
|
||||
use rocket::{form::validate::Contains, serde::json::Json, State};
|
||||
use validator::Validate;
|
||||
|
||||
@@ -109,7 +114,7 @@ pub async fn edit(
|
||||
|
||||
let new_voice_channel = if let Some(new_channel) = &data.voice_channel {
|
||||
if !voice_client.is_enabled() {
|
||||
return Err(create_error!(LiveKitUnavailable))
|
||||
return Err(create_error!(LiveKitUnavailable));
|
||||
};
|
||||
|
||||
permissions.throw_if_lacking_channel_permission(ChannelPermission::MoveMembers)?;
|
||||
@@ -125,7 +130,10 @@ pub async fn edit(
|
||||
Err(create_error!(UnknownChannel))?
|
||||
}
|
||||
|
||||
if get_user_voice_channel_in_server(&target_user.id, &server.id).await?.is_none() {
|
||||
if get_user_voice_channel_in_server(&target_user.id, &server.id)
|
||||
.await?
|
||||
.is_none()
|
||||
{
|
||||
Err(create_error!(NotConnected))?
|
||||
};
|
||||
|
||||
@@ -213,7 +221,8 @@ pub async fn edit(
|
||||
.await?;
|
||||
|
||||
if let Some(new_voice_channel) = new_voice_channel {
|
||||
if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
|
||||
if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await?
|
||||
{
|
||||
let old_node = get_channel_node(&channel).await?.unwrap();
|
||||
|
||||
let new_node = match get_channel_node(new_voice_channel.id()).await? {
|
||||
@@ -225,28 +234,45 @@ pub async fn edit(
|
||||
};
|
||||
|
||||
set_user_moved_from_voice(&channel, new_voice_channel.id(), &target_user.id).await?;
|
||||
set_user_moved_to_voice(new_voice_channel.id(), &channel, &target_user.id).await?;
|
||||
|
||||
let mut query = perms(db, &target_user).channel(&new_voice_channel);
|
||||
let permissions = calculate_channel_permissions(&mut query).await;
|
||||
|
||||
voice_client.create_room(&new_node, &new_voice_channel).await?;
|
||||
let token = voice_client.create_token(&new_node, &target_user, permissions, &new_voice_channel)?;
|
||||
voice_client
|
||||
.create_room(&new_node, &new_voice_channel)
|
||||
.await?;
|
||||
let token = voice_client
|
||||
.create_token(&new_node, &target_user, permissions, &new_voice_channel)
|
||||
.await?;
|
||||
|
||||
voice_client.remove_user(&old_node, &target_user.id, &channel).await?;
|
||||
voice_client
|
||||
.remove_user(&old_node, &target_user.id, &channel)
|
||||
.await?;
|
||||
|
||||
EventV1::UserMoveVoiceChannel {
|
||||
node: new_node,
|
||||
token
|
||||
token,
|
||||
}
|
||||
.p_user(target_user.id.clone(), db)
|
||||
.await;
|
||||
};
|
||||
} else if can_publish.is_some() || can_receive.is_some() || remove_contains_voice {
|
||||
if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await? {
|
||||
if let Some(channel) = get_user_voice_channel_in_server(&target_user.id, &server.id).await?
|
||||
{
|
||||
let node = get_channel_node(&channel).await?.unwrap();
|
||||
let channel = Reference::from_unchecked(channel).as_channel(db).await?;
|
||||
|
||||
sync_user_voice_permissions(db, voice_client, &node, &user, &channel, Some(&server), None).await?;
|
||||
sync_user_voice_permissions(
|
||||
db,
|
||||
voice_client,
|
||||
&node,
|
||||
&user,
|
||||
&channel,
|
||||
Some(&server),
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user