Restore glitch-soc's permalink behavior for reply indicator

glitch-soc · Feb 22, 2024 · 6496d36 · 6496d36
1 parent 232f710
commit 6496d36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
@@ -2,8 +2,6 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { useDispatch, useSelector } from 'react-redux';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
@@ -12,6 +10,7 @@ import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react'
 import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
 import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
+import { Permalink } from 'flavours/glitch/components/permalink';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
 
 const messages = defineMessages({
@@ -39,9 +38,9 @@ export const EditIndicator = () => {
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
         <div className='edit-indicator__display-name'>
-          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          <Permalink href={account.get('url')} to={`/@${account.get('acct')}`}>@{account.get('acct')}</Permalink>
           ·
-          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+          <Permalink href={status.get('url')} to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Permalink>
         </div>
 
         <div className='edit-indicator__cancel'>

diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -1,14 +1,13 @@
 import { FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { useSelector } from 'react-redux';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
 import { Icon } from 'flavours/glitch/components/icon';
+import { Permalink } from 'flavours/glitch/components/permalink';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -25,14 +24,14 @@ export const ReplyIndicator = () => {
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
 
-      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+      <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
         <Avatar account={account} size={46} />
-      </Link>
+      </Permalink>
 
       <div className='reply-indicator__main'>
-        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+        <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
           <DisplayName account={account} />
-        </Link>
+        </Permalink>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />