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

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

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

Allow to define join code

M  +14   -0    src/rocketchatrestapi-qt5/restapirequest.cpp
M  +2    -0    src/rocketchatrestapi-qt5/restapirequest.h
M  +15   -1    src/ruqolacore/message.cpp
M  +6    -0    src/ruqolacore/message.h

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

diff --git a/src/rocketchatrestapi-qt5/restapirequest.cpp b/src/rocketchatrestapi-qt5/restapirequest.cpp
index 6bd49b00..799f5a52 100644
--- a/src/rocketchatrestapi-qt5/restapirequest.cpp
+++ b/src/rocketchatrestapi-qt5/restapirequest.cpp
@@ -64,6 +64,7 @@
 #include "channels/channelinvitejob.h"
 #include "channels/setchanneltypejob.h"
 #include "channels/getchannelrolesjob.h"
+#include "channels/setjoincodechanneljob.h"
 
 #include "groups/changegroupsannouncementjob.h"
 #include "groups/changegroupstopicjob.h"
@@ -936,3 +937,16 @@ void RestApiRequest::fetchKeyChain()
         qCDebug(ROCKETCHATQTRESTAPI_LOG) << "Impossible to start fetch key chain job";
     }
 }
+
+
+void RestApiRequest::setJoinCodeChannel(const QString &roomId, const QString &joinCode)
+{
+    SetJoinCodeChannelJob *job = new SetJoinCodeChannelJob(this);
+    initializeRestApiJob(job);
+    job->setJoinCode(joinCode);
+    job->setRoomId(roomId);
+    connect(job, &SetJoinCodeChannelJob::setJoinCodeDone, this, &RestApiRequest::setJoinCodeDone);
+    if (!job->start()) {
+        qCDebug(ROCKETCHATQTRESTAPI_LOG) << "Impossible to start setjoincode";
+    }
+}
diff --git a/src/rocketchatrestapi-qt5/restapirequest.h b/src/rocketchatrestapi-qt5/restapirequest.h
index a795fd5d..8903bde3 100644
--- a/src/rocketchatrestapi-qt5/restapirequest.h
+++ b/src/rocketchatrestapi-qt5/restapirequest.h
@@ -119,6 +119,7 @@ public:
     void listCommands();
     void fetchMyKeys();
     void fetchKeyChain();
+    void setJoinCodeChannel(const QString &roomId, const QString &joinCode);
 Q_SIGNALS:
     void avatar(const QString &userId, const QString &url);
     void logoutDone();
@@ -142,6 +143,7 @@ Q_SIGNALS:
     void listCommandsDone(const QJsonObject &obj);
     void fetchMyKeysDone();
     void fetchKeyChainDone();
+    void setJoinCodeDone();
 
 private:
     Q_DISABLE_COPY(RestApiRequest)
diff --git a/src/ruqolacore/message.cpp b/src/ruqolacore/message.cpp
index 6bef0243..ea8c7942 100644
--- a/src/ruqolacore/message.cpp
+++ b/src/ruqolacore/message.cpp
@@ -73,6 +73,7 @@ void Message::parseMessage(const QJsonObject &o, bool restApi)
     parseAttachment(o.value(QLatin1String("attachments")).toArray());
     parseUrls(o.value(QLatin1String("urls")).toArray());
     parseReactions(o.value(QLatin1String("reactions")).toObject());
+    //TODO unread element
 }
 
 void Message::parseReactions(const QJsonObject &reacts)
@@ -82,6 +83,16 @@ void Message::parseReactions(const QJsonObject &reacts)
     }
 }
 
+bool Message::unread() const
+{
+    return mUnread;
+}
+
+void Message::setUnread(bool unread)
+{
+    mUnread = unread;
+}
+
 QString Message::role() const
 {
     return mRole;
@@ -241,7 +252,8 @@ bool Message::operator==(const Message &other) const
            && (mMentions == other.mentions())
            && (mStarred == other.starred())
             && (mRole == other.role())
-            && (mReactions == other.reactions());
+            && (mReactions == other.reactions())
+            && (mUnread == other.unread());
 }
 
 Message &Message::operator=(const Message &other)
@@ -268,6 +280,7 @@ Message &Message::operator=(const Message &other)
     setStarred(other.starred());
     setRole(other.role());
     setReactions(other.reactions());
+    setUnread(other.unread());
     return *this;
 }
 
@@ -660,5 +673,6 @@ QDebug operator <<(QDebug d, const Message &t)
     d << "mMessageType: " << t.messageType();
     d << "mRole: " << t.role();
     d << "mReaction: " << t.reactions();
+    d << "mUnread: " << t.unread();
     return d;
 }
diff --git a/src/ruqolacore/message.h b/src/ruqolacore/message.h
index 529afec8..e957e5f9 100644
--- a/src/ruqolacore/message.h
+++ b/src/ruqolacore/message.h
@@ -142,6 +142,9 @@ public:
     Q_REQUIRED_RESULT QString role() const;
     void setRole(const QString &role);
 
+    Q_REQUIRED_RESULT bool unread() const;
+    void setUnread(bool uread);
+
 private:
     void parseMentions(const QJsonArray &mentions);
     void parseAttachment(const QJsonArray &attachments);
@@ -205,6 +208,9 @@ private:
 
     //Starred
     bool mStarred = false;
+
+    //Unread Message
+    bool mUnread = false;
 };
 Q_DECLARE_METATYPE(Message)
 LIBRUQOLACORE_EXPORT QDebug operator <<(QDebug d, const Message &t);

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