Merge branch 'revert-dean-grouping' into revert-notification-grouping

neatchee · Jul 23, 2024 · 43d4210 · 43d4210
2 parents 143b63d + c423fa9
commit 43d4210
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
@@ -4,7 +4,6 @@ import { injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
-import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 

diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -45,18 +45,20 @@ export default class StatusPrepend extends PureComponent {
 
   Message = () => {
     const { type, account } = this.props;
-
-    const linkifiedAccounts = (
+    let link = (
       <a
         onClick={this.handleClick}
         href={account.get('url')}
         className='status__display-name'
+        data-hover-card-account={account.get('id')}
       >
-        <b
-          dangerouslySetInnerHTML={{
-            __html : account.get('display_name_html') || account.get('username'),
-          }}
-        />
+        <bdi>
+          <strong
+            dangerouslySetInnerHTML={{
+              __html : account.get('display_name_html') || account.get('username'),
+            }}
+          />
+        </bdi>
       </a>
     );
 
@@ -70,43 +72,43 @@ export default class StatusPrepend extends PureComponent {
         <FormattedMessage
           id='status.reblogged_by'
           defaultMessage='{name} boosted'
-          values={{ name : linkifiedAccounts }}
+          values={{ name : link }}
         />
       );
     case 'favourite':
       return (
         <FormattedMessage
           id='notification.favourite'
           defaultMessage='{name} favourited your status'
-          values={{ name : linkifiedAccounts }}
+          values={{ name : link }}
         />
       );
     case 'reaction':
       return (
         <FormattedMessage
           id='notification.reaction'
           defaultMessage='{name} reacted to your status'
-          values={{ name: linkifiedAccounts }}
+          values={{ name: link }}
         />
       );
     case 'reblog':
       return (
         <FormattedMessage
           id='notification.reblog'
           defaultMessage='{name} boosted your status'
-          values={{ name : linkifiedAccounts }}
+          values={{ name : link }}
         />
       );
     case 'status':
       return (
         <FormattedMessage
           id='notification.status'
           defaultMessage='{name} just posted'
-          values={{ name: linkifiedAccounts }}
+          values={{ name: link }}
         />
       );
     case 'poll':
-      if (me === accounts.get(0).get('id')) {
+      if (me === account.get('id')) {
         return (
           <FormattedMessage
             id='notification.own_poll'
@@ -126,7 +128,7 @@ export default class StatusPrepend extends PureComponent {
         <FormattedMessage
           id='notification.update'
           defaultMessage='{name} edited a post'
-          values={{ name: linkifiedAccounts }}
+          values={{ name: link }}
         />
       );
     }