From e6058dfc679d4aa1e0d381932d28c7201bb8a856 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Tue, 18 Nov 2025 22:01:19 -0800 Subject: [PATCH] 1 Fix linter error re Permalink Linter was complaining about a missing "href" on Permalink in the hashtag component, but when I dug in, it's a partially merged feature from this PR: https://github.com/hometown-fork/hometown/issues/1249 If you look at the PR, there was never meant to be hashtag-specific permalink functionality (this was code applied from an external patch), and regardless I just checked and the hashtag functionality never worked anyway (opening hashtag links in new windows). --- app/javascript/mastodon/components/hashtag.tsx | 6 +++--- app/javascript/mastodon/components/status_content.jsx | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/components/hashtag.tsx b/app/javascript/mastodon/components/hashtag.tsx index e1eeaa3e5..4e8110eef 100644 --- a/app/javascript/mastodon/components/hashtag.tsx +++ b/app/javascript/mastodon/components/hashtag.tsx @@ -9,7 +9,7 @@ import type Immutable from 'immutable'; import { Sparklines, SparklinesCurve } from 'react-sparklines'; -import { Permalink } from 'mastodon/components/permalink'; +import { Link } from 'react-router-dom'; import { ShortNumber } from 'mastodon/components/short_number'; import { Skeleton } from 'mastodon/components/skeleton'; @@ -103,7 +103,7 @@ export const Hashtag: React.FC = ({ }) => (
- + {name ? ( <> #{name} @@ -111,7 +111,7 @@ export const Hashtag: React.FC = ({ ) : ( )} - + {description ? ( {description} diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx index c38b1faa4..1497fd474 100644 --- a/app/javascript/mastodon/components/status_content.jsx +++ b/app/javascript/mastodon/components/status_content.jsx @@ -11,7 +11,6 @@ import { connect } from 'react-redux'; import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'; import { Icon } from 'mastodon/components/icon'; -import { Permalink } from 'mastodon/components/permalink'; import PollContainer from 'mastodon/containers/poll_container'; import { identityContextPropShape, withIdentity } from 'mastodon/identity_context'; import { autoPlayGif, languages as preloadedLanguages, expandUsernames } from 'mastodon/initial_state';