Use the new libquotient version of the serveracl event
Use with https://github.com/quotient-im/libQuotient/pull/729
This commit is contained in:
committed by
Tobias Fella
parent
3dd28a0382
commit
e9263fc596
@@ -156,7 +156,6 @@ add_library(neochat STATIC
|
|||||||
models/linemodel.cpp
|
models/linemodel.cpp
|
||||||
models/linemodel.h
|
models/linemodel.h
|
||||||
events/locationbeaconevent.h
|
events/locationbeaconevent.h
|
||||||
events/serveraclevent.h
|
|
||||||
events/widgetevent.h
|
events/widgetevent.h
|
||||||
enums/messagecomponenttype.h
|
enums/messagecomponenttype.h
|
||||||
models/messagecontentmodel.cpp
|
models/messagecontentmodel.cpp
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
#include "eventhandler_logging.h"
|
#include "eventhandler_logging.h"
|
||||||
#include "events/locationbeaconevent.h"
|
#include "events/locationbeaconevent.h"
|
||||||
#include "events/pollevent.h"
|
#include "events/pollevent.h"
|
||||||
#include "events/serveraclevent.h"
|
|
||||||
#include "events/widgetevent.h"
|
#include "events/widgetevent.h"
|
||||||
#include "linkpreviewer.h"
|
#include "linkpreviewer.h"
|
||||||
#include "messagecomponenttype.h"
|
#include "messagecomponenttype.h"
|
||||||
@@ -440,7 +439,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
|
|||||||
[](const LocationBeaconEvent &e) {
|
[](const LocationBeaconEvent &e) {
|
||||||
return e.contentJson()["description"_ls].toString();
|
return e.contentJson()["description"_ls].toString();
|
||||||
},
|
},
|
||||||
[](const ServerAclEvent &) {
|
[](const RoomServerAclEvent &) {
|
||||||
return i18n("changed the server access control lists for this room");
|
return i18n("changed the server access control lists for this room");
|
||||||
},
|
},
|
||||||
[](const WidgetEvent &e) {
|
[](const WidgetEvent &e) {
|
||||||
@@ -609,7 +608,7 @@ QString EventHandler::getGenericBody() const
|
|||||||
[](const LocationBeaconEvent &) {
|
[](const LocationBeaconEvent &) {
|
||||||
return i18n("sent a live location beacon");
|
return i18n("sent a live location beacon");
|
||||||
},
|
},
|
||||||
[](const ServerAclEvent &) {
|
[](const RoomServerAclEvent &) {
|
||||||
return i18n("changed the server access control lists for this room");
|
return i18n("changed the server access control lists for this room");
|
||||||
},
|
},
|
||||||
[](const WidgetEvent &e) {
|
[](const WidgetEvent &e) {
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <Quotient/events/simplestateevents.h>
|
|
||||||
|
|
||||||
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
|
|
||||||
Reference in New Issue
Block a user