aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2020-12-28 11:18:05 +0100
committerKitsune Ral <Kitsune-Ral@users.sf.net>2020-12-28 14:03:08 +0100
commit4bdeacdd332865abf55b94af29f100842ab5d04f (patch)
tree04674a6c22ca140e846237095b74f654887e8d1a
parent5d15e3b23649a54abdb3812c10f4a7d2ce07d7dd (diff)
downloadlibquotient-4bdeacdd332865abf55b94af29f100842ab5d04f.tar.gz
libquotient-4bdeacdd332865abf55b94af29f100842ab5d04f.zip
Use generated SetReadMarkerJob instead of PostReadMarkersJob
-rw-r--r--lib/jobs/postreadmarkersjob.h38
-rw-r--r--lib/room.cpp6
-rw-r--r--libquotient.pri1
3 files changed, 3 insertions, 42 deletions
diff --git a/lib/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
deleted file mode 100644
index 5a4d942c..00000000
--- a/lib/jobs/postreadmarkersjob.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#pragma once
-
-#include "basejob.h"
-
-#include <QtCore/QJsonObject>
-
-using namespace Quotient;
-
-class PostReadMarkersJob : public BaseJob {
-public:
- explicit PostReadMarkersJob(const QString& roomId,
- const QString& readUpToEventId)
- : BaseJob(
- HttpVerb::Post, "PostReadMarkersJob",
- QStringLiteral("_matrix/client/r0/rooms/%1/read_markers").arg(roomId))
- {
- setRequestData(
- QJsonObject { { QStringLiteral("m.fully_read"), readUpToEventId } });
- }
-};
diff --git a/lib/room.cpp b/lib/room.cpp
index 602653f3..f127b42b 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -36,6 +36,7 @@
#include "csapi/room_state.h"
#include "csapi/room_upgrades.h"
#include "csapi/rooms.h"
+#include "csapi/read_markers.h"
#include "csapi/tags.h"
#include "events/callanswerevent.h"
@@ -55,7 +56,6 @@
#include "events/roompowerlevelsevent.h"
#include "jobs/downloadfilejob.h"
#include "jobs/mediathumbnailjob.h"
-#include "jobs/postreadmarkersjob.h"
#include "events/roomcanonicalaliasevent.h"
#include <QtCore/QDir>
@@ -632,8 +632,8 @@ Room::Changes Room::Private::setLastReadEvent(User* u, QString eventId)
emit q->readMarkerForUserMoved(u, eventId, storedId);
if (isLocalUser(u)) {
if (storedId != serverReadMarker)
- connection->callApi<PostReadMarkersJob>(BackgroundRequest, id,
- storedId);
+ connection->callApi<SetReadMarkerJob>(BackgroundRequest, id,
+ storedId);
emit q->readMarkerMoved(eventId, storedId);
return Change::ReadMarkerChange;
}
diff --git a/libquotient.pri b/libquotient.pri
index ef0f112a..677f60d3 100644
--- a/libquotient.pri
+++ b/libquotient.pri
@@ -72,7 +72,6 @@ HEADERS += \
$$SRCPATH/jobs/syncjob.h \
$$SRCPATH/jobs/mediathumbnailjob.h \
$$SRCPATH/jobs/downloadfilejob.h \
- $$SRCPATH/jobs/postreadmarkersjob.h \
$$files($$SRCPATH/csapi/*.h, false) \
$$files($$SRCPATH/csapi/definitions/*.h, false) \
$$files($$SRCPATH/csapi/definitions/wellknown/*.h, false) \