From d664fcd169a5aa28279e818db55c2c453e73f939 Mon Sep 17 00:00:00 2001
From: tcdu7ni4i6y2mq2a <tcdu7ni4i6y2mq2a@noreply.codeberg.org>
Date: Thu, 16 Jun 2022 16:45:38 +0200
Subject: [PATCH] Improve instances.json file (#39) [skip ci]

In this pull request I made few modifications to instances.json file to make it more friendly to any scripts that will be using it as a source of instances in future:

* I added protocol to all URLs. Most scripts expect URLs to already have protocol and lack of it may cause minor issues.
* I turned instances.json from array of strings into array of objects. It makes the list more organized and it would be easier to add or remove instances in future.

Reviewed-on: https://codeberg.org/video-prize-ranch/rimgo/pulls/39
Co-authored-by: tcdu7ni4i6y2mq2a <tcdu7ni4i6y2mq2a@noreply.codeberg.org>
Co-committed-by: tcdu7ni4i6y2mq2a <tcdu7ni4i6y2mq2a@noreply.codeberg.org>
---
 instances.json | 108 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 91 insertions(+), 17 deletions(-)

diff --git a/instances.json b/instances.json
index 785a8e0..93fde72 100644
--- a/instances.json
+++ b/instances.json
@@ -1,18 +1,92 @@
 [
-  "i.bcow.xyz",
-  "rimgo.pussthecat.org",
-  "img.riverside.rocks",
-  "rimgo.totaldarkness.net",
-  "rimgo.bus-hit.me",
-  "rimgo.esmailelbob.xyz",
-  "rimgo.lunar.icu",
-  "i.actionsack.com",
-  "rimgo.privacydev.net",
-  "imgur.artemislena.eu",
-  "rimgo.vern.cc",
-  "jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
-  "rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-  "be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion",
-  "rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-  "xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
-]
+  {
+    "url": "https://i.bcow.xyz",
+    "countries": [
+      "ca",
+      "nl",
+      "sg"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.pussthecat.org",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://img.riverside.rocks",
+    "onion": "http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "rimgo.totaldarkness.net",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.bus-hit.me",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.esmailelbob.xyz",
+    "onion": "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.lunar.icu",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": true
+  },
+  {
+    "url": "https://i.actionsack.com",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": true
+  },
+  {
+    "url": "https://rimgo.privacydev.net",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://imgur.artemislena.eu",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.vern.cc",
+    "onion": "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": true
+  },
+  {
+    "onion": "http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion",
+    "i2p": "http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p",
+    "countries": [
+      "au"
+    ],
+    "cloudflare": false
+  }
+]
\ No newline at end of file