feat: implement missing permission syncs
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
use livekit_protocol::ParticipantPermission;
|
||||
use revolt_database::{
|
||||
util::{permissions::DatabasePermissionQuery, reference::Reference},
|
||||
voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient},
|
||||
Channel, Database, User
|
||||
voice::{sync_voice_permissions, VoiceClient},
|
||||
Database, User
|
||||
};
|
||||
use revolt_models::v0::PartialUserVoiceState;
|
||||
use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
|
||||
use revolt_permissions::{calculate_server_permissions, ChannelPermission};
|
||||
use revolt_result::{create_error, Result};
|
||||
use rocket::State;
|
||||
use rocket_empty::EmptyResponse;
|
||||
@@ -38,45 +36,7 @@ pub async fn delete(
|
||||
for channel_id in &server.channels {
|
||||
let channel = Reference::from_unchecked(channel_id.clone()).as_channel(db).await?;
|
||||
|
||||
if matches!(channel, Channel::VoiceChannel { .. }) {
|
||||
for member_id in get_voice_channel_members(channel_id).await? {
|
||||
let member = Reference::from_unchecked(member_id).as_member(db, &server.id).await?;
|
||||
|
||||
if member.roles.contains(&role_id) {
|
||||
let user = Reference::from_unchecked(member.id.user.clone()).as_user(db).await?;
|
||||
let voice_state = get_voice_state(channel_id, Some(&server.id), &user.id).await?.unwrap();
|
||||
|
||||
let mut query = DatabasePermissionQuery::new(db, &user)
|
||||
.member(&member)
|
||||
.channel(&channel)
|
||||
.server(&server);
|
||||
|
||||
let permissions = calculate_channel_permissions(&mut query).await;
|
||||
|
||||
let mut update_event = PartialUserVoiceState {
|
||||
id: Some(user.id.clone()),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let can_video = permissions.has_channel_permission(ChannelPermission::Video);
|
||||
let can_speak = permissions.has_channel_permission(ChannelPermission::Speak);
|
||||
let can_listen = permissions.has_channel_permission(ChannelPermission::Listen);
|
||||
|
||||
update_event.camera = voice_state.camera.then_some(can_video);
|
||||
update_event.screensharing = voice_state.screensharing.then_some(can_video);
|
||||
update_event.is_publishing = voice_state.is_publishing.then_some(can_speak);
|
||||
|
||||
update_voice_state(channel_id, Some(&server.id), &user.id, &update_event).await?;
|
||||
|
||||
voice_client.update_permissions(&user, channel_id, ParticipantPermission {
|
||||
can_subscribe: can_listen,
|
||||
can_publish: can_speak,
|
||||
can_publish_data: can_speak,
|
||||
..Default::default()
|
||||
}).await?;
|
||||
}
|
||||
}
|
||||
}
|
||||
sync_voice_permissions(db, voice_client, &channel, Some(&server), Some(&role_id)).await?;
|
||||
};
|
||||
|
||||
role.delete(db, &server.id, &role_id)
|
||||
|
||||
Reference in New Issue
Block a user