Merge pull request #26 from korapp/dev

Dev
korapp · Jan 1, 2024 · eea79c9 · eea79c9
2 parents 2b1da4a + fe400ec
commit eea79c9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 18 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,23 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "* * */7 * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v8
+        with:
+          days-before-issue-stale: 30
+          days-before-issue-close: 14
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          any-of-issue-labels: "question"
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/plasmoid/contents/ui/ConnectionItem.qml b/plasmoid/contents/ui/ConnectionItem.qml
@@ -14,7 +14,7 @@ PlasmaExtras.ExpandableListItem {
 
     title: model.title
     subtitle: model.subtitle
-    icon: flags.isFlagString(model.icon) ? flags.getFlagImage(model.icon) : model.icon
+    icon: resolveIcon(model.icon)
     iconEmblem: model.indicator
     visible: model.visible
     defaultActionButtonAction: model.isConnected ? actionDisconnect : actionConnect

diff --git a/plasmoid/contents/ui/FavoriteItem.qml b/plasmoid/contents/ui/FavoriteItem.qml
@@ -19,14 +19,14 @@ PlasmaComponents3.ToolButton {
 
     contentItem: RowLayout {
         PlasmaCore.IconItem {
-            source: flags.isFlagString(model.icon) ? flags.getFlagImage(model.icon) : model.icon
+            source: resolveIcon(model.icon)
             implicitWidth: PlasmaCore.Units.iconSizes.medium
             implicitHeight: PlasmaCore.Units.iconSizes.medium
             enabled: !busy
 
             PlasmaCore.IconItem {
                 visible: !!model.indicator
-                source: model.indicator
+                source: resolveIcon(model.indicator)
                 width: parent.width / 2
                 height: parent.height / 2
                 enabled: parent.enabled

diff --git a/plasmoid/contents/ui/NordVPNModel.qml b/plasmoid/contents/ui/NordVPNModel.qml
@@ -68,9 +68,8 @@ QtObject {
     }
 
     function createFavoriteModel(f) {
-        const icon = (f.group && Globals.Icons[f.group]) || (f.country && flags.getFlagName(f.country)) || Globals.Icons.globe
         return createModel({
-            icon,
+            icon: getFavoriteIcon(f),
             indicator: f.group && f.country ? flags.getFlagName(f.country) : '',
             title: f.group || f.city || f.country || i18n("Auto"),
             subtitle: f.group ? f.city || f.country : f.city ? f.country : '',

diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
@@ -54,7 +54,7 @@ Item {
         favoriteConnections.forEach((f, i) => plasmoid.setAction(
             i,
             Object.values(f).filter(Boolean).join(" > "),
-            (f.group && Globals.Icons[f.group]) || (f.country && flags.getLegacyFlagUrl(f.country)) || Globals.Icons.globe
+            getFavoriteIcon(f, true)
         ))
     }
 
@@ -86,23 +86,19 @@ Item {
         function getLegacyFlagUrl(countryName) {
             return legacyIconsDir + Country.codes[countryName].toLowerCase() + "/flag.png"
         }
-    }
 
-    function skipUrlSchema(urlString) {
-        return /(?:.*:\/\/)?(.*)/.exec(urlString)[1]
+        function skipUrlSchema(urlString) {
+            return /(?:.*:\/\/)?(.*)/.exec(urlString)[1]
+        }
     }
 
-    function getFavoriteIcon(f) {
-        if (f.group) {
-            return Globals.Icons[f.group]
-        } else if (f.country) {
-            return flags.getLegacyFlagUrl(f.country)
-        }
-        return Globals.Icons.globe
+    function resolveIcon(source) {
+        return flags.isFlagString(source) ? flags.getFlagImage(source) : source
     }
 
-    Exec {
-        id: cmd
+    function getFavoriteIcon(f, legacyFlag) {
+        const getFlag = legacyFlag ? flags.getLegacyFlagUrl : flags.getFlagName
+        return (f.group && Globals.Icons[f.group]) || (f.country && getFlag(f.country)) || Globals.Icons.globe
     }
 
     PlasmaCore.DataSource {