serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-15 22:16:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'appservice-pdu-send-fix' into 'next'

Browse source 
Send PDU to appservice if state_key is their user ID

Closes #110

See merge request famedly/conduit!331
This commit is contained in:
Timo Kösters 2022-04-03 12:32:23 +00:00
commit 272e27ae01
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/database/rooms.rs
View file

@ -1970,6 +1970,30 @@ impl Rooms {
continue; continue;
} }
// If the RoomMember event has a non-empty state_key, it is targeted at someone.
// If it is our appservice user, we send this PDU to it.
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())
{
if let Some(appservice_uid) = appservice
.1
.get("sender_localpart")
.and_then(|string| string.as_str())
.and_then(|string| {
UserId::parse_with_server_name(string, db.globals.server_name()).ok()
})
{
if state_key_uid == &appservice_uid {
db.sending.send_pdu_appservice(&appservice.0, &pdu_id)?;
continue;
}
}
}
}
if let Some(namespaces) = appservice.1.get("namespaces") { if let Some(namespaces) = appservice.1.get("namespaces") {
let users = namespaces let users = namespaces
.get("users") .get("users")