MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 06:34:33 +01:00
Code Issues Releases Activity

Merge branch 'can-invite-state-lock' into 'next'

Browse source 
fix(state-accessor): hold the state_lock when checking if a user can invite

See merge request famedly/conduit!643
This commit is contained in:
Timo Kösters 2024-04-24 19:29:01 +00:00
commit 08636ef236
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/service/rooms/state_accessor/mod.rs
View file

@ -21,6 +21,7 @@ use ruma::{
EventId, JsOption, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
};
use serde_json::value::to_raw_value;
use tokio::sync::MutexGuard;
use tracing::{error, warn};
use crate::{service::pdu::PduBuilder, services, Error, PduEvent, Result};
@ -309,6 +310,7 @@ impl Service {
room_id: &RoomId,
sender: &UserId,
target_user: &UserId,
state_lock: &MutexGuard<'_, ()>,
) -> Result<bool> {
let content = to_raw_value(&RoomMemberEventContent::new(MembershipState::Invite))
.expect("Event content always serializes");
@ -321,21 +323,10 @@ impl Service {
redacts: None,
};
let mutex_state = Arc::clone(
services()
.globals
.roomid_mutex_state
.write()
.await
.entry(room_id.to_owned())
.or_default(),
);
let state_lock = mutex_state.lock().await;
Ok(services()
.rooms
.timeline
.create_hash_and_sign_event(new_event, sender, room_id, &state_lock)
.create_hash_and_sign_event(new_event, sender, room_id, state_lock)
.is_ok())
}