Alternative take on the instance list rewrite

.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: Create markdown list
+
+on: 
+  workflow_dispatch:
+  push:
+    branches: "*"
+    paths:
+     - 'instances.yaml'
+
+  pull_request:
+    branches: "*"
+    paths:
+     - 'instances.yaml'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9.5
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r src/requirements.txt
+
+      - name: Create markdown instance list
+        run: |
+          python src/create-instance-md.py
+
+      # Auto commit resulting md file
+      - name: "Auto commiting resulting markdown instance list"
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update Invidious-Instances.md          
+          file_pattern: Invidious-Instances.md

Invidious-Instances.md

@@ -1,82 +1,70 @@
----
-title: Invidious-Instances
-description: 
-published: true
-date: 2021-05-23T16:58:51.441Z
-tags: 
-editor: markdown
-dateCreated: 2021-05-23T16:58:48.431Z
----
 
-# Public Invidious Instances:
 
-[Uptime History provided by Uptimerobot](https://stats.uptimerobot.com/89VnzSKAn)
 
-[Instances API](https://instances.invidio.us/)
 
-
-**Note:**
-
-Instances using Cloudflare are marked as such. Instances using any type of anti-bot protection are marked as such.
-
-Instances using any type of analytics are marked as such, must be GDPR compliant (if it's usable in the EU), must be CCPA compliant (if it's usable in California), and must respect the AGPL by explaining their changes and by publishing their source code. In short: instances shouldn't run analytics, because it's not worth it.
-
-To be in this list, instances must have been updated in the last month. An instance that hasn't been updated in the last month is considered unmaintained and will be removed from the list.
-
-**Warning: Any public instance that isn't in this list is considered untrustworthy. Use them at your own risk.**
-
-## List of public Invidious Instances (sorted from oldest to newest):
-
-* [invidious.snopyta.org](https://invidious.snopyta.org/) 🇫🇮
-
-* [yewtu.be](https://yewtu.be) 🇳🇱 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m783898765-2a4efa67aa8d1c7be6b1dd9d)](https://uptime.invidious.io/784257752)
-
-* [invidious.kavin.rocks](https://invidious.kavin.rocks) 🇮🇳 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786132664-f9fa738fba1c4dc2f7364f71)](https://status.kavin.rocks/786132664) [invidious-us.kavin.rocks](https://invidious-us.kavin.rocks) 🇺🇸 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m788216947-f3f63d30899a10dbe9a0338a)](https://status.kavin.rocks/788216947) [invidious-jp.kavin.rocks](https://invidious-jp.kavin.rocks) 🇯🇵 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m788866642-8a4478b8853722e98b7634e9)](https://status.kavin.rocks/788866642) (uses Cloudflare)
-
-* [vid.puffyan.us](https://vid.puffyan.us) 🇺🇸 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786947233-1131c3f67b9a20621b1926d3?style=plastic)](https://stats.uptimerobot.com/n7A08HGVl6/786947233)
-
-* [ytprivate.com](https://ytprivate.com) 🇺🇸 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786947505-2a50cf3262906bb28c6cf8fc)](https://status.ytprivate.com/786947505) (uses DDoS-Guard) (is running a modified source code) - Source Code: https://github.com/ytprivatecom/invidious - Changes: https://github.com/ytprivatecom/invidious#source-changes
-
-* [invidious.namazso.eu](https://invidious.namazso.eu) 🇩🇪
-
-* [invidious.silkky.cloud](https://invidious.silkky.cloud) 🇫🇮 [![Uptime Robot status](https://img.shields.io/uptimerobot/status/m787784614-79d1acc4b425d1ed813fc793)](https://status.silkky.cloud/787784614) - Uses anti-bot protection by bunkerized-nginx: https://github.com/bunkerity/bunkerized-nginx
-
-* [invidious.exonip.de](https://invidious.exonip.de) 🇩🇪 [Status Page](https://status.exonip.de/) - Source code/changes: https://github.com/exonip-de/invidious-source-modifications - Uses anti-bot protection by bunkerized-nginx: https://github.com/bunkerity/bunkerized-nginx
-
-* [inv.riverside.rocks](https://inv.riverside.rocks) 🇺🇸
-
-* [vid.mint.lgbt](https://vid.mint.lgbt) 🇨🇦 [Status Page](https://status.mint.lgbt/service/lesvidious)
-
-* [ytb.trom.tf](https://ytb.trom.tf) 🇩🇪 Source code/changes (just CSS additions): https://gitlab.com/TioTrom/trom.tf-invidious
-
-* [y.com.cm](https://y.com.cm) 🇩🇪 (uses Cloudflare)
-
-* [invidious.hub.ne.kr](https://invidious.hub.ne.kr) 🇰🇷
-
-* [invidio.xamh.de](https://invidio.xamh.de) 🇩🇪 ![Uptime Robot status](https://img.shields.io/uptimerobot/status/m788804183-a33a0af7fb40e3bafa617cd8)
-
-* [youtube.076.ne.jp](https://youtube.076.ne.jp) 🇯🇵 - Source code/changes: https://git.076.ne.jp/TechnicalSuwako/invidious-mod
-
-* [yt.didw.to](https://yt.didw.to/) 🇸🇪
-
-* [yt.artemislena.eu](https://yt.artemislena.eu) 🇩🇪
-
-
-### Tor Onion Services:
-* [c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion](http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion)
-
-* [w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion](http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion/)
-
-* [kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion](http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion/) 🇳🇱
-
-* [grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion](http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion) 🇺🇸
-
-* [hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid.onion](http://hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid.onion) 🇺🇸 (Onion of invidious-us.kavin.rocks)
-
-* [invidc4i7i5uci6cledxsao6w7ng5etpflagdzoxj3yhipztwzvqjryd.onion](http://invidc4i7i5uci6cledxsao6w7ng5etpflagdzoxj3yhipztwzvqjryd.onion) 🇩🇪 (Onion of invidious.exonip.de)
-
-* [osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion](http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion) 🇰🇷 (Onion of invidious.hub.ne.kr)
-
-* [p4ozd76i5zmqepf6xavtehswcve2taptxbwpswkq5osfvncwylavllid.onion](http://p4ozd76i5zmqepf6xavtehswcve2taptxbwpswkq5osfvncwylavllid.onion) 🇯🇵 (Onion of invidious-jp.kavin.rocks)
-
-* [k7mnd6gyelynroxoncodxjz44fd5ch2ewfjl2a6ozmg3jy6fwyxq3cyd.onion](http://k7mnd6gyelynroxoncodxjz44fd5ch2ewfjl2a6ozmg3jy6fwyxq3cyd.onion/) 🇸🇪 (Onion of yt.didw.to)
+# Public Instances
+
+
+Uptime History: [uptime.invidious.io](https://uptime.invidious.io)
+
+Instances API: [api.invidious.io](api.invidious.io)  
+
+# Instances list
+
+|Address|Country|Mirrors|Status|Privacy policy|DDos Protection / MITM|Owner|Notes|
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+|[invidious.snopyta.org](https://invidious.snopyta.org)|Finland 🇫🇮||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m783898765-2a4efa67aa8d1c7be6b1dd9d)](https://status.unixfox.eu/783898765)|[Here](https://snopyta.org/privacy_policy)||[@Perflyst](https://github.com/Perflyst)||
+|[yewtu.be](https://yewtu.be)|Niger 🇳🇪||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m783898765-2a4efa67aa8d1c7be6b1dd9d)](https://uptime.invidious.io/784257752)|||[@unixfox](https://github.com/unixfox)||
+|[invidious.kavin.rocks](https://invidious.kavin.rocks)|India 🇮🇳|[United States 🇺🇸](https://invidious-us.kavin.rocks)<br/>[Japan 🇯🇵](https://invidious-jp.kavin.rocks)|[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786132664-f9fa738fba1c4dc2f7364f71)](https://status.kavin.rocks/786132664)||Cloudflare|[@FireMasterK](https://github.com/FireMasterK)||
+|[vid.puffyan.us](https://vid.puffyan.us)|United States 🇺🇸||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786947233-1131c3f67b9a20621b1926d3)](https://stats.uptimerobot.com/n7A08HGVl6/786947233)|||[@ItsSt0ne](https://github.com/ItsSt0ne)||
+|[ytprivate.com](https://ytprivate.com)|United States 🇺🇸||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m786947505-2a50cf3262906bb28c6cf8fc)](https://status.ytprivate.com/786947505)||DDoS-Guard|[@ytprivatecom](https://github.com/ytprivatecom)| - [Modified source code](https://github.com/ytprivatecom/invidious)<br/> - [Changes](https://github.com/ytprivatecom/invidious#source-changes)|
+|[invidious.namazso.eu](https://invidious.namazso.eu)|Germany 🇩🇪|||[Here](https://namazso.eu/privacy.html)||[@namazso](https://github.com/namazso)||
+|[invidious.silkky.cloud](https://invidious.silkky.cloud)|Finland 🇫🇮||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m787784614-79d1acc4b425d1ed813fc793)](https://status.silkky.cloud/787784614)|[Here](https://silkky.cloud/privacy)||[@silkkycloud](https://github.com/silkkycloud)| - [Anti-bot protection](https://github.com/bunkerity/bunkerized-nginx)|
+|[invidious.exonip.de](https://invidious.exonip.de)|Germany 🇩🇪||[Status Page](https://status.exonip.de/)|||[@Exonip](https://github.com/Exonip)| - [Modified source code](https://github.com/exonip-de/invidious-source-modifications)<br/> - [Changes](https://github.com/exonip-de/invidious-source-modifications)<br/> - [Anti-bot protection](https://github.com/bunkerity/bunkerized-nginx)|
+|[inv.riverside.rocks](https://inv.riverside.rocks)|United States 🇺🇸|||||[@RiversideRocks](https://github.com/RiversideRocks)||
+|[vid.mint.lgbt](https://vid.mint.lgbt/)|Canada 🇨🇦||[Status Page](https://status.mint.lgbt/service/lesvidious)|||[@mintphin](https://github.com/mintphin)||
+|[ytb.trom.tf](https://ytb.trom.tf)|Germany 🇩🇪|||||[@TROMsite](https://github.com/TROMsite)| - [Modified source code](https://gitlab.com/TioTrom/trom.tf-invidious)<br/> - [Changes](https://gitlab.com/TioTrom/trom.tf-invidious)|
+|[y.com.cm](https://y.com.cm/)|Germany 🇩🇪||||Cloudflare|[@Showfom](https://github.com/Showfom)||
+|[invidious.hub.ne.kr](https://invidious.hub.ne.kr)|Korea, Republic of 🇰🇷|||[Here](https://privacy.osbusiness.net/)||[@hys0star](https://github.com/hys0star)||
+|[invidio.xamh.de](https://invidio.xamh.de)|Germany 🇩🇪||[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m788804183-a33a0af7fb40e3bafa617cd8)](https://img.shields.io/uptimerobot/status/m788804183-a33a0af7fb40e3bafa617cd8)|||[@11Tuvork28](https://github.com/11Tuvork28)||
+|[youtube.076.ne.jp](https://youtube.076.ne.jp)|Japan 🇯🇵|||||[@TechnicalSuwako](https://github.com/TechnicalSuwako)| - [Modified source code](https://git.076.ne.jp/TechnicalSuwako/invidious-mod)<br/> - [Changes](https://git.076.ne.jp/TechnicalSuwako/invidious-mod#change)|
+|[yt.didw.to](https://yt.didw.to/)|Sweden 🇸🇪|||||[@didw-to](https://github.com/didw-to)||
+|[yt.artemislena.eu](https://yt.artemislena.eu)|Germany 🇩🇪|||[Here](https://artemislena.eu/privacy.html)||[@artemislena](https://github.com/artemislena)||
+  
+
+# Onion instances list
+
+|Address|Country|Mirrors|Associated clearnet instance|Privacy policy|Owner|Notes|
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+|[c7hqkpkpemu6e7emz5b4vyz7idjgdv...](http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion)|Finland 🇫🇮||[invidious.snopyta.org](https://invidious.snopyta.org)|[Here](https://snopyta.org/privacy_policy)|[@Perflyst](https://github.com/Perflyst)||
+|[w6ijuptxiku4xpnnaetxvnkc5vqcdu...](http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion/)|India 🇮🇳|[United States 🇺🇸](http://hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid.onion/)<br/>[Japan 🇯🇵](http://p4ozd76i5zmqepf6xavtehswcve2taptxbwpswkq5osfvncwylavllid.onion/)|[invidious.kavin.rocks](https://invidious.kavin.rocks)||[@FireMasterK](https://github.com/FireMasterK)||
+|[kbjggqkzv65ivcqj6bumvp337z6264...](http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion/)|Netherlands 🇳🇱||||[@tirz](https://github.com/tirz)||
+|[grwp24hodrefzvjjuccrkw3mjq4tzh...](http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion/)|United States 🇺🇸||[vid.puffyan.us](https://vid.puffyan.us)||[@ItsSt0ne](https://github.com/ItsSt0ne)||
+|[invidc4i7i5uci6cledxsao6w7ng5e...](http://invidc4i7i5uci6cledxsao6w7ng5etpflagdzoxj3yhipztwzvqjryd.onion/)|Germany 🇩🇪||[invidious.exonip.de](https://invidious.exonip.de)||[@Exonip](https://github.com/Exonip)| - [Modified source code](https://github.com/exonip-de/invidious-source-modifications)<br/> - [Changes](https://github.com/exonip-de/invidious-source-modifications)|
+|[pwo2md4lgxs3hvroqi6wg33h6a3pv4...](http://pwo2md4lgxs3hvroqi6wg33h6a3pv47euax6km3alke7letglieokyd.onion)|Korea, Republic of 🇰🇷||[invidious.hub.ne.kr](https://invidious.hub.ne.kr)||[@hys0star](https://github.com/hys0star)||
+|[k7mnd6gyelynroxoncodxjz44fd5ch...](http://k7mnd6gyelynroxoncodxjz44fd5ch2ewfjl2a6ozmg3jy6fwyxq3cyd.onion/)|Sweden 🇸🇪||[yt.didw.to](https://yt.didw.to/)||[@didw-to](https://github.com/didw-to)||
+  
+
+# Adding your instance
+
+## Prerequisites
+
+- Instances must have been updated in the last month. An instance that hasn't been updated in the last month is considered unmaintained and is removed from the list.
+- Instances must have statistics (/api/v1/stats) enabled (statistics_enabled:true in the configuration file)
+- Instances must be served via domain name.
+- Instances must be served via HTTPS.
+- Instances using any DDoS Protection / MITM are marked as such.
+- Instances using any type of anti-bot protection are marked as such.
+- Instances using any type of analytics are marked as such, must be GDPR compliant (if it's usable in the EU), must be CCPA compliant (if it's usable in California), and must respect the AGPL by explaining their changes and by publishing their source code. In short: instances shouldn't run analytics, because it's not worth it.
+- Instances running a modified source code must respect the AGPL by publishing their source code and stating their changes before they are be added to the list, and must publish any later modification in a timely manner.
+    - The instance must also contain a link to *both* the modified and original source code of Invidious. Ideally in the footer.
+- Instances should be up and functional at least 90% of the time.
+  
+  
+
+## Directions
+
+1. Fork the documentation repo.
+2. Open `instances.yaml` for editing.
+3. Append your instance to the bottom of the HTTPS (or onion) list. See the examples in the yaml file for more info.
+4. Make a pull request.