Merge branch 'ImranR98:main' into mattermost-config

ImranR98 · Mar 3, 2025 · c50b6fa · c50b6fa
2 parents 1d279e8 + 5b4f6e7
commit c50b6fa
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 11 deletions.
diff --git a/.github/workflows/discussion_auto_response.yml b/.github/workflows/discussion_auto_response.yml
@@ -7,6 +7,7 @@ on:
 permissions:
   contents: read
   discussions: write
+  issues: write
 
 jobs:
   respond:
@@ -15,7 +16,58 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Post response comment
+      - name: Check word and character count
+        id: validation
+        run: |
+          MIN_WORDS=5
+          MIN_CHARS=10
+
+          BODY=$(jq -r '.discussion.body' "$GITHUB_EVENT_PATH")
+          WORD_COUNT=$(echo "$BODY" | wc -w)
+          CHAR_COUNT=$(echo -n "$BODY" | wc -m)
+
+          if [ "$WORD_COUNT" -lt $MIN_WORDS ] || [ "$CHAR_COUNT" -lt $MIN_CHARS ]; then
+            echo "too_short=true" >> "$GITHUB_OUTPUT"
+            echo "words=$WORD_COUNT" >> "$GITHUB_OUTPUT"
+            echo "chars=$CHAR_COUNT" >> "$GITHUB_OUTPUT"
+          else
+            echo "too_short=false" >> "$GITHUB_OUTPUT"
+          fi
+          echo "$GITHUB_OUTPUT"
+
+      - name: If spam, notify user via GitHub mention (generates email) then Delete Discussion
+        if: steps.validation.outputs.too_short == 'true'
+        uses: actions/github-script@v7
+        env:
+          WORDS: ${{ steps.validation.outputs.words }}
+          CHARS: ${{ steps.validation.outputs.chars }}
+        with:
+          script: |
+            const { discussion } = context.payload;
+  
+            await github.graphql(`
+              mutation($discussionId: ID!, $body: String!) {
+                addDiscussionComment(input: {
+                  discussionId: $discussionId,
+                  body: $body
+                }) { comment { id } }
+              }`,
+              {
+                discussionId: discussion.node_id,
+                body: `⚠️ @${discussion.user.login}\nTo protect against spam, this discussion will be deleted in a few minutes as it does not meet a minimum word and character count. Please create a more detailed post.`
+              }
+            );
+
+            await new Promise(resolve => setTimeout(resolve, 1000 * 60 * 2)) // Give GitHub time to email the user about the above comment 
+
+            await github.graphql(`
+              mutation($discussionId: ID!) {
+                deleteDiscussion(input: {id: $discussionId}) { discussion { id } }
+              }`, { discussionId: discussion.node_id }
+            );
+
+      - name: If not spam, post response comment
+        if: steps.validation.outputs.too_short != 'true'
         uses: actions/github-script@v7
         with:
           script: |

diff --git a/data/apps/eu.artectrex.bunny.json b/data/apps/eu.artectrex.bunny.json
@@ -6,7 +6,7 @@
             "author": "pixeldroid",
             "name": "Bunny Media Editor",
             "preferredApkIndex": 0,
-            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\d+2\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
+            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\barm64\\\\b\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
             "overrideSource": "GitLab",
             "altLabel": "arm64-v8a"
         },
@@ -16,7 +16,7 @@
             "author": "pixeldroid",
             "name": "Bunny Media Editor",
             "preferredApkIndex": 0,
-            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\d+1\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
+            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\barm\\\\b\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
             "overrideSource": "GitLab",
             "altLabel": "arm"
         },
@@ -26,7 +26,7 @@
             "author": "pixeldroid",
             "name": "Bunny Media Editor",
             "preferredApkIndex": 0,
-            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\d+4\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
+            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\bx86_64\\\\b\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
             "overrideSource": "GitLab",
             "altLabel": "x86_64"
         },
@@ -36,7 +36,7 @@
             "author": "pixeldroid",
             "name": "Bunny Media Editor",
             "preferredApkIndex": 0,
-            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\d+3\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
+            "additionalSettings": "{\"fallbackToOlderReleases\":true,\"trackOnly\":false,\"versionExtractionRegEx\":\"\",\"matchGroupToUse\":\"\",\"versionDetection\":true,\"releaseDateAsVersion\":false,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\\\\bx86\\\\b\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":false}",
             "overrideSource": "GitLab",
             "altLabel": "x86"
         }

diff --git a/data/apps/org.videolan.vlc.json b/data/apps/org.videolan.vlc.json
@@ -2,26 +2,26 @@
     "configs": [
         {
             "id": "org.videolan.vlc",
-            "url": "https://www.videolan.org/vlc/download-android.html",
+            "url": "https://get.videolan.org/vlc-android/",
             "author": "get.videolan.org",
             "name": "VLC",
-            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"APK\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"arm64-v8a\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"/vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
+            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"^[0-9]\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"arm64-v8a\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":true,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
             "altLabel": "arm64-v8a"
         },
         {
             "id": "org.videolan.vlc",
-            "url": "https://www.videolan.org/vlc/download-android.html",
+            "url": "https://get.videolan.org/vlc-android/",
             "author": "get.videolan.org",
             "name": "VLC",
-            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"APK\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"armeabi-v7a\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"/vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
+            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"^[0-9]\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"armeabi-v7a\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":true,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
             "altLabel": "armeabi-v7a"
         },
         {
             "id": "org.videolan.vlc",
-            "url": "https://www.videolan.org/vlc/download-android.html",
+            "url": "https://get.videolan.org/vlc-android/",
             "author": "get.videolan.org",
             "name": "VLC",
-            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"APK\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"x86_64\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"/vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
+            "additionalSettings": "{\"intermediateLink\":[{\"customLinkFilterRegex\":\"^[0-9]\",\"filterByLinkText\":true,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false},{\"customLinkFilterRegex\":\"x86_64\\\\.apk$\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":false,\"sortByLastLinkSegment\":false}],\"customLinkFilterRegex\":\"\",\"filterByLinkText\":false,\"skipSort\":false,\"reverseSort\":true,\"sortByLastLinkSegment\":false,\"versionExtractWholePage\":false,\"requestHeader\":[{\"requestHeader\":\"User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36\"}],\"defaultPseudoVersioningMethod\":\"partialAPKHash\",\"trackOnly\":false,\"versionExtractionRegEx\":\"vlc-android/([^/]+)/\",\"matchGroupToUse\":\"1\",\"versionDetection\":true,\"useVersionCodeAsOSVersion\":false,\"apkFilterRegEx\":\"\",\"invertAPKFilter\":false,\"autoApkFilterByArch\":true,\"appName\":\"\",\"shizukuPretendToBeGooglePlay\":false,\"allowInsecure\":false,\"exemptFromBackgroundUpdates\":false,\"skipUpdateNotifications\":false,\"about\":\"\",\"refreshBeforeDownload\":true}",
             "altLabel": "x86_64"
         }
     ],

diff --git a/script.js b/script.js
@@ -103,6 +103,12 @@ function getAppConfigString(appJson, configIndex = 0) {
             throw e
         }
         if (!settings.about) settings.about = description
+        if (config.name && !settings.appName) {
+            settings.appName = config.name
+        }
+        if (config.author && !settings.appAuthor) {
+            settings.appAuthor = config.author
+        }
         config.additionalSettings = JSON.stringify(settings)
     }
     if (config.altLabel) {