diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-05-05 19:36:15 +0900 |
| commit | a8d2a73c771f188fc0fdc6351b4923af788317d5 (patch) | |
| tree | b2795b93149f7c0ae3cd5005331b650a8eb6fd1e /lib/connection.cpp | |
| parent | da16225dfbec9b155c2c299757203f7676ac6ccf (diff) | |
| parent | a63838235134b066c092ad98e1f18ff7991c91c1 (diff) | |
| download | libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.tar.gz libquotient-a8d2a73c771f188fc0fdc6351b4923af788317d5.zip | |
Merge branch 'kitsune-gtad'
Diffstat (limited to 'lib/connection.cpp')
| -rw-r--r-- | lib/connection.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index adeb7929..24bf1af9 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -23,14 +23,13 @@ #include "events/directchatevent.h" #include "room.h" #include "settings.h" -#include "jobs/generated/login.h" -#include "jobs/generated/logout.h" -#include "jobs/generated/receipts.h" -#include "jobs/generated/leaving.h" -#include "jobs/generated/account-data.h" +#include "csapi/login.h" +#include "csapi/logout.h" +#include "csapi/receipts.h" +#include "csapi/leaving.h" +#include "csapi/account-data.h" +#include "csapi/joining.h" #include "jobs/sendeventjob.h" -#include "jobs/joinroomjob.h" -#include "jobs/roommessagesjob.h" #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" #include "jobs/downloadfilejob.h" @@ -372,11 +371,6 @@ void Connection::leaveRoom(Room* room) callApi<LeaveRoomJob>(room->id()); } -RoomMessagesJob* Connection::getMessages(Room* room, const QString& from) const -{ - return callApi<RoomMessagesJob>(room->id(), from); -} - inline auto splitMediaId(const QString& mediaId) { auto idParts = mediaId.split('/'); @@ -447,7 +441,7 @@ DownloadFileJob* Connection::downloadFile(const QUrl& url, CreateRoomJob* Connection::createRoom(RoomVisibility visibility, const QString& alias, const QString& name, const QString& topic, - const QVector<QString>& invites, const QString& presetName, + const QStringList& invites, const QString& presetName, bool isDirect, bool guestsCanJoin, const QVector<CreateRoomJob::StateEvent>& initialState, const QVector<CreateRoomJob::Invite3pid>& invite3pids, |