summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-06-10 01:09:20 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-06-10 01:09:20 +0200
commit4af8d7d397849d7240099f2096052b3683786d83 (patch)
tree709a998600fcfd3ce55f30def7172e8eea673167 /src
parentAdd inviter to the invite reason (diff)
downloadnheko-4af8d7d397849d7240099f2096052b3683786d83.tar.xz
Show some generic message for ACL changes
fixes #1476
Diffstat (limited to 'src')
-rw-r--r--src/timeline/TimelineModel.cpp5
-rw-r--r--src/timeline/TimelineModel.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 6cec615b..22fe63d4 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -216,6 +216,8 @@ qml_mtx_events::toRoomEventType(mtx::events::EventType e)
         return qml_mtx_events::EventType::Topic;
     case EventType::RoomTombstone:
         return qml_mtx_events::EventType::Tombstone;
+    case EventType::RoomServerAcl:
+        return qml_mtx_events::EventType::ServerAcl;
     case EventType::RoomRedaction:
         return qml_mtx_events::EventType::Redaction;
     case EventType::RoomPinnedEvents:
@@ -334,6 +336,9 @@ qml_mtx_events::fromRoomEventType(qml_mtx_events::EventType t)
     /// m.room.tombstone
     case qml_mtx_events::Tombstone:
         return mtx::events::EventType::RoomTombstone;
+    /// m.room.server_acl
+    case qml_mtx_events::ServerAcl:
+        return mtx::events::EventType::RoomServerAcl;
     /// m.room.topic
     case qml_mtx_events::Topic:
         return mtx::events::EventType::RoomTopic;
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index d1f04e21..a232b4ee 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -85,6 +85,8 @@ enum EventType
     PowerLevels,
     /// m.room.tombstone
     Tombstone,
+    /// m.room.server_acl
+    ServerAcl,
     /// m.room.topic
     Topic,
     /// m.room.redaction