From: Dessalines <tyhou13@gmx.com>
Date: Wed, 5 May 2021 14:57:41 +0000 (-0400)
Subject: Fix non-local community and person links. Fixes #290
X-Git-Url: http://these/git/%7B%60/feeds/front/static/%7BpictrsAvatarThumbnail%28this.state.siteRes.site.icon%29%7D?a=commitdiff_plain;h=fed9bddbb25216acd608a6231de4d28cb8be4a38;p=lemmy-ui.git

Fix non-local community and person links. Fixes #290
---

diff --git a/src/shared/components/community-link.tsx b/src/shared/components/community-link.tsx
index 5a85a12..c12f570 100644
--- a/src/shared/components/community-link.tsx
+++ b/src/shared/components/community-link.tsx
@@ -36,17 +36,34 @@ export class CommunityLink extends Component<CommunityLinkProps, any> {
 
     let apubName = `!${name_}`;
     let displayName = this.props.useApubName ? apubName : title;
-    return (
+    return !this.props.realLink ? (
       <Link
         title={apubName}
         className={`${this.props.muted ? "text-muted" : ""}`}
         to={link}
       >
+        {this.avatarAndName(displayName)}
+      </Link>
+    ) : (
+      <a
+        title={apubName}
+        className={`${this.props.muted ? "text-muted" : ""}`}
+        href={link}
+      >
+        {this.avatarAndName(displayName)}
+      </a>
+    );
+  }
+
+  avatarAndName(displayName: string) {
+    let community = this.props.community;
+    return (
+      <>
         {!this.props.hideAvatar && community.icon && showAvatars() && (
           <PictrsImage src={community.icon} icon />
         )}
         <span>{displayName}</span>
-      </Link>
+      </>
     );
   }
 }
diff --git a/src/shared/components/person-listing.tsx b/src/shared/components/person-listing.tsx
index fda388d..1726576 100644
--- a/src/shared/components/person-listing.tsx
+++ b/src/shared/components/person-listing.tsx
@@ -44,19 +44,38 @@ export class PersonListing extends Component<PersonListingProps, any> {
 
     return (
       <>
-        <Link
-          title={apubName}
-          className={this.props.muted ? "text-muted" : "text-info"}
-          to={link}
-        >
-          {!this.props.hideAvatar && person.avatar && showAvatars() && (
-            <PictrsImage src={person.avatar} icon />
-          )}
-          <span>{displayName}</span>
-        </Link>
+        {!this.props.realLink ? (
+          <Link
+            title={apubName}
+            className={this.props.muted ? "text-muted" : "text-info"}
+            to={link}
+          >
+            {this.avatarAndName(displayName)}
+          </Link>
+        ) : (
+          <a
+            title={apubName}
+            className={this.props.muted ? "text-muted" : "text-info"}
+            href={link}
+          >
+            {this.avatarAndName(displayName)}
+          </a>
+        )}
 
         {isCakeDay(person.published) && <CakeDay creatorName={apubName} />}
       </>
     );
   }
+
+  avatarAndName(displayName: string) {
+    let person = this.props.person;
+    return (
+      <>
+        {!this.props.hideAvatar && person.avatar && showAvatars() && (
+          <PictrsImage src={person.avatar} icon />
+        )}
+        <span>{displayName}</span>
+      </>
+    );
+  }
 }