[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ruqola] src: Continue to implement restapi
From: Laurent Montel <null () kde ! org>
Date: 2017-12-28 20:36:20
Message-ID: E1eUeua-0004kE-My () code ! kde ! org
[Download RAW message or body]
Git commit 405e444707bdf0450861ed5a8ed812844056981a by Laurent Montel.
Committed on 28/12/2017 at 20:36.
Pushed by mlaurent into branch 'master'.
Continue to implement restapi
M +12 -1 src/ddpapi/ddpclient.cpp
M +1 -0 src/ddpapi/ddpclient.h
M +2 -1 src/restapi/restapirequest.cpp
M +53 -1 src/restapi/restapiutil.cpp
M +27 -1 src/restapi/restapiutil.h
M +4 -3 src/rocketchataccount.cpp
M +0 -3 src/rocketchatbackend.cpp
https://commits.kde.org/ruqola/405e444707bdf0450861ed5a8ed812844056981a
diff --git a/src/ddpapi/ddpclient.cpp b/src/ddpapi/ddpclient.cpp
index 3975345..6605af1 100644
--- a/src/ddpapi/ddpclient.cpp
+++ b/src/ddpapi/ddpclient.cpp
@@ -22,6 +22,7 @@
*/
#include "ddpclient.h"
+#include "restapi/restapirequest.h"
#include "utils.h"
#include "ruqola_ddpapi_debug.h"
#include "rocketchatmessage.h"
@@ -353,6 +354,12 @@ quint64 DDPClient::openDirectChannel(const QString &userId)
return method(result, open_direct_channel, DDPClient::Persistent);
}
+quint64 DDPClient::setReaction(const QString &emoji, const QString &messageId)
+{
+ const RocketChatMessage::RocketChatMessageResult result = \
mRocketChatMessage->setReaction(emoji, messageId, m_uid); + return method(result, \
empty_callback, DDPClient::Persistent); +}
+
quint64 DDPClient::createPrivateGroup(const QString &name, const QStringList \
&userList) {
const RocketChatMessage::RocketChatMessageResult result = \
mRocketChatMessage->createPrivateGroup(name, userList, m_uid); @@ -512,7 +519,11 @@ \
void DDPClient::onTextMessageReceived(const QString &message)
login(); // Let's keep trying to log in
} else {
- \
mRocketChatAccount->settings()->setAuthToken(root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString());
+ const QString token = \
root.value(QLatin1String("result")).toObject().value(QLatin1String("token")).toString();
+ mRocketChatAccount->settings()->setAuthToken(token);
+ mRocketChatAccount->restApi()->setAuthToken(token);
+ \
mRocketChatAccount->restApi()->setUserId(root.value(QLatin1String("id")).toString()); \
+ //mRocketChatAccount->restApi()->channelList(); \
setLoginStatus(DDPClient::LoggedIn); }
}
diff --git a/src/ddpapi/ddpclient.h b/src/ddpapi/ddpclient.h
index 68c3e4c..05f1bba 100644
--- a/src/ddpapi/ddpclient.h
+++ b/src/ddpapi/ddpclient.h
@@ -164,6 +164,7 @@ public:
quint64 starMessage(const QString &messageId, const QString &rid, bool starred);
quint64 setRoomIsReadOnly(const QString &roomId, bool readOnly);
quint64 archiveRoom(const QString &roomId);
+ quint64 setReaction(const QString &emoji, const QString &messageId);
Q_SIGNALS:
void connectedChanged();
void loginStatusChanged();
diff --git a/src/restapi/restapirequest.cpp b/src/restapi/restapirequest.cpp
index 4033763..91403b5 100644
--- a/src/restapi/restapirequest.cpp
+++ b/src/restapi/restapirequest.cpp
@@ -205,8 +205,9 @@ void RestApiRequest::channelList()
if (mUserId.isEmpty() || mAuthToken.isEmpty()) {
qCWarning(RUQOLA_RESTAPI_LOG) << "RestApiRequest::channelList problem with \
mUserId or mAuthToken"; } else {
- const QUrl url = QUrl(RestApiUtil::adaptUrl(mServerUrl) + \
QStringLiteral("/api/v1/channels.list")); + const QUrl url = \
QUrl(RestApiUtil::adaptUrl(mServerUrl) + RestApiUtil::apiUri() + \
RestApiUtil::restUrl(RestApiUtil::RestApiUrlType::ChannelsList)); QNetworkRequest \
request(url); + qDebug() << " url "<< url;
request.setRawHeader(QByteArrayLiteral("X-Auth-Token"), \
mAuthToken.toLocal8Bit());
request.setRawHeader(QByteArrayLiteral("X-User-Id"), mUserId.toLocal8Bit());
QNetworkReply *reply = mNetworkAccessManager->get(request);
diff --git a/src/restapi/restapiutil.cpp b/src/restapi/restapiutil.cpp
index c7addcc..06c76ce 100644
--- a/src/restapi/restapiutil.cpp
+++ b/src/restapi/restapiutil.cpp
@@ -36,7 +36,7 @@ QString RestApiUtil::adaptUrl(const QString &url)
QString RestApiUtil::apiUri()
{
- return QStringLiteral("/api/v1");
+ return QStringLiteral("/api/v1/");
}
QString RestApiUtil::restUrl(RestApiUtil::RestApiUrlType type)
@@ -86,6 +86,58 @@ QString RestApiUtil::restUrl(RestApiUtil::RestApiUrlType type)
return QStringLiteral("chat.unStarMessage");
case RestApiUtil::RestApiUrlType::ChatUpdate:
return QStringLiteral("chat.update");
+ case RestApiUtil::RestApiUrlType::ChannelsAddAll:
+ return QStringLiteral("channels.addAll");
+ case RestApiUtil::RestApiUrlType::ChannelsAddModerator:
+ return QStringLiteral("channels.addModerator");
+ case RestApiUtil::RestApiUrlType::ChannelsAddOwner:
+ return QStringLiteral("channels.addOwner");
+ case RestApiUtil::RestApiUrlType::ChannelsArchive:
+ return QStringLiteral("channels.archive");
+ case RestApiUtil::RestApiUrlType::ChannelsCleanHistory:
+ return QStringLiteral("channels.cleanHistory");
+ case RestApiUtil::RestApiUrlType::ChannelsClose:
+ return QStringLiteral("channels.close");
+ case RestApiUtil::RestApiUrlType::ChannelsCreate:
+ return QStringLiteral("channels.create");
+ case RestApiUtil::RestApiUrlType::ChannelsGetIntegrations:
+ return QStringLiteral("channels.getIntegrations");
+ case RestApiUtil::RestApiUrlType::ChannelsHistory:
+ return QStringLiteral("channels.history");
+ case RestApiUtil::RestApiUrlType::ChannelsInfo:
+ return QStringLiteral("channels.info");
+ case RestApiUtil::RestApiUrlType::ChannelsInvite:
+ return QStringLiteral("channels.invite");
+ case RestApiUtil::RestApiUrlType::ChannelsKick:
+ return QStringLiteral("channels.kick");
+ case RestApiUtil::RestApiUrlType::ChannelsLeave:
+ return QStringLiteral("channels.leave");
+ case RestApiUtil::RestApiUrlType::ChannelsList:
+ return QStringLiteral("channels.list");
+ case RestApiUtil::RestApiUrlType::ChannelsListJoined:
+ return QStringLiteral("channels.list.joined");
+ case RestApiUtil::RestApiUrlType::ChannelsOpen:
+ return QStringLiteral("channels.open");
+ case RestApiUtil::RestApiUrlType::ChannelsRemoveModerator:
+ return QStringLiteral("channels.removeModerator");
+ case RestApiUtil::RestApiUrlType::ChannelsRemoveOwner:
+ return QStringLiteral("channels.removeOwner");
+ case RestApiUtil::RestApiUrlType::ChannelsRename:
+ return QStringLiteral("channels.rename");
+ case RestApiUtil::RestApiUrlType::ChannelsSetDescription:
+ return QStringLiteral("channels.setDescription");
+ case RestApiUtil::RestApiUrlType::ChannelsSetJoinCode:
+ return QStringLiteral("channels.setJoinCode");
+ case RestApiUtil::RestApiUrlType::ChannelsSetPurpose:
+ return QStringLiteral("channels.setPurpose");
+ case RestApiUtil::RestApiUrlType::ChannelsSetReadOnly:
+ return QStringLiteral("channels.setReadOnly");
+ case RestApiUtil::RestApiUrlType::ChannelsSetTopic:
+ return QStringLiteral("channels.setTopic");
+ case RestApiUtil::RestApiUrlType::ChannelsSetType:
+ return QStringLiteral("channels.setType");
+ case RestApiUtil::RestApiUrlType::ChannelsUnarchive:
+ return QStringLiteral("channels.unarchive");
}
#if 0
//Channel
diff --git a/src/restapi/restapiutil.h b/src/restapi/restapiutil.h
index 9e1d685..0ab26cd 100644
--- a/src/restapi/restapiutil.h
+++ b/src/restapi/restapiutil.h
@@ -47,7 +47,33 @@ enum class RestApiUrlType {
ChatStarMessage,
ChatUnPinMessage,
ChatUnStarMessage,
- ChatUpdate
+ ChatUpdate,
+ ChannelsAddAll,
+ ChannelsAddModerator,
+ ChannelsAddOwner,
+ ChannelsArchive,
+ ChannelsCleanHistory,
+ ChannelsClose,
+ ChannelsCreate,
+ ChannelsGetIntegrations,
+ ChannelsHistory,
+ ChannelsInfo,
+ ChannelsInvite,
+ ChannelsKick,
+ ChannelsLeave,
+ ChannelsList,
+ ChannelsListJoined,
+ ChannelsOpen,
+ ChannelsRemoveModerator,
+ ChannelsRemoveOwner,
+ ChannelsRename,
+ ChannelsSetDescription,
+ ChannelsSetJoinCode,
+ ChannelsSetPurpose,
+ ChannelsSetReadOnly,
+ ChannelsSetTopic,
+ ChannelsSetType,
+ ChannelsUnarchive,
};
LIBRUQOLACORE_TESTS_EXPORT QString adaptUrl(const QString &url);
LIBRUQOLACORE_TESTS_EXPORT QString restUrl(RestApiUtil::RestApiUrlType type);
diff --git a/src/rocketchataccount.cpp b/src/rocketchataccount.cpp
index 9d7491d..4ce317f 100644
--- a/src/rocketchataccount.cpp
+++ b/src/rocketchataccount.cpp
@@ -34,14 +34,15 @@
#include "ruqolaserverconfig.h"
#include "usercompletermodel.h"
+#include "ddpapi/ddpclient.h"
+#include "restapi/restapirequest.h"
+
#include <KLocalizedString>
#include <QDesktopServices>
#include <QFile>
#include <QFileDialog>
-#include <ddpapi/ddpclient.h>
-#include <restapi/restapirequest.h>
RocketChatAccount::RocketChatAccount(const QString &accountFileName, QObject \
*parent) : QObject(parent)
@@ -543,5 +544,5 @@ void RocketChatAccount::downloadFile(const QString &url)
//TODO download it.
qDebug() << " void RocketChatAccount::downloadFile(const QString &url)" << \
settings()->serverUrl() + url;
const QUrl clickedUrl = QUrl::fromUserInput(settings()->serverUrl() + url);
- QDesktopServices::openUrl(clickedUrl);
+ //QDesktopServices::openUrl(clickedUrl);
}
diff --git a/src/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
index ad80ce7..31b4bd0 100644
--- a/src/rocketchatbackend.cpp
+++ b/src/rocketchatbackend.cpp
@@ -208,9 +208,6 @@ void RocketChatBackend::onAdded(const QJsonObject &object)
if (username == mRocketChatAccount->settings()->userName()) {
mRocketChatAccount->settings()->setUserId(object[QStringLiteral("id")].toString());
qCDebug(RUQOLA_LOG) << "User id set to " << \
mRocketChatAccount->settings()->userId();
- mRocketChatAccount->restApi()->setUserName(mRocketChatAccount->settings()->userName());
- mRocketChatAccount->restApi()->setPassword(mRocketChatAccount->settings()->password());
- mRocketChatAccount->restApi()->login();
} else {
//TODO add current user ? me ?
User *user = new User;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic