feat(groups): Added NGC

CMakeLists.txt

@@ -253,6 +253,8 @@ set(${BINARY_NAME}_SOURCES
     src/friendlist.h
     src/conferencelist.cpp
     src/conferencelist.h
+    src/grouplist.cpp
+    src/grouplist.h
     src/ipc.cpp
     src/ipc.h
     src/nexus.cpp
@@ -309,6 +311,10 @@ set(${BINARY_NAME}_SOURCES
     src/core/icoreconferencemessagesender.h
     src/core/icoreconferencequery.cpp
     src/core/icoreconferencequery.h
+    src/core/icoregroupmessagesender.cpp
+    src/core/icoregroupmessagesender.h
+    src/core/icoregroupquery.cpp
+    src/core/icoregroupquery.h
     src/core/icoreidhandler.cpp
     src/core/icoreidhandler.h
     src/core/idebugsettings.cpp
@@ -324,6 +330,8 @@ set(${BINARY_NAME}_SOURCES
     src/core/toxid.h
     src/core/conferenceid.cpp
     src/core/conferenceid.h
+    src/core/groupid.cpp
+    src/core/groupid.h
     src/core/toxlogger.cpp
     src/core/toxlogger.h
     src/core/toxoptions.cpp
@@ -348,6 +356,8 @@ set(${BINARY_NAME}_SOURCES
     src/model/chatroom/friendchatroom.h
     src/model/chatroom/conferenceroom.cpp
     src/model/chatroom/conferenceroom.h
+    src/model/chatroom/grouproom.cpp
+    src/model/chatroom/grouproom.h
     src/model/chat.cpp
     src/model/chat.h
     src/model/debug/debuglogmodel.cpp
@@ -374,6 +384,12 @@ set(${BINARY_NAME}_SOURCES
     src/model/conferencemessagedispatcher.h
     src/model/conference.cpp
     src/model/conference.h
+    src/model/group.cpp
+    src/model/group.h
+    src/model/groupinvite.cpp
+    src/model/groupinvite.h
+    src/model/groupmessagedispatcher.cpp
+    src/model/groupmessagedispatcher.h
     src/model/ibootstraplistgenerator.cpp
     src/model/ibootstraplistgenerator.h
     src/model/ichatlog.h
@@ -537,6 +553,12 @@ set(${BINARY_NAME}_SOURCES
     src/widget/form/conferenceinviteform.h
     src/widget/form/conferenceinvitewidget.cpp
     src/widget/form/conferenceinvitewidget.h
+    src/widget/form/groupform.cpp
+    src/widget/form/groupform.h
+    src/widget/form/groupinviteform.cpp
+    src/widget/form/groupinviteform.h
+    src/widget/form/groupinvitewidget.cpp
+    src/widget/form/groupinvitewidget.h
     src/widget/form/loadhistorydialog.cpp
     src/widget/form/loadhistorydialog.h
     src/widget/form/profileform.cpp
@@ -581,6 +603,8 @@ set(${BINARY_NAME}_SOURCES
     src/widget/genericchatroomwidget.h
     src/widget/conferencewidget.cpp
     src/widget/conferencewidget.h
+    src/widget/groupwidget.cpp
+    src/widget/groupwidget.h
     src/widget/loginscreen.cpp
     src/widget/loginscreen.h
     src/widget/maskablepixmapwidget.cpp

res.qrc

@@ -14,6 +14,8 @@
         <file>img/contact_dark.svg</file>
         <file>img/contact.svg</file>
         <file>img/debug.svg</file>
+        <file>img/group_dark.svg</file>
+        <file>img/group.svg</file>
         <file>img/icons/qtox.svg</file>
         <file>img/login_logo.svg</file>
         <file>img/others/logout-icon.svg</file>

src/chatlog/chatmessage.cpp

@@ -43,7 +43,8 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString& sender, const QSt
                                                 MessageType type, bool isMe, MessageState state,
                                                 const QDateTime& date, DocumentCache& documentCache,
                                                 SmileyPack& smileyPack, Settings& settings,
-                                                Style& style, bool colorizeName)
+                                                Style& style, bool colorizeName, bool isPrivate,
+                                                const QString& recipientName)
 {
     ChatMessage::Ptr msg = std::make_shared<ChatMessage>(documentCache, settings, style);
 
@@ -71,6 +72,17 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString& sender, const QSt
         text = TextFormatter::applyMarkdown(text, styleType == Settings::StyleType::WITH_CHARS);
     }
 
+    if (isPrivate) {
+        QString badgeText = QObject::tr("private", "Label for private group messages");
+        if (!recipientName.isEmpty()) {
+            badgeText += QStringLiteral(" → %1").arg(recipientName.toHtmlEscaped());
+        }
+        const QString badge = QStringLiteral(
+            "<span class=\"private-badge\">%1</span>&nbsp;")
+            .arg(badgeText);
+        text = badge + text;
+    }
+
 
     switch (type) {
     case NORMAL:

src/chatlog/chatmessage.h

@@ -48,7 +48,9 @@ class ChatMessage : public ChatLine
                                               MessageType type, bool isMe, MessageState state,
                                               const QDateTime& date, DocumentCache& documentCache,
                                               SmileyPack& smileyPack, Settings& settings,
-                                              Style& style, bool colorizeName = false);
+                                              Style& style, bool colorizeName = false,
+                                              bool isPrivate = false,
+                                              const QString& recipientName = QString());
     static ChatMessage::Ptr createChatInfoMessage(const QString& rawMessage, SystemMessageType type,
                                                   const QDateTime& date, DocumentCache& documentCache,
                                                   Settings& settings, Style& style);

src/chatlog/chatwidget.cpp

@@ -57,10 +57,13 @@ ChatMessage::Ptr createMessage(const QString& displayName, bool isSelf, bool col
         messageType = ChatMessage::MessageType::ALERT;
     }
 
+    const bool isPrivate = !chatLogMessage.message.recipient.isEmpty();
+    const QString recipientName = isSelf ? chatLogMessage.message.recipientName : QString();
     const auto timestamp = chatLogMessage.message.timestamp;
     return ChatMessage::createChatMessage(displayName, chatLogMessage.message.content, messageType,
                                           isSelf, chatLogMessage.state, timestamp, documentCache,
-                                          smileyPack, settings, style, colorizeNames);
+                                          smileyPack, settings, style, colorizeNames, isPrivate,
+                                          recipientName);
 }
 
 void renderMessageRaw(const QString& displayName, bool isSelf, bool colorizeNames,
@@ -1075,7 +1078,7 @@ void ChatWidget::onWorkerTimeout()
             return;
         }
 
-        if (static_cast<size_t>(workerLastIndex) >= chatLineStorage->size()) {
+        if (workerLastIndex >= chatLineStorage->size()) {
             break;
         }
 

src/core/conferenceid.cpp

@@ -26,11 +26,11 @@ ConferenceId::ConferenceId()
 /**
  * @brief Constructs a ConferenceId from bytes.
  * @param rawId The bytes to construct the ConferenceId from. The length must be exactly
- *              ConferenceId::size, else the ConferenceId will be empty.
+ *              TOX_CONFERENCE_ID_SIZE, else the ConferenceId will be empty.
  */
 ConferenceId::ConferenceId(const QByteArray& rawId)
     : ChatId([rawId]() {
-        assert(rawId.length() == size);
+        assert(rawId.length() == TOX_CONFERENCE_ID_SIZE);
         return rawId;
     }())
 {
@@ -39,10 +39,10 @@ ConferenceId::ConferenceId(const QByteArray& rawId)
 /**
  * @brief Constructs a ConferenceId from bytes.
  * @param rawId The bytes to construct the ConferenceId from, will read exactly
- * ConferenceId::size from the specified buffer.
+ * TOX_CONFERENCE_ID_SIZE from the specified buffer.
  */
 ConferenceId::ConferenceId(const uint8_t* rawId)
-    : ChatId(QByteArray(reinterpret_cast<const char*>(rawId), size))
+    : ChatId(QByteArray(reinterpret_cast<const char*>(rawId), TOX_CONFERENCE_ID_SIZE))
 {
 }
 
@@ -52,7 +52,7 @@ ConferenceId::ConferenceId(const uint8_t* rawId)
  */
 int ConferenceId::getSize() const
 {
-    return size;
+    return TOX_CONFERENCE_ID_SIZE;
 }
 
 std::unique_ptr<ChatId> ConferenceId::clone() const

src/core/conferenceid.h

@@ -10,11 +10,11 @@
 #include <QByteArray>
 
 #include <cstdint>
+#include <tox/tox.h>
 
 class ConferenceId : public ChatId
 {
 public:
-    static constexpr int size = 32;
     ConferenceId();
     explicit ConferenceId(const QByteArray& rawId);
     explicit ConferenceId(const uint8_t* rawId);