Skip to content
Snippets Groups Projects
Verified Commit 4af8d7d3 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Show some generic message for ACL changes

fixes #1476
parent 0dbc9444
No related branches found
No related tags found
No related merge requests found
Pipeline #4904 failed
...@@ -282,6 +282,20 @@ Item { ...@@ -282,6 +282,20 @@ Item {
} }
DelegateChoice {
roleValue: MtxEvent.ServerAcl
NoticeMessage {
body: formatted
isOnlyEmoji: false
isReply: d.isReply
keepFullText: d.keepFullText
isStateEvent: d.isStateEvent
formatted: qsTr("%1 changed which servers are allowed in this room.").arg(d.userName)
}
}
DelegateChoice { DelegateChoice {
roleValue: MtxEvent.Name roleValue: MtxEvent.Name
......
...@@ -216,6 +216,8 @@ qml_mtx_events::toRoomEventType(mtx::events::EventType e) ...@@ -216,6 +216,8 @@ qml_mtx_events::toRoomEventType(mtx::events::EventType e)
return qml_mtx_events::EventType::Topic; return qml_mtx_events::EventType::Topic;
case EventType::RoomTombstone: case EventType::RoomTombstone:
return qml_mtx_events::EventType::Tombstone; return qml_mtx_events::EventType::Tombstone;
case EventType::RoomServerAcl:
return qml_mtx_events::EventType::ServerAcl;
case EventType::RoomRedaction: case EventType::RoomRedaction:
return qml_mtx_events::EventType::Redaction; return qml_mtx_events::EventType::Redaction;
case EventType::RoomPinnedEvents: case EventType::RoomPinnedEvents:
...@@ -334,6 +336,9 @@ qml_mtx_events::fromRoomEventType(qml_mtx_events::EventType t) ...@@ -334,6 +336,9 @@ qml_mtx_events::fromRoomEventType(qml_mtx_events::EventType t)
/// m.room.tombstone /// m.room.tombstone
case qml_mtx_events::Tombstone: case qml_mtx_events::Tombstone:
return mtx::events::EventType::RoomTombstone; return mtx::events::EventType::RoomTombstone;
/// m.room.server_acl
case qml_mtx_events::ServerAcl:
return mtx::events::EventType::RoomServerAcl;
/// m.room.topic /// m.room.topic
case qml_mtx_events::Topic: case qml_mtx_events::Topic:
return mtx::events::EventType::RoomTopic; return mtx::events::EventType::RoomTopic;
......
...@@ -85,6 +85,8 @@ enum EventType ...@@ -85,6 +85,8 @@ enum EventType
PowerLevels, PowerLevels,
/// m.room.tombstone /// m.room.tombstone
Tombstone, Tombstone,
/// m.room.server_acl
ServerAcl,
/// m.room.topic /// m.room.topic
Topic, Topic,
/// m.room.redaction /// m.room.redaction
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment