Merge Upstream

* commit '1e2c63d8bb0d0ab1ca658f408d2cd8a585f51392': Docker: copy only the files required for build (aeharding#1397) Update join/login instance list (aeharding#1396)
sharunkumar · Apr 6, 2024 · 419c499 · 419c499
2 parents df61670 + 1e2c63d
commit 419c499
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -14,3 +14,4 @@ dist
 android/
 ios/
 fastlane/
+e2e/
diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,9 @@ COPY patches ./patches
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --ignore-scripts
 
 # Copy all source files
-COPY . ./
+COPY build.sh disable_in_app_purchases.sh index.html vite.config.ts manifest.json tsconfig.json tsconfig.node.json ./
+COPY public ./public
+COPY src ./src
 
 # Tests
 RUN CI=true pnpm test

diff --git 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
@@ -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
@@ -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>();