Merge branch 'federation' into federated_remove_actions

1 files changed, 5 insertions, 2 deletions

diff --git a/ui/src/components/community-link.tsx b/ui/src/components/community-link.tsx
index bcfa0534..eb55400e 100644
--- a/ui/src/components/community-link.tsx
+++ b/ui/src/components/community-link.tsx
@@ -12,6 +12,7 @@ interface CommunityOther {
 
 interface CommunityLinkProps {
   community: Community | CommunityOther;
+  realLink?: boolean;
 }
 
 export class CommunityLink extends Component<CommunityLinkProps, any> {
@@ -27,8 +28,10 @@ export class CommunityLink extends Component<CommunityLinkProps, any> {
       name_ = community.name;
       link = `/c/${community.name}`;
     } else {
-      name_ = `${hostname(community.actor_id)}/${community.name}`;
-      link = `/community/${community.id}`;
+      name_ = `${community.name}@${hostname(community.actor_id)}`;
+      link = !this.props.realLink
+        ? `/community/${community.id}`
+        : community.actor_id;
     }
     return <Link to={link}>{name_}</Link>;
   }