From fa686cc6cf6a4dbf9e9d0f006ab33dece17636e5 Mon Sep 17 00:00:00 2001
From: Daniel Valentine <Daniel-Valentine@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:56:10 -0600
Subject: Fix link to libreddit-instances JSON.

With the resumption of the Libreddit project, the repo containing the instances that I started in [ferritreader](https://github.com/ferritreader) has moved to [libreddit/libreddit-instances](https://github.com/libreddit/libreddit-instances). This commit fixes the URL for libreddit instances to point to that repo.
---
 src/instances/get_instances.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/instances')

diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 5e868257..966767bd 100755
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -334,7 +334,7 @@ def bibliogram():
 
 
 def libreddit():
-    fetchJsonList('libreddit', 'Libreddit', 'https://github.com/ferritreader/libreddit-instances/raw/master/instances.json',
+    fetchJsonList('libreddit', 'Libreddit', 'https://github.com/libreddit/libreddit-instances/raw/master/instances.json',
                   {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, True)
 
 
-- 
cgit 1.4.1


From 80c918031451e98b3500b7e6d80a11cf43db673c Mon Sep 17 00:00:00 2001
From: Daniel Valentine <Daniel-Valentine@users.noreply.github.com>
Date: Tue, 8 Nov 2022 18:57:50 -0700
Subject: Remove Ferrit.

---
 src/config/config.json         | 24 ++----------------------
 src/instances/get_instances.py |  6 ------
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'src/instances')

diff --git a/src/config/config.json b/src/config/config.json
index cff06b6c..c05eb3ad 100644
--- a/src/config/config.json
+++ b/src/config/config.json
@@ -290,26 +290,6 @@
 					},
 					"name": "Teddit",
 					"instanceList": true
-				},
-				"ferrit": {
-					"preferences": {
-						"cookies": [
-							"theme",
-							"front_page",
-							"layout",
-							"wide",
-							"post_sort",
-							"comment_sort",
-							"show_nsfw",
-							"autoplay_videos",
-							"use_hls",
-							"hide_hls_notification",
-							"subscriptions",
-							"filters"
-						]
-					},
-					"name": "Ferrit",
-					"instanceList": true
 				}
 			},
 			"targets": [
@@ -319,7 +299,7 @@
 			"name": "Reddit",
 			"options": {
 				"enabled": true,
-				"frontend": "ferrit"
+				"frontend": "libreddit"
 			},
 			"imageType": "png",
 			"embeddable": false,
@@ -753,4 +733,4 @@
 			"color": "grey"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 966767bd..913ee1c4 100755
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -343,11 +343,6 @@ def teddit():
                   {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, False)
 
 
-def ferrit():
-    fetchJsonList('ferrit', 'Ferrit', 'https://raw.githubusercontent.com/ferritreader/ferrit-instances/master/instances.json',
-                  {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, True)
-
-
 def wikiless():
     fetchJsonList('wikiless', 'Wikiless', 'https://wikiless.org/instances.json',
                   {'clearnet': 'url', 'tor': 'onion', 'i2p': 'i2p', 'loki': None}, False)
@@ -505,7 +500,6 @@ nitter()
 bibliogram()
 libreddit()
 teddit()
-ferrit()
 wikiless()
 scribe()
 quetre()
-- 
cgit 1.4.1