Refactoring.

Signed-off-by: alex-z <blackslayer4@gmail.com>
nextcloud · Sep 12, 2023 · 474233d · 474233d
1 parent 472d3e1
commit 474233d
Showing 1 changed file with 33 additions and 34 deletions.
diff --git a/src/gui/tray/sortedactivitylistmodel.cpp b/src/gui/tray/sortedactivitylistmodel.cpp
@@ -13,9 +13,34 @@
  */
 
 #include "activitylistmodel.h"
+#include <QVector>
 
 #include "sortedactivitylistmodel.h"
 
+namespace
+{
+    struct ActivityLinksSearchResult {
+        bool hasPOST = false;
+        bool hasREPLY = false;
+        bool hasWEB = false;
+    };
+
+    ActivityLinksSearchResult searchForVerbsInLinks(const QVector<OCC::ActivityLink> &links)
+    {
+        ActivityLinksSearchResult result;
+        for (const auto &link : links) {
+            if (link._verb == QByteArrayLiteral("POST")) {
+                result.hasPOST = true;
+            } else if (link._verb == QByteArrayLiteral("REPLY")) {
+                result.hasREPLY = true;
+            } else if (link._verb == QByteArrayLiteral("WEB")) {
+                result.hasWEB = true;
+            }
+        }
+        return result;
+    }
+}
+
 namespace OCC {
 
 SortedActivityListModel::SortedActivityListModel(QObject *parent)
@@ -74,50 +99,24 @@ bool SortedActivityListModel::lessThan(const QModelIndex &sourceLeft, const QMod
         return leftIsErrorFileItemStatus;
     }
 
-    auto leftActivityNeedsPostInteraction = false;
-    auto rightActivityNeedsPostInteraction = false;
-
-    auto leftActivityNeedsReplyInteraction = false;
-    auto rightActivityNeedsReplyInteraction = false;
-
-    auto leftActivityNeedsWebInteraction = false;
-    auto rightActivityNeedsWebInteraction = false;
-
-    for (const auto &link : leftActivity._links) {
-        if (link._verb == QByteArrayLiteral("POST")) {
-            leftActivityNeedsPostInteraction = true;
-        } else if (link._verb == QByteArrayLiteral("REPLY")) {
-            leftActivityNeedsReplyInteraction = true;
-        } else if (link._verb == QByteArrayLiteral("WEB")) {
-            leftActivityNeedsWebInteraction = true;
-        }
-    }
-
-    for (const auto &link : rightActivity._links) {
-        if (link._verb == QByteArrayLiteral("POST")) {
-            rightActivityNeedsPostInteraction = true;
-        } else if (link._verb == QByteArrayLiteral("REPLY")) {
-            rightActivityNeedsReplyInteraction = true;
-        } else if (link._verb == QByteArrayLiteral("WEB")) {
-            rightActivityNeedsWebInteraction = true;
-        }
-    }
+    const auto leftActiviyVerbsSearchResult = searchForVerbsInLinks(leftActivity._links);
+    const auto rightActiviyVerbsSearchResult = searchForVerbsInLinks(rightActivity._links);
 
-    if (leftActivityNeedsPostInteraction && !rightActivityNeedsPostInteraction) {
+    if (leftActiviyVerbsSearchResult.hasPOST && !rightActiviyVerbsSearchResult.hasPOST) {
         return true;
-    } else if (!leftActivityNeedsPostInteraction && rightActivityNeedsPostInteraction) {
+    } else if (!leftActiviyVerbsSearchResult.hasPOST && leftActiviyVerbsSearchResult.hasPOST) {
         return false;
     }
 
-    if (leftActivityNeedsReplyInteraction && !rightActivityNeedsReplyInteraction) {
+    if (leftActiviyVerbsSearchResult.hasREPLY && !leftActiviyVerbsSearchResult.hasREPLY) {
         return true;
-    } else if (!leftActivityNeedsReplyInteraction && rightActivityNeedsReplyInteraction) {
+    } else if (!leftActiviyVerbsSearchResult.hasREPLY && leftActiviyVerbsSearchResult.hasREPLY) {
         return false;
     }
 
-    if (leftActivityNeedsWebInteraction && !rightActivityNeedsWebInteraction) {
+    if (leftActiviyVerbsSearchResult.hasWEB && !leftActiviyVerbsSearchResult.hasWEB) {
         return true;
-    } else if (!leftActivityNeedsWebInteraction && rightActivityNeedsWebInteraction) {
+    } else if (!leftActiviyVerbsSearchResult.hasWEB && leftActiviyVerbsSearchResult.hasWEB) {
         return false;
     }