From 0206081e40da988bae78ced3061b18e656c74fa5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 May 2023 23:24:27 +0200
Subject: [PATCH] Fix AvatarComposite and DisplayName referencing undefined
 props (#2222)

---
 .../glitch/components/avatar_composite.jsx    | 11 +---
 .../glitch/components/display_name.jsx        | 59 ++++++-------------
 2 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/avatar_composite.jsx b/app/javascript/flavours/glitch/components/avatar_composite.jsx
index 98ea9d2728..1c23a8b36e 100644
--- a/app/javascript/flavours/glitch/components/avatar_composite.jsx
+++ b/app/javascript/flavours/glitch/components/avatar_composite.jsx
@@ -9,7 +9,6 @@ export default class AvatarComposite extends React.PureComponent {
     accounts: ImmutablePropTypes.list.isRequired,
     animate: PropTypes.bool,
     size: PropTypes.number.isRequired,
-    onAccountClick: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -80,15 +79,7 @@ export default class AvatarComposite extends React.PureComponent {
     };
 
     return (
-      <a
-        href={account.get('url')}
-        target='_blank'
-        onClick={(e) => this.props.onAccountClick(account.get('acct'), e)}
-        title={`@${account.get('acct')}`}
-        key={account.get('id')}
-      >
-        <div style={style} data-avatar-of={`@${account.get('acct')}`} />
-      </a>
+      <div key={account.get('id')} style={style} data-avatar-of={`@${account.get('acct')}`} />
     );
   }
 
diff --git a/app/javascript/flavours/glitch/components/display_name.jsx b/app/javascript/flavours/glitch/components/display_name.jsx
index f58a8df824..fceca5d961 100644
--- a/app/javascript/flavours/glitch/components/display_name.jsx
+++ b/app/javascript/flavours/glitch/components/display_name.jsx
@@ -9,12 +9,9 @@ export default class DisplayName extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map,
-    className: PropTypes.string,
-    inline: PropTypes.bool,
-    localDomain: PropTypes.string,
     others: ImmutablePropTypes.list,
-    handleClick: PropTypes.func,
-    onAccountClick: PropTypes.func,
+    localDomain: PropTypes.string,
+    inline: PropTypes.bool,
   };
 
   handleMouseEnter = ({ currentTarget }) => {
@@ -43,48 +40,30 @@ export default class DisplayName extends React.PureComponent {
     }
   };
 
-  render() {
-    const { account, className, inline, localDomain, others, onAccountClick } = this.props;
+  render () {
+    const { others, localDomain, inline } = this.props;
 
-    const computedClass = classNames('display-name', { inline }, className);
+    let displayName, suffix, account;
 
-    let displayName, suffix;
-    let acct;
+    if (others && others.size > 1) {
+      displayName = others.take(2).map(a => <bdi key={a.get('id')}><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi>).reduce((prev, cur) => [prev, ', ', cur]);
 
-    if (account) {
-      acct = account.get('acct');
-
-      if (acct.indexOf('@') === -1 && localDomain) {
-        acct = `${acct}@${localDomain}`;
+      if (others.size - 2 > 0) {
+        suffix = `+${others.size - 2}`;
+      }
+    } else if ((others && others.size > 0) || this.props.account) {
+      if (others && others.size > 0) {
+        account = others.first();
+      } else {
+        account = this.props.account;
       }
-    }
 
-    if (others && others.size > 0) {
-      displayName = others.take(2).map(a => (
-        <a
-          key={a.get('id')}
-          href={a.get('url')}
-          target='_blank'
-          onClick={(e) => onAccountClick(a.get('acct'), e)}
-          title={`@${a.get('acct')}`}
-          rel='noopener noreferrer'
-        >
-          <bdi key={a.get('id')}>
-            <strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} />
-          </bdi>
-        </a>
-      )).reduce((prev, cur) => [prev, ', ', cur]);
+      let acct = account.get('acct');
 
-      if (others.size - 2 > 0) {
-        displayName.push(` +${others.size - 2}`);
+      if (acct.indexOf('@') === -1 && localDomain) {
+        acct = `${acct}@${localDomain}`;
       }
 
-      suffix = (
-        <a href={account.get('url')} target='_blank' onClick={(e) => onAccountClick(account.get('acct'), e)} rel='noopener noreferrer'>
-          <span className='display-name__account'>@{acct}</span>
-        </a>
-      );
-    } else if (account) {
       displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
       suffix      = <span className='display-name__account'>@{acct}</span>;
     } else {
@@ -93,7 +72,7 @@ export default class DisplayName extends React.PureComponent {
     }
 
     return (
-      <span className={computedClass} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+      <span className={classNames('display-name', { inline })} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
         {displayName}
         {inline ? ' ' : null}
         {suffix}