Merge pull request #10884 from DestinyItemManager/remove-mastodon

Remove Mastodon links

config/i18n.json

@@ -1472,7 +1472,6 @@
       },
       "Translation": "Join the Translation Team!",
       "TranslationText": "We use {{link}} for ease of translation. If you want to improve one of DIM's translations, join the team.",
-      "TwitterHelp": "Be sure to follow us to stay on top of updates and real time application state information.",
       "Version": "Version {{version}} ({{flavor}}), built on {{date}}",
       "Wiki": "DIM User Guide",
       "WikiHelp": "Learn how to use DIM's features."

docs/CHANGELOG.md

@@ -481,6 +481,7 @@
 * "Hide completed triumphs" on the Records page now also hides sections and seals where all triumphs have been completed, not only the triumphs themselves.
 * The Vendors page should now more reliably indicate whether armor sold by Ada-1 is unlocked in collections.
 * Comparing a legendary armor piece now starts the Compare view with similar armor based on intrinsic perk and activity mod slot.
+* Removed links to DIM's inactive Mastodon account.
 
 ## 7.88.0 <span class="changelog-date">(2023-10-01)</span>
 

src/app/shell/About.tsx

@@ -10,8 +10,8 @@ import { useEffect } from 'react';
 import { Link } from 'react-router';
 import ExternalLink from '../dim-ui/ExternalLink';
 import styles from './About.m.scss';
-import { AppIcon, faDiscord, faGithub, faTshirt, heartIcon, helpIcon, mastodonIcon } from './icons';
-import { dimHelpMastodonLink, dimMastodonAccount, discordLink, userGuideLink } from './links';
+import { AppIcon, faDiscord, faGithub, faTshirt, heartIcon, helpIcon } from './icons';
+import { discordLink, userGuideLink } from './links';
 
 const githubLinkDirect = 'https://github.com/DestinyItemManager/DIM/';
 const crowdinLinkDirect =
@@ -150,16 +150,6 @@ export default function About() {
           </h2>
           {t('Views.About.DiscordHelp')}
         </div>
-        <div>
-          <h2>
-            <ExternalLink href={dimHelpMastodonLink}>
-              <AppIcon icon={mastodonIcon} />
-              Mastodon
-            </ExternalLink>
-          </h2>
-          {t('Views.About.TwitterHelp')} <br />
-          <ExternalLink href={dimHelpMastodonLink}>{dimMastodonAccount}</ExternalLink>
-        </div>
         <div>
           <h2>
             <ExternalLink href={githubLinkDirect}>

src/app/shell/ErrorPanel.tsx

@@ -6,30 +6,22 @@ import BungieAlerts from 'app/whats-new/BungieAlerts';
 import { PlatformErrorCodes } from 'bungie-api-ts/destiny2';
 import { AppIcon, helpIcon, mastodonIcon, refreshIcon } from '../shell/icons';
 import styles from './ErrorPanel.m.scss';
-import {
-  bungieHelpAccount,
-  bungieHelpLink,
-  dimHelpMastodonLink,
-  dimMastodonAccount,
-  troubleshootingLink,
-} from './links';
+import { bungieHelpAccount, bungieHelpLink, troubleshootingLink } from './links';
 
 function Socials() {
   return (
     <div className={styles.socials}>
-      {['https://mastodon.social/users/bungiehelp', 'https://mstdn.games/users/ThisIsDIM'].map(
-        (account) => (
-          <div key={account} className={styles.timeline}>
-            <iframe
-              allowFullScreen
-              sandbox="allow-top-navigation allow-scripts allow-popups allow-popups-to-escape-sandbox"
-              src={`https://www.mastofeed.com/apiv2/feed?userurl=${encodeURIComponent(
-                account,
-              )}&theme=dark&size=100&header=false&replies=false&boosts=true`}
-            />
-          </div>
-        ),
-      )}
+      {['https://mastodon.social/users/bungiehelp'].map((account) => (
+        <div key={account} className={styles.timeline}>
+          <iframe
+            allowFullScreen
+            sandbox="allow-top-navigation allow-scripts allow-popups allow-popups-to-escape-sandbox"
+            src={`https://www.mastofeed.com/apiv2/feed?userurl=${encodeURIComponent(
+              account,
+            )}&theme=dark&size=100&header=false&replies=false&boosts=true`}
+          />
+        </div>
+      ))}
     </div>
   );
 }
@@ -108,9 +100,6 @@ export default function ErrorPanel({
               <AppIcon icon={mastodonIcon} /> {bungieHelpAccount}
             </ExternalLink>
           )}
-          <ExternalLink href={dimHelpMastodonLink} className="dim-button">
-            <AppIcon icon={mastodonIcon} /> {dimMastodonAccount}
-          </ExternalLink>
           <ExternalLink href={troubleshootingLink} className="dim-button">
             <AppIcon icon={helpIcon} /> {t('ErrorPanel.Troubleshooting')}
           </ExternalLink>

src/app/shell/links.ts

@@ -1,13 +1,10 @@
 /** Shared constants for external links that may be used on multiple pages. */
 
 export const bungieHelpLink = 'https://mastodon.social/@bungiehelp';
-export const dimHelpMastodonLink = 'https://mstdn.games/@ThisIsDIM';
 export const discordLink = 'https://discord.gg/UK2GWC7';
 export const userGuideLink = 'https://guide.dim.gg';
 export const wishListGuideLink =
   'https://github.com/DestinyItemManager/DIM/wiki/Creating-Wish-Lists';
-
-export const dimMastodonAccount = '@[email protected]';
 export const bungieHelpAccount = '@BungieHelp';
 
 export function userGuideUrl(topic: string) {

src/app/whats-new/WhatsNew.tsx

@@ -3,7 +3,6 @@ import { t } from 'app/i18next-t';
 import { usePageTitle } from 'app/utils/hooks';
 import BungieAlerts from './BungieAlerts';
 import ChangeLog from './ChangeLog';
-import styles from './WhatsNew.m.scss';
 
 /**
  * What's new in the world of DIM?
@@ -13,15 +12,6 @@ export default function WhatsNew() {
   return (
     <StaticPage>
       <BungieAlerts />
-
-      <div className={styles.timeline}>
-        <iframe
-          allowFullScreen
-          sandbox="allow-top-navigation allow-scripts allow-popups allow-popups-to-escape-sandbox"
-          src="https://www.mastofeed.com/apiv2/feed?userurl=https%3A%2F%2Fmstdn.games%2Fusers%2FThisIsDIM&theme=dark&size=80&header=false&replies=false&boosts=true"
-        />
-      </div>
-
       <ChangeLog />
     </StaticPage>
   );

src/locale/en.json

@@ -1458,7 +1458,6 @@
       },
       "Translation": "Join the Translation Team!",
       "TranslationText": "We use {{link}} for ease of translation. If you want to improve one of DIM's translations, join the team.",
-      "TwitterHelp": "Be sure to follow us to stay on top of updates and real time application state information.",
       "Version": "Version {{version}} ({{flavor}}), built on {{date}}",
       "Wiki": "DIM User Guide",
       "WikiHelp": "Learn how to use DIM's features."