rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: media thumbnail calculation and appservice detection

Browse Source
This commit is contained in:
Timo Kösters
2021-03-23 19:46:54 +01:00
parent 3ea7d162db
commit 46d8f36a2c
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/database/rooms.rs
View File

@@ -1193,6 +1193,9 @@ impl Rooms {
.state_key
.as_ref()
.map_or(false, |state_key| users.is_match(&state_key))
|| db.rooms.room_members(&room_id).any(|userid| {
userid.map_or(false, |userid| users.is_match(userid.as_str()))
})
};
let matching_aliases = |aliases: &Regex| {
self.room_aliases(&room_id)
@@ -1201,9 +1204,9 @@ impl Rooms {
};
if bridge_user_id.map_or(false, user_is_joined)
|| users.iter().any(matching_users)
|| aliases.iter().any(matching_aliases)
|| rooms.map_or(false, |rooms| rooms.contains(&room_id.as_str().into()))
|| users.iter().any(matching_users)
{
db.sending.send_pdu_appservice(&appservice.0, &pdu_id)?;
}