Move polishcolor to a utils namespace and rename getusercolor

autotests/texthandlertest.cpp

@@ -10,6 +10,8 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>
 
+#include "utils.h"
+
 using namespace Quotient;
 
 class TestRoom : public NeoChatRoom
@@ -71,13 +73,6 @@ private Q_SLOTS:
     void linkPreviewsReject();
 };
 
-static QColor polishColor(qreal hueF)
-{
-    const auto lightness = static_cast<QGuiApplication *>(QGuiApplication::instance())->palette().color(QPalette::Active, QPalette::Window).lightnessF();
-    // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
-    return QColor::fromHslF(hueF, 1, -0.7 * lightness + 0.9, 1);
-}
-
 void TextHandlerTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
@@ -565,7 +560,7 @@ void TextHandlerTest::receiveRichEmote()
     auto author = room->user(event->senderId());
     const QString testInputString = QStringLiteral("This is an emote.");
     const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + polishColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
+        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);

src/CMakeLists.txt

@@ -125,6 +125,7 @@ add_library(neochat STATIC
     locationhelper.h
     events/pollevent.cpp
     pollhandler.cpp
+    utils.h
 )
 
 ecm_qt_declare_logging_category(neochat

src/neochatroom.cpp

@@ -46,6 +46,7 @@
 #include "neochatconfig.h"
 #include "notificationsmanager.h"
 #include "texthandler.h"
+#include "utils.h"
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -408,13 +409,6 @@ QDateTime NeoChatRoom::lastActiveTime()
     return messageEvents().rbegin()->get()->originTimestamp();
 }
 
-static QColor polishColor(qreal hueF)
-{
-    const auto lightness = static_cast<QGuiApplication *>(QGuiApplication::instance())->palette().color(QPalette::Active, QPalette::Window).lightnessF();
-    // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
-    return QColor::fromHslF(hueF, 1, -0.7 * lightness + 0.9, 1);
-}
-
 QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
 {
     const auto userList = users();
@@ -426,7 +420,7 @@ QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
             QVariantMap userVariant{{QStringLiteral("id"), user.id()},
                                     {QStringLiteral("displayName"), user.displayname(this)},
                                     {QStringLiteral("avatarMediaId"), user.avatarMediaId(this)},
-                                    {QStringLiteral("color"), polishColor(user.hueF())}};
+                                    {QStringLiteral("color"), Utils::getUserColor(user.hueF())}};
 
             matchedList.append(QVariant::fromValue(userVariant));
             count++;
@@ -467,7 +461,7 @@ QVariantMap NeoChatRoom::getUser(User *user) const
         {QStringLiteral("displayName"), user->displayname(this)},
         {QStringLiteral("avatarSource"), avatarForMember(user)},
         {QStringLiteral("avatarMediaId"), user->avatarMediaId(this)},
-        {QStringLiteral("color"), polishColor(user->hueF())},
+        {QStringLiteral("color"), Utils::getUserColor(user->hueF())},
         {QStringLiteral("object"), QVariant::fromValue(user)},
     };
 }
@@ -548,7 +542,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
 
             if (prettyPrint) {
                 subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), polishColor(user(e.userId())->hueF()).name(), subjectName);
+                                  .arg(e.userId(), Utils::getUserColor(user(e.userId())->hueF()).name(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole

src/texthandler.cpp

@@ -16,6 +16,8 @@
 
 #include <Kirigami/PlatformTheme>
 
+#include "utils.h"
+
 static const QStringList allowedTags = {
     QStringLiteral("font"),    QStringLiteral("del"),    QStringLiteral("h1"),         QStringLiteral("h2"),     QStringLiteral("h3"),    QStringLiteral("h4"),
     QStringLiteral("h5"),      QStringLiteral("h6"),     QStringLiteral("blockquote"), QStringLiteral("p"),      QStringLiteral("a"),     QStringLiteral("ul"),
@@ -77,13 +79,6 @@ QString TextHandler::handleSendText()
     return outputString;
 }
 
-static QColor polishColor(qreal hueF)
-{
-    const auto lightness = static_cast<QGuiApplication *>(QGuiApplication::instance())->palette().color(QPalette::Active, QPalette::Window).lightnessF();
-    // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
-    return QColor::fromHslF(hueF, 1, -0.7 * lightness + 0.9, 1);
-}
-
 QString TextHandler::handleRecieveRichText(Qt::TextFormat inputFormat, const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines)
 {
     m_pos = 0;
@@ -145,7 +140,7 @@ QString TextHandler::handleRecieveRichText(Qt::TextFormat inputFormat, const Neo
         if (e->msgtype() == Quotient::MessageEventType::Emote) {
             auto author = room->user(e->senderId());
             QString emoteString = QStringLiteral("* <a href=\"https://matrix.to/#/") + e->senderId() + QStringLiteral("\" style=\"color:")
-                + polishColor(author->hueF()).name() + QStringLiteral("\">") + author->displayname(room) + QStringLiteral("</a> ");
+                + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">") + author->displayname(room) + QStringLiteral("</a> ");
             if (outputString.startsWith(QStringLiteral("<p>"))) {
                 outputString.insert(3, emoteString);
             } else {

src/utils.h

@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QColor>
+#include <QGuiApplication>
+#include <QPalette>
+
+namespace Utils
+{
+
+/**
+ * @brief Get a color for a user from a hueF value.
+ *
+ * The lightness of the color will be modified depending on the current palette in
+ * order to maintain contrast.
+ */
+inline QColor getUserColor(qreal hueF)
+{
+    const auto lightness = static_cast<QGuiApplication *>(QGuiApplication::instance())->palette().color(QPalette::Active, QPalette::Window).lightnessF();
+    // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
+    return QColor::fromHslF(hueF, 1, -0.7 * lightness + 0.9, 1);
+}
+}