dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-28 05:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '199-fix-kick-ban-over-federation' into 'next'

Browse source 
fix: fix kick and ban events over federation

Closes #199

See merge request famedly/conduit!338
This commit is contained in:
Timo Kösters 2022-04-03 17:59:15 +00:00
parent 272e27ae01 a08c667230
commit 9ed352d4c0
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/database/rooms.rs
View file

@ -1957,12 +1957,24 @@ impl Rooms {
// where events in the current room state do not exist
self.set_room_state(room_id, statehashid)?;
let servers = self
.room_servers(room_id)
.filter_map(|r| r.ok())
.filter(|server| &**server != db.globals.server_name());
let mut servers: HashSet<Box<ServerName>> =
self.room_servers(room_id).filter_map(|r| r.ok()).collect();
db.sending.send_pdu(servers, &pdu_id)?;
// In case we are kicking or banning a user, we need to inform their server of the change
if pdu.kind == EventType::RoomMember {
if let Some(state_key_uid) = &pdu
.state_key
.as_ref()
.and_then(|state_key| UserId::parse(state_key.as_str()).ok())
{
servers.insert(Box::from(state_key_uid.server_name()));
}
}
// Remove our server from the server list since it will be added to it by room_servers() and/or the if statement above
servers.remove(db.globals.server_name());
db.sending.send_pdu(servers.into_iter(), &pdu_id)?;
for appservice in db.appservice.all()? {
if self.appservice_in_room(room_id, &appservice, db)? {