From c2c8dda10fbda15e4da045ed4541916f26dba790 Mon Sep 17 00:00:00 2001
From: Alexander Harding <2166114+aeharding@users.noreply.github.com>
Date: Sat, 6 Apr 2024 11:31:32 -0500
Subject: [PATCH] Update join/login instance list

- beehaw.org is not upgrading to 0.19 (and Voyager doesn't support 0.18 anymore)
- removed some non-lemmy instances
- fixed typos
---
 android/app/src/main/AndroidManifest.xml             |  8 --------
 src/features/auth/login/data/servers.ts              | 10 ++--------
 src/features/community/list/GuestCommunitiesList.tsx |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 548bbbfdc2..cc65e69eaa 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -37,7 +37,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -118,7 +117,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -199,7 +197,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -280,7 +277,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -361,7 +357,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -442,7 +437,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -523,7 +517,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
@@ -604,7 +597,6 @@
                 <data android:host="ani.social" />
                 <data android:host="aussie.zone" />
                 <data android:host="awful.systems" />
-                <data android:host="beehaw.org" />
                 <data android:host="burggit.moe" />
                 <data android:host="discuss.online" />
                 <data android:host="discuss.tchncs.de" />
diff --git a/src/features/auth/login/data/servers.ts b/src/features/auth/login/data/servers.ts
index 2ed17b0194..bab176f7e1 100644
--- a/src/features/auth/login/data/servers.ts
+++ b/src/features/auth/login/data/servers.ts
@@ -91,14 +91,8 @@ export const SERVERS_BY_CATEGORY = {
     "psychedelia.ink",
     "ani.social",
   ],
-  activism: [
-    "rblind.com",
-    "badatbeing.social",
-    "beehaw.org",
-    "sirpnk.net",
-    "merv.news",
-  ],
-  lgbt: ["femboys.bar", "transfem.space", "lemmy.blahaj.zone"],
+  activism: ["rblind.com", "badatbeing.social", "slrpnk.net"],
+  lgbt: ["femboys.bar", "lemmy.blahaj.zone"],
   academia: ["mander.xyz", "literature.cafe", "futurology.today"],
   furry: ["pawb.social", "yiffit.net"],
 };
diff --git a/src/features/community/list/GuestCommunitiesList.tsx b/src/features/community/list/GuestCommunitiesList.tsx
index ab60b9ab1d..9982300d04 100644
--- a/src/features/community/list/GuestCommunitiesList.tsx
+++ b/src/features/community/list/GuestCommunitiesList.tsx
@@ -12,7 +12,7 @@ import { CommunitiesListProps } from "./CommunitiesList";
  *
  * TODO in the future Local/All will be configurable in an explore view
  */
-const SHOW_LOCAL_ONLY = ["lemmynsfw.com", "beehaw.org"];
+const SHOW_LOCAL_ONLY = ["lemmynsfw.com"];
 
 export default function GuestCommunitiesList({ actor }: CommunitiesListProps) {
   const [communities, setCommunities] = useState<Community[] | undefined>();