fixed messed up sort from previous release + image hack

b100dian · Dec 8, 2020 · f817571 · f817571
1 parent a10e18b
commit f817571
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/qml/pages/ChannelList.js b/qml/pages/ChannelList.js
@@ -70,7 +70,7 @@ function compareChannels(a, b) {
     return Channel.compareByName(a, b)
 }
 
-var categories = ["starred", "channels", "chat"];
+var categories = ["starred", "channel", "chat"];
 function compareByCategory(a, b) {
     if (a.category !== b.category) {
         var diff = categories.indexOf(a.category) - categories.indexOf(b.category);
@@ -81,9 +81,9 @@ function compareByCategory(a, b) {
 
 function compareByBool(a, b, prop, desired) {
     if (a[prop] !== b[prop]) {
-        if (b[prop] === desired) {
+        if (Boolean(b[prop]) === desired) {
             return 1;
-        } else {
+        } else if (Boolean(a[prop]) === desired){
             return -1;
         }
     }

diff --git a/rpm/harbour-sailslack.spec b/rpm/harbour-sailslack.spec
@@ -13,7 +13,7 @@ Name:       harbour-sailslack
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Unoffical Slack client for Sailfish
-Version:    1.4.6
+Version:    1.4.7
 Release:    1
 Group:      Qt/Qt
 License:    LICENSE

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
@@ -21,15 +21,5 @@ QNetworkReply* NetworkAccessManager::createRequest(Operation op, const QNetworkR
 }
 
 QString NetworkAccessManager::getToken(QUrl url) {
-    QRegularExpression re("^.*/([A-Z0-9]+)-.*$");
-    QRegularExpressionMatch match = re.match(url.path());
-    if (match.hasMatch()) {
-        const QString team = match.captured(1);
-        SlackClientConfig config(team);
-        const QString token = config.getAccessToken();
-        if (!token.isEmpty()){
-            return config.getAccessToken();
-        }
-    }
     return SlackClientConfig::lastToken();
-}
+g}
diff --git a/src/slackclient.cpp b/src/slackclient.cpp
@@ -666,6 +666,7 @@ QVariantMap SlackClient::parseGroup(QJsonObject group) {
         data.insert("type", QVariant("group"));
         data.insert("category", QVariant("channel"));
         data.insert("name", group.value("name").toVariant());
+        data.insert("is_starred", group.value("is_starred").toBool());
         updateChannelUnreadCount(id, lastRead);
     }