aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--events/receiptevent.cpp2
-rw-r--r--events/receiptevent.h1
-rw-r--r--jobs/geteventsjob.cpp96
-rw-r--r--jobs/geteventsjob.h49
-rw-r--r--jobs/roommembersjob.cpp70
-rw-r--r--jobs/roommembersjob.h47
-rw-r--r--logmessage.cpp60
-rw-r--r--logmessage.h44
9 files changed, 1 insertions, 369 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7a2db91..24cdd58d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,6 @@ set(libqmatrixclient_SRCS
connection.cpp
room.cpp
user.cpp
- logmessage.cpp
state.cpp
settings.cpp
events/event.cpp
diff --git a/events/receiptevent.cpp b/events/receiptevent.cpp
index a4963cc8..74e89ba2 100644
--- a/events/receiptevent.cpp
+++ b/events/receiptevent.cpp
@@ -81,7 +81,7 @@ ReceiptEvent* ReceiptEvent::fromJson(const QJsonObject& obj)
{
const QJsonObject user = reads[userId].toObject();
const QDateTime time = QDateTime::fromMSecsSinceEpoch( (quint64) user["ts"].toDouble(), Qt::UTC );
- receipts.push_back({ eventId, userId, time });
+ receipts.push_back({ userId, time });
}
e->d->eventToReceipts.insert(eventId, receipts);
}
diff --git a/events/receiptevent.h b/events/receiptevent.h
index cf08fed9..add5e20f 100644
--- a/events/receiptevent.h
+++ b/events/receiptevent.h
@@ -28,7 +28,6 @@ namespace QMatrixClient
class Receipt
{
public:
- QString eventId;
QString userId;
QDateTime timestamp;
};
diff --git a/jobs/geteventsjob.cpp b/jobs/geteventsjob.cpp
deleted file mode 100644
index 748a0189..00000000
--- a/jobs/geteventsjob.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#include "geteventsjob.h"
-
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
-#include <QtCore/QJsonArray>
-#include <QtCore/QDebug>
-
-#include <QtNetwork/QNetworkReply>
-
-#include "../room.h"
-#include "../connectiondata.h"
-#include "../events/event.h"
-
-using namespace QMatrixClient;
-
-class GetEventsJob::Private
-{
- public:
- Private() {}
-
- QList<Event*> events;
- QString from;
-};
-
-GetEventsJob::GetEventsJob(ConnectionData* connection, QString from)
- : BaseJob(connection, JobHttpType::GetJob)
- , d(new Private)
-{
- if( from.isEmpty() )
- from = connection->lastEvent();
- d->from = from;
-}
-
-GetEventsJob::~GetEventsJob()
-{
- delete d;
-}
-
-QList< Event* > GetEventsJob::events()
-{
- return d->events;
-}
-
-QString GetEventsJob::apiPath()
-{
- return "_matrix/client/r0/events";
-}
-
-QUrlQuery GetEventsJob::query()
-{
- QUrlQuery query;
- query.addQueryItem("from", d->from);
- return query;
-}
-
-void GetEventsJob::parseJson(const QJsonDocument& data)
-{
- QJsonObject json = data.object();
- if( !json.contains("chunk") || !json.value("chunk").isArray() )
- {
- fail( BaseJob::UserDefinedError, "Couldn't find chunk" );
- return;
- }
- QJsonArray chunk = json.value("chunk").toArray();
-// qDebug() << chunk;
- for( const QJsonValue& val: chunk )
- {
- QJsonObject eventObj = val.toObject();
- Event* event = Event::fromJson(eventObj);
- if( event )
- {
- d->events.append(event);
- }
- }
- connection()->setLastEvent( json.value("end").toString() );
- emitResult();
-} \ No newline at end of file
diff --git a/jobs/geteventsjob.h b/jobs/geteventsjob.h
deleted file mode 100644
index d2eb75eb..00000000
--- a/jobs/geteventsjob.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#ifndef QMATRIXCLIENT_GETEVENTSJOB_H
-#define QMATRIXCLIENT_GETEVENTSJOB_H
-
-#include "basejob.h"
-
-namespace QMatrixClient
-{
- class ConnectionData;
- class Room;
- class Event;
- class GetEventsJob: public BaseJob
- {
- Q_OBJECT
- public:
- GetEventsJob(ConnectionData* connection, QString from=QString());
- virtual ~GetEventsJob();
-
- QList<Event*> events();
-
- protected:
- QString apiPath();
- QUrlQuery query();
- void parseJson(const QJsonDocument& data);
-
- private:
- class Private;
- Private* d;
- };
-}
-
-#endif // QMATRIXCLIENT_GETEVENTSJOB_H \ No newline at end of file
diff --git a/jobs/roommembersjob.cpp b/jobs/roommembersjob.cpp
deleted file mode 100644
index 7fc44c63..00000000
--- a/jobs/roommembersjob.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#include "roommembersjob.h"
-
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonArray>
-#include <QtCore/QDebug>
-
-#include "../room.h"
-#include "../state.h"
-
-using namespace QMatrixClient;
-
-class RoomMembersJob::Private
-{
- public:
- Room* room;
- QList<State*> states;
-};
-
-RoomMembersJob::RoomMembersJob(ConnectionData* data, Room* room)
- : BaseJob(data, JobHttpType::GetJob, "RoomMembersJob")
- , d(new Private)
-{
- d->room = room;
-}
-
-RoomMembersJob::~RoomMembersJob()
-{
- delete d;
-}
-
-QList< State* > RoomMembersJob::states()
-{
- return d->states;
-}
-
-QString RoomMembersJob::apiPath() const
-{
- return QString("_matrix/client/r0/rooms/%1/members").arg(d->room->id());
-}
-
-BaseJob::Status RoomMembersJob::parseJson(const QJsonDocument& data)
-{
- QJsonArray chunk = data.object().value("chunk").toArray();
- for( const QJsonValue& val : chunk )
- {
- State* state = State::fromJson(val.toObject());
- if( state )
- d->states.append(state);
- }
- qDebug() << "States: " << d->states.count();
- return Success;
-}
diff --git a/jobs/roommembersjob.h b/jobs/roommembersjob.h
deleted file mode 100644
index 04803d67..00000000
--- a/jobs/roommembersjob.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#ifndef QMATRIXCLIENT_ROOMMEMBERSJOB_H
-#define QMATRIXCLIENT_ROOMMEMBERSJOB_H
-
-#include "basejob.h"
-
-namespace QMatrixClient
-{
- class ConnectionData;
- class Room;
- class State;
- class RoomMembersJob: public BaseJob
- {
- public:
- RoomMembersJob(ConnectionData* data, Room* room);
- virtual ~RoomMembersJob();
-
- QList<State*> states();
-
- protected:
- QString apiPath() const override;
- Status parseJson(const QJsonDocument& data) override;
-
- private:
- class Private;
- Private* d;
- };
-}
-
-#endif // QMATRIXCLIENT_ROOMMEMBERSJOB_H
diff --git a/logmessage.cpp b/logmessage.cpp
deleted file mode 100644
index 8b385c25..00000000
--- a/logmessage.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#include "logmessage.h"
-
-using namespace QMatrixClient;
-
-class LogMessage::Private
-{
- public:
- Private() {}
-
- MessageType type;
- QString message;
- QString author;
-};
-
-LogMessage::LogMessage(LogMessage::MessageType type, QString message, QString author)
- : d(new Private)
-{
- d->type = type;
- d->message = message;
- d->author = author;
-}
-
-LogMessage::~LogMessage()
-{
- delete d;
-}
-
-LogMessage::MessageType LogMessage::type() const
-{
- return d->type;
-}
-
-QString LogMessage::message() const
-{
- return d->message;
-}
-
-QString LogMessage::author() const
-{
- return d->author;
-}
-
diff --git a/logmessage.h b/logmessage.h
deleted file mode 100644
index bb58af65..00000000
--- a/logmessage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
- */
-
-#ifndef QMATRIXCLIENT_LOGMESSAGE_H
-#define QMATRIXCLIENT_LOGMESSAGE_H
-
-#include <QtCore/QString>
-
-namespace QMatrixClient
-{
- class LogMessage
- {
- public:
- enum MessageType{ UserMessage, StatusMessage };
-
- LogMessage( MessageType type, QString message, QString author=QString() );
- virtual ~LogMessage();
-
- MessageType type() const;
- QString message() const;
- QString author() const;
-
- private:
- class Private;
- Private* d;
- };
-}
-
-#endif // QMATRIXCLIENT_LOGMESSAGE_H \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:02:33 +0000