From 4f60a39d7f6aded5a7ccd5f003f77ed634415a90 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Mon, 8 Jan 2024 11:32:59 -0700
Subject: Replace libreddit w/ redlib, remove teddit

Teddit is no longer maintained

Libreddit has been forked to redlib, which seems to be actively trying
to work around the changes to Reddit's API.

Libreddit instances are now a mirror of redlib instances for the time
being.
---
 .github/workflows/update-instances.yml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to '.github/workflows/update-instances.yml')

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 3eb126f..f8e6080 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -161,18 +161,19 @@ jobs:
 
         # ==============================================================
         # teddit update
+        # Note: no longer maintained
         # ==============================================================
-        curl -s https://codeberg.org/teddit/teddit/raw/branch/main/instances.json | \
-          jq '[
-            .[] |
-            select(.url | contains("https")) |
-            .url ] |
-            sort' > teddit-tmp.json
-        jq --slurpfile teddit teddit-tmp.json \
-          '( .[] | select(.type == "teddit") )
-          .instances |= $teddit[0]' services-full.json > services-tmp.json
+        #curl -s https://codeberg.org/teddit/teddit/raw/branch/main/instances.json | \
+          #jq '[
+            #.[] |
+            #select(.url | contains("https")) |
+            #.url ] |
+            #sort' > teddit-tmp.json
+        #jq --slurpfile teddit teddit-tmp.json \
+          #'( .[] | select(.type == "teddit") )
+          #.instances |= $teddit[0]' services-full.json > services-tmp.json
 
-        apply_update
+        #apply_update
 
         # ==============================================================
         # Wikiless update
@@ -191,18 +192,25 @@ jobs:
         #apply_update
 
         # ==============================================================
-        # libreddit update
+        # libreddit + redlib update
         # ==============================================================
-        curl -s https://raw.githubusercontent.com/libreddit/libreddit-instances/master/instances.json | \
+        curl -s https://raw.githubusercontent.com/redlib-org/redlib-instances/main/instances.json | \
           jq '[
             .instances[] |
             select(.url) |
             .url ] |
             sort' > libreddit-tmp.json
+
         jq --slurpfile libreddit libreddit-tmp.json \
           '( .[] | select(.type == "libreddit") )
           .instances |= $libreddit[0]' services-full.json > services-tmp.json
 
+        mv services-tmp.json services-full.json
+
+        jq --slurpfile redlib libreddit-tmp.json \
+          '( .[] | select(.type == "redlib") )
+          .instances |= $redlib[0]' services-full.json > services-tmp.json
+
         apply_update
 
         # ==============================================================
-- 
cgit v1.2.3