Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters

Author: ajayyy

.github/workflows/release.yml

@@ -51,6 +51,28 @@ jobs:
       - name: Zip Artifacts
         run: cd ./dist ; zip -r ../builds/ChromeExtensionBeta.zip *
 
+
+      # Create Safari artifacts
+      - name: Create Safari artifacts
+        run: npm run build:safari
+      - uses: actions/upload-artifact@v2
+        with:
+          name: SafariExtension
+          path: dist
+      - name: Zip Artifacts
+        run: cd ./dist ; zip -r ../builds/SafariExtension.zip *
+      # Create Edge artifacts
+      - name: Clear dist for Edge
+        run: rm -rf ./dist
+      - name: Create Edge artifacts
+        run: npm run build:edge
+      - uses: actions/upload-artifact@v2
+        with:
+          name: EdgeExtension
+          path: dist
+      - name: Zip Artifacts
+        run: cd ./dist ; zip -r ../builds/EdgeExtension.zip *
+
       # Upload each release asset
       - name: Upload ChromeExtension to release
         uses: Shopify/upload-to-release@master
@@ -73,6 +95,20 @@ jobs:
           name: FirefoxExtension.zip
           path: ./builds/FirefoxExtension.zip
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload SafariExtension to release
+        uses: Shopify/upload-to-release@master
+        with:
+          args: builds/SafariExtension.zip
+          name: SafariExtension.zip
+          path: ./builds/SafariExtension.zip
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload EdgeExtension to release
+        uses: Shopify/upload-to-release@master
+        with:
+          args: builds/EdgeExtension.zip
+          name: EdgeExtension.zip
+          path: ./builds/EdgeExtension.zip
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Firefox Beta
       - name: Create Firefox Beta artifacts

.github/workflows/updateInvidous.yml

@@ -0,0 +1,26 @@
+name: update invidious
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 1 * *' # check every month
+
+jobs:
+  check-list:
+    runs-on: ubuntu-latest 
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Download instance list
+        run: |
+          wget https://api.invidious.io/instances.json -O data.json
+      - name: "Run CI"
+        run: npm run ci:invidious
+
+      - name: Create pull request to update list
+        uses: peter-evans/create-pull-request@v3
+        with:
+          commit-message: Update Invidious List
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          branch: ci/update_invidious_list
+          title: Update Invidious List
+          body: Automated Invidious list update

.gitignore

@@ -6,4 +6,5 @@ web-ext-artifacts
 .vscode/
 dist/
 tmp/
-.DS_Store
+.DS_Store
+ci/data.json

ci/invidiousCI.ts

@@ -0,0 +1,55 @@
+/*
+This file is only ran by GitHub Actions in order to populate the Invidious instances list
+
+This file should not be shipped with the extension
+*/
+
+import { writeFile, existsSync } from 'fs';
+import { join } from 'path';
+
+// import file from https://api.invidious.io/instances.json
+if (!existsSync('./data.json')) {
+  process.exit(1);
+}
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import * as data from "./data.json";
+
+type instanceMap = {
+  name: string,
+  url: string,
+  dailyRatios: {ratio: string, label: string }[],
+  thirtyDayUptime: string
+}[]
+
+// only https servers
+const mapped: instanceMap = data
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  .filter((i: any) => i[1]?.type === 'https')
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  .map((instance: any) => {
+    return {
+      name: instance[0],
+      url: instance[1].uri,
+      dailyRatios: instance[1].monitor.dailyRatios,
+      thirtyDayUptime: instance[1]?.monitor['30dRatio'].ratio,
+    }
+  })
+
+// reliability and sanity checks
+const reliableCheck = mapped
+  .filter((instance) => {
+    // 30d uptime >= 90%
+    const thirtyDayUptime = Number(instance.thirtyDayUptime) >= 90
+    // available for at least 80/90 days
+    const dailyRatioCheck = instance.dailyRatios.filter(status => status.label !== "black")
+    return (thirtyDayUptime && dailyRatioCheck.length >= 80)
+  })
+  // url includes name
+  .filter(instance => instance.url.includes(instance.name))
+
+// finally map to array
+const result: string[] = reliableCheck.map(instance => instance.name)
+writeFile(join(__dirname, "./invidiouslist.json"), JSON.stringify(result), (err) => {
+  if (err) return console.log(err);
+})

ci/invidiouslist.json

@@ -0,0 +1 @@
+["yewtu.be","invidious.snopyta.org","vid.puffyan.us","invidious.kavin.rocks","invidio.xamh.de","invidious-us.kavin.rocks","inv.riverside.rocks","vid.mint.lgbt","youtube.076.ne.jp","invidious.namazso.eu"]

config.json.example

@@ -2,10 +2,11 @@
     "serverAddress": "https://sponsor.ajay.app",
     "testingServerAddress": "https://sponsor.ajay.app/test",
     "serverAddressComment": "This specifies the default SponsorBlock server to connect to",
-    "categoryList": ["sponsor", "selfpromo", "interaction", "poi_highlight", "intro", "outro", "preview", "filler", "music_offtopic", "chapter"],
+    "categoryList": ["sponsor", "selfpromo", "exclusive_access", "interaction", "poi_highlight", "intro", "outro", "preview", "filler", "music_offtopic", "chapter"],
     "categorySupport": {
-        "sponsor": ["skip", "mute"],
-        "selfpromo": ["skip", "mute"],
+        "sponsor": ["skip", "mute", "full"],
+        "selfpromo": ["skip", "mute", "full"],
+        "exclusive_access": ["full"],
         "interaction": ["skip", "mute"],
         "intro": ["skip", "mute"],
         "outro": ["skip", "mute"],
@@ -18,6 +19,7 @@
     "wikiLinks": {
         "sponsor": "https://wiki.sponsor.ajay.app/w/Sponsor",
         "selfpromo": "https://wiki.sponsor.ajay.app/w/Unpaid/Self_Promotion",
+        "exclusive_access": "https://wiki.sponsor.ajay.app/w/Exclusive_Access",
         "interaction": "https://wiki.sponsor.ajay.app/w/Interaction_Reminder_(Subscribe)",
         "intro": "https://wiki.sponsor.ajay.app/w/Intermission/Intro_Animation",
         "outro": "https://wiki.sponsor.ajay.app/w/Endcards/Credits",

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "3.6.2",
+    "version": "4.0.3",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

manifest/safari-manifest-extra.json

@@ -0,0 +1,5 @@
+{
+  "background": {
+    "persistent": false
+  }
+}