From dcab2deda132fe810830878b5645992b4c03cebe Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 23 Sep 2023 15:48:44 -0500
Subject: [PATCH 1/2] RegistrationPage: display "registrations closed" message
 in place of signup form when registrations are closed

---
 .../components/registration-page.tsx          | 19 +++++++++++++++++++
 src/hooks/useRegistrationStatus.ts            |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/features/auth-login/components/registration-page.tsx b/src/features/auth-login/components/registration-page.tsx
index 7f1e81ce5..ea57c9e5e 100644
--- a/src/features/auth-login/components/registration-page.tsx
+++ b/src/features/auth-login/components/registration-page.tsx
@@ -2,10 +2,29 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { BigCard } from 'soapbox/components/big-card';
+import { Text } from 'soapbox/components/ui';
+import { useInstance, useRegistrationStatus } from 'soapbox/hooks';
 
 import RegistrationForm from './registration-form';
 
 const RegistrationPage: React.FC = () => {
+  const instance = useInstance();
+  const { isOpen } = useRegistrationStatus();
+
+  if (!isOpen) {
+    return (
+      <BigCard title={<FormattedMessage id='registration.closed_title' defaultMessage='Registrations Closed' />}>
+        <Text theme='muted' align='center'>
+          <FormattedMessage
+            id='registration.closed_message'
+            defaultMessage='{instance} is not accepting new members.'
+            values={{ instance: instance.title }}
+          />
+        </Text>
+      </BigCard>
+    );
+  }
+
   return (
     <BigCard title={<FormattedMessage id='column.registration' defaultMessage='Sign Up' />}>
       <RegistrationForm />
diff --git a/src/hooks/useRegistrationStatus.ts b/src/hooks/useRegistrationStatus.ts
index 0f1242d1e..aac5efef6 100644
--- a/src/hooks/useRegistrationStatus.ts
+++ b/src/hooks/useRegistrationStatus.ts
@@ -6,7 +6,7 @@ export const useRegistrationStatus = () => {
   const features = useFeatures();
 
   return {
-    /** Registrations are open, either through Pepe or traditional account creation. */
+    /** Registrations are open. */
     isOpen: features.accountCreation && instance.registrations,
   };
 };
\ No newline at end of file

From 20d1880290f47b0ce465f2827d570613d8efe324 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 23 Sep 2023 15:54:20 -0500
Subject: [PATCH 2/2] LandingTimeline: remove unnecessary onlyMedia

---
 src/features/landing-timeline/index.tsx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/features/landing-timeline/index.tsx b/src/features/landing-timeline/index.tsx
index f485a831b..ec915cbf7 100644
--- a/src/features/landing-timeline/index.tsx
+++ b/src/features/landing-timeline/index.tsx
@@ -5,7 +5,7 @@ import { expandCommunityTimeline } from 'soapbox/actions/timelines';
 import { useCommunityStream } from 'soapbox/api/hooks';
 import PullToRefresh from 'soapbox/components/pull-to-refresh';
 import { Column } from 'soapbox/components/ui';
-import { useAppSelector, useAppDispatch, useSettings } from 'soapbox/hooks';
+import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
 
 import Timeline from '../ui/components/timeline';
 
@@ -13,26 +13,23 @@ import { SiteBanner } from './components/site-banner';
 
 const LandingTimeline = () => {
   const dispatch = useAppDispatch();
-
-  const settings = useSettings();
-  const onlyMedia = !!settings.getIn(['community', 'other', 'onlyMedia'], false);
   const next = useAppSelector(state => state.timelines.get('community')?.next);
 
   const timelineId = 'community';
 
   const handleLoadMore = (maxId: string) => {
-    dispatch(expandCommunityTimeline({ url: next, maxId, onlyMedia }));
+    dispatch(expandCommunityTimeline({ url: next, maxId }));
   };
 
   const handleRefresh = () => {
-    return dispatch(expandCommunityTimeline({ onlyMedia }));
+    return dispatch(expandCommunityTimeline());
   };
 
-  useCommunityStream({ onlyMedia });
+  useCommunityStream();
 
   useEffect(() => {
-    dispatch(expandCommunityTimeline({ onlyMedia }));
-  }, [onlyMedia]);
+    dispatch(expandCommunityTimeline());
+  }, []);
 
   return (
     <Column transparent withHeader={false}>
@@ -43,7 +40,7 @@ const LandingTimeline = () => {
       <PullToRefresh onRefresh={handleRefresh}>
         <Timeline
           scrollKey={`${timelineId}_timeline`}
-          timelineId={`${timelineId}${onlyMedia ? ':media' : ''}`}
+          timelineId={timelineId}
           prefix='home'
           onLoadMore={handleLoadMore}
           emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />}