[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ruqola] src/ruqolacore: Use join channel
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-27 11:50:18
Message-ID: E1g5UoE-0001Ug-Bp () code ! kde ! org
[Download RAW message or body]

Git commit dcfcffa4c936b0be956305b49bbb61c19493df4b by Laurent Montel.
Committed on 27/09/2018 at 11:50.
Pushed by mlaurent into branch 'master'.

Use join channel

M  +8    -0    src/ruqolacore/rocketchataccount.cpp

https://commits.kde.org/ruqola/dcfcffa4c936b0be956305b49bbb61c19493df4b

diff --git a/src/ruqolacore/rocketchataccount.cpp b/src/ruqolacore/rocketchataccount.cpp
index b82cf6d0..c695f1e5 100644
--- a/src/ruqolacore/rocketchataccount.cpp
+++ b/src/ruqolacore/rocketchataccount.cpp
@@ -472,7 +472,11 @@ void RocketChatAccount::openChannel(const QString &url)
 {
     //TODO use restapi
     qCDebug(RUQOLA_LOG) << " void RocketChatAccount::openChannel(const QString &url)"<<url;
+#ifdef USE_REASTAPI_JOB
+    restApi()->channelJoin(url, QString());
+#else
     ddp()->joinRoom(url, QString());
+#endif
     //TODO search correct room + select it.
 }
 
@@ -533,8 +537,12 @@ void RocketChatAccount::createNewChannel(const QString &name, bool readOnly, boo
 
 void RocketChatAccount::joinRoom(const QString &roomId, const QString &joinCode)
 {
+#ifdef USE_REASTAPI_JOB
+    restApi()->channelJoin(roomId, joinCode);
+#else
     //TODO use restapi
     ddp()->joinRoom(roomId, joinCode);
+#endif
     ddp()->subscribeRoomMessage(roomId);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]