Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-11 14:30:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement mention rewriting in new HTML handling code (#3247)

Browse Source
This commit is contained in:
Claire
2025-10-28 21:22:36 +01:00
committed by GitHub
parent fb9e33099f
commit 70b8281730
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/status/handled_link.stories.tsx
View File

@@ -21,9 +21,13 @@ const meta = {
render({ mentionAccount, hashtagAccount, ...args }) {
let mention: HandledLinkProps['mention'] | undefined;
if (mentionAccount === 'local') {
mention = { id: '1', acct: 'testuser' };
mention = { id: '1', acct: 'testuser', username: 'testuser' };
} else if (mentionAccount === 'remote') {
mention = { id: '2', acct: 'remoteuser@mastodon.social' };
mention = {
id: '2',
acct: 'remoteuser@mastodon.social',
username: 'remoteuser',
};
}
return (
<>

25
app/javascript/flavours/glitch/components/status/handled_link.tsx
View File

@@ -5,6 +5,7 @@ import classNames from 'classnames';
import { Link } from 'react-router-dom';
import type { ApiMentionJSON } from '@/flavours/glitch/api_types/statuses';
import { useAppSelector } from '@/flavours/glitch/store';
import type { OnElementHandler } from '@/flavours/glitch/utils/html';
export interface HandledLinkProps {
@@ -12,7 +13,7 @@ export interface HandledLinkProps {
text: string;
prevText?: string;
hashtagAccountId?: string;
mention?: Pick<ApiMentionJSON, 'id' | 'acct'>;
mention?: Pick<ApiMentionJSON, 'id' | 'acct' | 'username'>;
}
export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
@@ -25,6 +26,11 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
children,
...props
}) => {
const rewriteMentions = useAppSelector(
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
(state) => state.local_settings.get('rewrite_mentions', 'no') as string,
);
// Handle hashtags
if (text.startsWith('#') || prevText?.endsWith('#')) {
const hashtag = text.slice(1).trim();
@@ -39,6 +45,23 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
</Link>
);
} else if (mention) {
// glitch-soc feature to rewrite mentions
if (rewriteMentions !== 'no') {
return (
<Link
className={classNames('mention', className)}
to={`/@${mention.acct}`}
title={`@${mention.acct}`}
data-hover-card-account={mention.id}
>
@
<span>
{rewriteMentions === 'acct' ? mention.acct : mention.username}
</span>
</Link>
);
}
// Handle mentions
return (
<Link