From e28d6d02235da636642d98f47372dc30b4c0236a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 23 Oct 2024 17:48:34 +0200
Subject: [PATCH] pl-fe: remove rebased email list feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../auth-login/components/registration-form.tsx   | 11 -----------
 .../pl-fe/src/features/edit-profile/index.tsx     | 15 ---------------
 packages/pl-fe/src/locales/en.json                |  2 --
 3 files changed, 28 deletions(-)

diff --git a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx
index 1af855c00..dc8af890d 100644
--- a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx
+++ b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx
@@ -58,7 +58,6 @@ const RegistrationForm: React.FC<IRegistrationForm> = ({ inviteToken }) => {
 
   const needsConfirmation = instance.pleroma.metadata.account_activation_required;
   const needsApproval = instance.registrations.approval_required;
-  const supportsEmailList = features.emailList;
   const supportsAccountLookup = features.accountLookup;
   const birthdayRequired = instance.pleroma.metadata.birthday_required;
   const domains = instance.pleroma.metadata.multitenancy.enabled ? instance.pleroma.metadata.multitenancy.domains!.filter((domain) => domain.public) : undefined;
@@ -364,16 +363,6 @@ const RegistrationForm: React.FC<IRegistrationForm> = ({ inviteToken }) => {
             />
           </FormGroup>
 
-          {supportsEmailList && (
-            <FormGroup labelText={intl.formatMessage(messages.newsletter)}>
-              <Checkbox
-                name='accepts_email_list'
-                onChange={onCheckboxChange}
-                checked={params.accepts_email_list}
-              />
-            </FormGroup>
-          )}
-
           <FormActions>
             <Button type='submit'>
               <FormattedMessage id='registration.sign_up' defaultMessage='Sign up' />
diff --git a/packages/pl-fe/src/features/edit-profile/index.tsx b/packages/pl-fe/src/features/edit-profile/index.tsx
index 1820174b1..3be069724 100644
--- a/packages/pl-fe/src/features/edit-profile/index.tsx
+++ b/packages/pl-fe/src/features/edit-profile/index.tsx
@@ -103,8 +103,6 @@ interface AccountCredentials {
   // Non-Mastodon fields
   /** Pleroma: whether to accept notifications from people you don't follow. */
   stranger_notifications?: boolean;
-  /** Rebased: whether the user opts-in to email communications. */
-  accepts_email_list?: boolean;
   /** Pleroma: whether to publicly display followers. */
   hide_followers?: boolean;
   /** Pleroma: whether to publicly display follows. */
@@ -136,7 +134,6 @@ const accountToCredentials = (account: Account): AccountCredentials => {
     note: account.__meta.source?.note ?? '',
     fields_attributes: [...account.__meta.source?.fields ?? []],
     stranger_notifications: account.__meta.pleroma?.notification_settings?.block_from_strangers === true,
-    accepts_email_list: account.__meta.pleroma?.accepts_email_list === true,
     hide_followers: hideNetwork,
     hide_follows: hideNetwork,
     hide_followers_count: hideNetwork,
@@ -420,18 +417,6 @@ const EditProfile: React.FC = () => {
             </ListItem>
           )}
 
-          {features.emailList && (
-            <ListItem
-              label={<FormattedMessage id='edit_profile.fields.accepts_email_list_label' defaultMessage='Subscribe to newsletter' />}
-              hint={<FormattedMessage id='edit_profile.hints.accepts_email_list' defaultMessage='Opt-in to news and marketing updates.' />}
-            >
-              <Toggle
-                checked={data.accepts_email_list}
-                onChange={handleCheckboxChange('accepts_email_list')}
-              />
-            </ListItem>
-          )}
-
           {features.rssFeeds && features.version.software === GOTOSOCIAL && (
             <ListItem
               label={<FormattedMessage id='edit_profile.fields.rss_label' defaultMessage='Enable RSS feed for public posts' />}
diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json
index 1aeeb848a..35cd9cd4b 100644
--- a/packages/pl-fe/src/locales/en.json
+++ b/packages/pl-fe/src/locales/en.json
@@ -637,7 +637,6 @@
   "edit_federation.unlisted": "Force posts unlisted",
   "edit_password.header": "Change password",
   "edit_profile.error": "Profile update failed",
-  "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -657,7 +656,6 @@
   "edit_profile.fields.rss_label": "Enable RSS feed for public posts",
   "edit_profile.fields.stranger_notifications_label": "Block notifications from strangers",
   "edit_profile.header": "Edit profile",
-  "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",