diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-07-13 10:39:15 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-07-13 10:39:15 -0400 |
| commit | ea0881f87e4712810b0c1c7a6e510ba27b118577 (patch) | |
| tree | 08335784d510ac9939bd5f87f35c1439288e47c7 | |
| parent | 1b7a4ac09019c84c23e7b5056fecf56367a940f7 (diff) | |
Using community-link instead.
| -rw-r--r-- | server/lemmy_db/src/schema.rs | 2 | ||||
| -rw-r--r-- | ui/src/components/comment-node.tsx | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/server/lemmy_db/src/schema.rs b/server/lemmy_db/src/schema.rs index 49dd4e69..9608fb7d 100644 --- a/server/lemmy_db/src/schema.rs +++ b/server/lemmy_db/src/schema.rs @@ -38,7 +38,6 @@ table! { id -> Int4, creator_id -> Nullable<Int4>, post_id -> Nullable<Int4>, - post_name -> Nullable<Varchar>, parent_id -> Nullable<Int4>, content -> Nullable<Text>, removed -> Nullable<Bool>, @@ -48,6 +47,7 @@ table! { deleted -> Nullable<Bool>, ap_id -> Nullable<Varchar>, local -> Nullable<Bool>, + post_name -> Nullable<Varchar>, community_id -> Nullable<Int4>, community_actor_id -> Nullable<Varchar>, community_local -> Nullable<Bool>, diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index cca235ab..a6b9b7ba 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -32,6 +32,7 @@ import { MomentTime } from './moment-time'; import { CommentForm } from './comment-form'; import { CommentNodes } from './comment-nodes'; import { UserListing } from './user-listing'; +import { CommunityLink } from './community-link'; import { i18n } from '../i18next'; interface CommentNodeState { @@ -186,8 +187,17 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { {this.props.showCommunity && ( <> <span class="mx-1">{i18n.t('to')}</span> - <Link class="mr-2" to={`/c/${node.comment.community_name}`}> - {node.comment.community_name} + <CommunityLink + community={{ + name: node.comment.community_name, + id: node.comment.community_id, + local: node.comment.community_local, + actor_id: node.comment.community_actor_id, + }} + /> + <span class="mx-2">•</span> + <Link class="mr-2" to={`/post/${node.comment.post_id}`}> + {node.comment.post_name} </Link> </> )} @@ -222,15 +232,6 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { <MomentTime data={node.comment} /> </span> </div> - {this.props.showCommunity && !this.state.collapsed && ( - <> - <div class="md-div text-muted small"> - <Link class="mr-2" to={`/post/${node.comment.post_id}`}> - {node.comment.post_name} - </Link> - </div> - </> - )} {/* end of user row */} {this.state.showEdit && ( <CommentForm |