From a4c6278c98facd27e5afb71b6c2b6aff18368cce Mon Sep 17 00:00:00 2001
From: James Graham <jhgraham@gmail.com>
Date: Thu, 4 Apr 2024 10:54:38 +0100
Subject: [PATCH] Updates based on comments

---
 Quotient/events/serveraclevent.cpp  | 21 ---------------------
 Quotient/events/serveraclevent.h    | 19 -------------------
 Quotient/events/simplestateevents.h | 12 ++++++++++++
 3 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 Quotient/events/serveraclevent.cpp
 delete mode 100644 Quotient/events/serveraclevent.h

diff --git a/Quotient/events/serveraclevent.cpp b/Quotient/events/serveraclevent.cpp
deleted file mode 100644
index 0b1625e7f..000000000
--- a/Quotient/events/serveraclevent.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#include "serveraclevent.h"
-
-using namespace Quotient;
-
-QStringList ServerAclEvent::allow() const
-{
-    return contentPart<QStringList>("allow"_ls);
-}
-
-bool ServerAclEvent::allowIpLiterals() const
-{
-    return contentPart<bool>("allow_ip_literals"_ls);
-}
-
-QStringList ServerAclEvent::deny() const
-{
-    return contentPart<QStringList>("deny"_ls);
-}
diff --git a/Quotient/events/serveraclevent.h b/Quotient/events/serveraclevent.h
deleted file mode 100644
index d9bbdea43..000000000
--- a/Quotient/events/serveraclevent.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include "stateevent.h"
-
-namespace Quotient {
-class QUOTIENT_API ServerAclEvent : public StateEvent {
-public:
-    QUO_EVENT(ServerAclEvent, "m.room.server_acl")
-
-    using StateEvent::StateEvent;
-
-    QStringList allow() const;
-    bool allowIpLiterals() const;
-    QStringList deny() const;
-};
-} // namespace Quotient
diff --git a/Quotient/events/simplestateevents.h b/Quotient/events/simplestateevents.h
index 9aa5070ea..15005bd92 100644
--- a/Quotient/events/simplestateevents.h
+++ b/Quotient/events/simplestateevents.h
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
@@ -50,4 +51,15 @@ class QUOTIENT_API RoomAliasesEvent
         " RoomCanonicalAliasEvent::altAliases() to get non-authoritative aliases")
     QStringList aliases() const { return content().value; }
 };
+
+class QUOTIENT_API RoomServerAclEvent : public StateEvent {
+public:
+    QUO_EVENT(RoomServerAclEvent, "m.room.server_acl")
+
+    using StateEvent::StateEvent;
+
+    QUO_CONTENT_GETTER(QStringList, allow)
+    QUO_CONTENT_GETTER(bool, allowIpLiterals)
+    QUO_CONTENT_GETTER(QStringList, deny)
+};
 } // namespace Quotient