diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94f55b4fa..fbbf47010 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -156,7 +156,6 @@ add_library(neochat STATIC models/linemodel.cpp models/linemodel.h events/locationbeaconevent.h - events/serveraclevent.h events/widgetevent.h enums/messagecomponenttype.h models/messagecontentmodel.cpp diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp index 001e102de..3ad95ab76 100644 --- a/src/eventhandler.cpp +++ b/src/eventhandler.cpp @@ -24,7 +24,6 @@ #include "eventhandler_logging.h" #include "events/locationbeaconevent.h" #include "events/pollevent.h" -#include "events/serveraclevent.h" #include "events/widgetevent.h" #include "linkpreviewer.h" #include "messagecomponenttype.h" @@ -440,7 +439,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f [](const LocationBeaconEvent &e) { return e.contentJson()["description"_ls].toString(); }, - [](const ServerAclEvent &) { + [](const RoomServerAclEvent &) { return i18n("changed the server access control lists for this room"); }, [](const WidgetEvent &e) { @@ -609,7 +608,7 @@ QString EventHandler::getGenericBody() const [](const LocationBeaconEvent &) { return i18n("sent a live location beacon"); }, - [](const ServerAclEvent &) { + [](const RoomServerAclEvent &) { return i18n("changed the server access control lists for this room"); }, [](const WidgetEvent &e) { diff --git a/src/events/serveraclevent.h b/src/events/serveraclevent.h deleted file mode 100644 index f67f0cd19..000000000 --- a/src/events/serveraclevent.h +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-FileCopyrightText: 2024 James Graham -// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - -#pragma once - -#include - -namespace Quotient -{ - -// Defined so we can directly switch on type. -DEFINE_SIMPLE_STATE_EVENT(ServerAclEvent, "m.room.server_acl", bool, allow_ip_literals, "allow_ip_literals") - -} // namespace Quotient