jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

feat: implement missing permission syncs

Browse Source
This commit is contained in:
Zomatree
2025-01-28 15:55:21 +00:00
parent c55b5bf75f
commit c8ae34ba73
16 changed files with 266 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
crates/delta/src/routes/servers/roles_edit.rs
View File

@@ -1,14 +1,12 @@
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, update_voice_state_tracks, VoiceClient},
Channel, Database, PartialRole, User
voice::{sync_voice_permissions, VoiceClient},
Database, PartialRole, User
};
use revolt_models::v0::{self, PartialUserVoiceState};
use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission, PermissionQuery};
use revolt_models::v0;
use revolt_permissions::{calculate_server_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use serde::{Deserialize, Serialize};
use validator::Validate;
/// # Edit Role
@@ -18,12 +16,11 @@ use validator::Validate;
#[patch("/<target>/roles/<role_id>", data = "<data>")]
pub async fn edit(
db: &State<Database>,
voice: &State<VoiceClient>,
voice_client: &State<VoiceClient>,
user: User,
target: Reference,
role_id: String,
data: Json<v0::DataEditRole>,
voice_client: &State<VoiceClient>
) -> Result<Json<v0::Role>> {
let data = data.into_inner();
data.validate().map_err(|error| {
@@ -83,45 +80,7 @@ pub async fn edit(
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?;
};
Ok(Json(role.into()))