|
|
|
@ -691,14 +691,15 @@ impl Service {
|
|
|
|
|
.expect("#admins:server_name is a valid room alias"),
|
|
|
|
|
)?;
|
|
|
|
|
if admin_room.filter(|v| v == room_id).is_some() {
|
|
|
|
|
if pdu.event_type() == &RoomEventType::RoomEncryption {
|
|
|
|
|
match pdu.event_type() {
|
|
|
|
|
RoomEventType::RoomEncryption => {
|
|
|
|
|
warn!("Encryption is not allowed in the admins room");
|
|
|
|
|
return Err(Error::BadRequest(
|
|
|
|
|
ErrorKind::Forbidden,
|
|
|
|
|
"Encryption is not allowed in the admins room.",
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
if pdu.event_type() == &RoomEventType::RoomMember {
|
|
|
|
|
RoomEventType::RoomMember => {
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
|
struct ExtractMembership {
|
|
|
|
|
membership: MembershipState,
|
|
|
|
@ -733,6 +734,8 @@ impl Service {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_ => {}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// We append to state before appending the pdu, so we don't have a moment in time with the
|
|
|
|
|