fix(ui): groupcolors fix2

src/chatlog/chatmessage.cpp

@@ -44,7 +44,7 @@ ChatMessage::ChatMessage()
 }
 
 ChatMessage::Ptr ChatMessage::createChatMessage(const QString& sender, const QString& rawMessage,
-                                                MessageType type, bool isMe, const QDateTime& date)
+                                                MessageType type, bool isMe, const QDateTime& date, bool colorizeName)
 {
     ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage);
 
@@ -91,7 +91,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString& sender, const QSt
 
     QColor color = QColor(0, 0, 0);
 
-    if (Settings::getInstance().getEnableGroupChatsColor())
+    if (colorizeName && Settings::getInstance().getEnableGroupChatsColor())
     {
         QByteArray hash = QCryptographicHash::hash((sender.toUtf8()), QCryptographicHash::Md5);
         quint8 *data = (quint8*)hash.data();

src/chatlog/chatmessage.h

@@ -49,7 +49,7 @@ public:
 
     static ChatMessage::Ptr createChatMessage(const QString& sender, const QString& rawMessage,
                                               MessageType type, bool isMe,
-                                              const QDateTime& date = QDateTime());
+                                              const QDateTime& date = QDateTime(), bool colorizeName = false);
     static ChatMessage::Ptr createChatInfoMessage(const QString& rawMessage, SystemMessageType type,
                                                   const QDateTime& date);
     static ChatMessage::Ptr createFileTransferMessage(const QString& sender, ToxFile file,

src/widget/form/genericchatform.cpp

@@ -372,7 +372,7 @@ bool GenericChatForm::needsToHideName(const ToxPk& messageAuthor, const QDateTim
  * @return ChatMessage object
  */
 ChatMessage::Ptr GenericChatForm::createMessage(const ToxPk& author, const QString& message,
-                                                const QDateTime& dt, bool isAction, bool isSent)
+                                                const QDateTime& dt, bool isAction, bool isSent, bool colorizeName)
 {
     const Core* core = Core::getInstance();
     bool isSelf = author == core->getSelfId().getPublicKey();
@@ -383,10 +383,10 @@ ChatMessage::Ptr GenericChatForm::createMessage(const ToxPk& author, const QStri
 
     ChatMessage::Ptr msg;
     if (isAction) {
-        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::ACTION, isSelf);
+        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::ACTION, isSelf, QDateTime(), colorizeName);
         previousId = ToxPk{};
     } else {
-        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::NORMAL, isSelf);
+        msg = ChatMessage::createChatMessage(authorStr, message, ChatMessage::NORMAL, isSelf, QDateTime(), colorizeName);
         const QDateTime newMsgDateTime = QDateTime::currentDateTime();
         if (needsToHideName(author, newMsgDateTime)) {
             msg->hideSender();
@@ -418,9 +418,9 @@ ChatMessage::Ptr GenericChatForm::createSelfMessage(const QString& message, cons
  * @brief Inserts message into ChatLog
  */
 void GenericChatForm::addMessage(const ToxPk& author, const QString& message, const QDateTime& dt,
-                                 bool isAction)
+                                 bool isAction, bool colorizeName)
 {
-    createMessage(author, message, dt, isAction, true);
+    createMessage(author, message, dt, isAction, true, colorizeName);
 }
 
 /**
@@ -431,11 +431,11 @@ void GenericChatForm::addSelfMessage(const QString& message, const QDateTime& da
     createSelfMessage(message, datetime, isAction, true);
 }
 
-void GenericChatForm::addAlertMessage(const ToxPk& author, const QString& msg, const QDateTime& dt)
+void GenericChatForm::addAlertMessage(const ToxPk& author, const QString& msg, const QDateTime& dt, bool colorizeName)
 {
     QString authorStr = resolveToxPk(author);
     bool isSelf = author == Core::getInstance()->getSelfId().getPublicKey();
-    auto chatMsg = ChatMessage::createChatMessage(authorStr, msg, ChatMessage::ALERT, isSelf, dt);
+    auto chatMsg = ChatMessage::createChatMessage(authorStr, msg, ChatMessage::ALERT, isSelf, dt, colorizeName);
     const QDateTime newMsgDateTime = QDateTime::currentDateTime();
     if (needsToHideName(author, newMsgDateTime)) {
         chatMsg->hideSender();

src/widget/form/genericchatform.h

@@ -75,11 +75,11 @@ public:
     virtual void show(ContentLayout* contentLayout);
 
     void addMessage(const ToxPk& author, const QString& message, const QDateTime& datetime,
-                    bool isAction);
+                    bool isAction, bool colorizeName = false);
     void addSelfMessage(const QString& message, const QDateTime& datetime, bool isAction);
     void addSystemInfoMessage(const QString& message, ChatMessage::SystemMessageType type,
                               const QDateTime& datetime);
-    void addAlertMessage(const ToxPk& author, const QString& message, const QDateTime& datetime);
+    void addAlertMessage(const ToxPk& author, const QString& message, const QDateTime& datetime, bool colorizeName = false);
     static QString resolveToxPk(const ToxPk& pk);
     QDate getLatestDate() const;
     QDate getFirstDate() const;
@@ -127,7 +127,7 @@ private:
 
 protected:
     ChatMessage::Ptr createMessage(const ToxPk& author, const QString& message,
-                                   const QDateTime& datetime, bool isAction, bool isSent);
+                                   const QDateTime& datetime, bool isAction, bool isSent, bool colorizeName = false);
     ChatMessage::Ptr createSelfMessage(const QString& message, const QDateTime& datetime,
                                        bool isAction, bool isSent);
     bool needsToHideName(const ToxPk& messageAuthor, const QDateTime& messageTime) const;

src/widget/widget.cpp

@@ -1750,10 +1750,11 @@ void Widget::onGroupMessageReceived(int groupnumber, int peernumber, const QStri
     const auto groupId = g->getId();
     const auto date = QDateTime::currentDateTime();
     auto form = groupChatForms[groupId];
+
     if (targeted && !isAction) {
-        form->addAlertMessage(author, message, date);
+        form->addAlertMessage(author, message, date, true);
     } else {
-        form->addMessage(author, message, date, isAction);
+        form->addMessage(author, message, date, isAction, true);
     }
 
     newGroupMessageAlert(groupId, targeted || Settings::getInstance().getGroupAlwaysNotify());