Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(room_member): Strip join_authorized_via_users_server (#1542)

Browse Source 
Actually implemented fix. Modified json if user was already a member.

Signed-off-by: Jonathan Sutton <jonathansutton91@proton.me>
This commit is contained in:
Jonathan Sutton
2026-03-24 13:11:25 +00:00
committed by Ellis Git
parent 8ef6f02ee9
commit 1c3890476a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/state.rs
+10 -5
View File
@@ -194,6 +194,7 @@ async fn send_state_event_for_key_helper(
state_key: &str, state_key: &str,
timestamp: Option<MilliSecondsSinceUnixEpoch>, timestamp: Option<MilliSecondsSinceUnixEpoch>,
) -> Result<OwnedEventId> { ) -> Result<OwnedEventId> {
let json: &mut Raw<AnyStateEventContent> = &mut json.clone();
allowed_to_send_state_event(services, room_id, event_type, state_key, json).await?; allowed_to_send_state_event(services, room_id, event_type, state_key, json).await?;
let state_lock = services.rooms.state.mutex.lock(room_id).await; let state_lock = services.rooms.state.mutex.lock(room_id).await;
let event_id = services let event_id = services
@@ -221,7 +222,7 @@ async fn allowed_to_send_state_event(
room_id: &RoomId, room_id: &RoomId,
event_type: &StateEventType, event_type: &StateEventType,
state_key: &str, state_key: &str,
json: &Raw<AnyStateEventContent>, json: &mut Raw<AnyStateEventContent>,
) -> Result { ) -> Result {
match event_type { match event_type {
| StateEventType::RoomCreate => { | StateEventType::RoomCreate => {
@@ -366,22 +367,26 @@ async fn allowed_to_send_state_event(
} }
}, },
| StateEventType::RoomMember => match json.deserialize_as::<RoomMemberEventContent>() { | StateEventType::RoomMember => match json.deserialize_as::<RoomMemberEventContent>() {
| Ok(mut membership_content) => { | Ok(membership_content) => {
let Ok(state_key) = UserId::parse(state_key) else { let Ok(state_key) = UserId::parse(state_key) else {
return Err!(Request(BadJson( return Err!(Request(BadJson(
"Membership event has invalid or non-existent state key" "Membership event has invalid or non-existent state key"
))); )));
}; };
// Moved the check for if user is already joined and then stripped the Option // join_authorized_via_users_server must be thrown away, if user is already a
// Unsure if this actually fixes it // member of the room.
if services if services
.rooms .rooms
.state_cache .state_cache
.is_joined(state_key, room_id) .is_joined(state_key, room_id)
.await .await
{ {
membership_content.join_authorized_via_users_server.take(); let mut content: RoomMemberEventContent = membership_content.clone();
content.join_authorized_via_users_server = None;
*json = Raw::<AnyStateEventContent>::from_json_string(
serde_json::to_string(&content)?,
)?;
} else if let Some(authorising_user) = } else if let Some(authorising_user) =
membership_content.join_authorized_via_users_server membership_content.join_authorized_via_users_server
{ {