Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distinguish "Creator" badge on comments #1623

Merged
merged 13 commits into from
Jun 27, 2023
Merged

Distinguish "Creator" badge on comments #1623

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b69ad12
make post creator badge stand out more
alectrocute Jun 26, 2023
1faa9f3
add tooltip
alectrocute Jun 26, 2023
03a4bfa
remove toUpperCase since the translation is uppercase
alectrocute Jun 26, 2023
06736c3
Merge branch 'main' of https://github.com/LemmyNet/lemmy-ui into bugf…
alectrocute Jun 27, 2023
9e1eb5f
always show badge on mobile
alectrocute Jun 27, 2023
c020deb
use span
alectrocute Jun 27, 2023
e9f3701
Merge branch 'main' of https://github.com/LemmyNet/lemmy-ui into bugf…
alectrocute Jun 27, 2023
6d65abc
refactor
alectrocute Jun 27, 2023
086052a
refactor x2
alectrocute Jun 27, 2023
0b7e2b7
oops
alectrocute Jun 27, 2023
f333710
make mod shrunken label text-primary
alectrocute Jun 27, 2023
4944f19
change me-2 to me-1, no need for me-2 width
alectrocute Jun 27, 2023
4e161f5
refactor again
alectrocute Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 58 additions & 23 deletions src/shared/components/comment/comment-node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,32 +308,43 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
classes="icon-inline"
/>
</button>

<span className="me-2">
<PersonListing person={cv.creator} />
</span>

{cv.comment.distinguished && (
<Icon icon="shield" inline classes="text-danger me-2" />
)}
{this.isPostCreator && (
<div className="badge text-bg-light d-none d-sm-inline me-2">
{I18NextService.i18n.t("creator")}
</div>
)}
{isMod_ && (
<div className="badge text-bg-light d-none d-sm-inline me-2">
{I18NextService.i18n.t("mod")}
</div>
)}
{isAdmin_ && (
<div className="badge text-bg-light d-none d-sm-inline me-2">
{I18NextService.i18n.t("admin")}
</div>
)}
{cv.creator.bot_account && (
<div className="badge text-bg-light d-none d-sm-inline me-2">
{I18NextService.i18n.t("bot_account").toLowerCase()}
</div>
)}

{this.isPostCreator &&
this.getRoleLabelPill({
label: I18NextService.i18n.t("op").toUpperCase(),
tooltip: I18NextService.i18n.t("creator"),
classes: "text-bg-info text-black",
shrink: false,
})}

{isMod_ &&
this.getRoleLabelPill({
label: I18NextService.i18n.t("mod"),
tooltip: I18NextService.i18n.t("mod"),
classes: "text-bg-primary text-black",
})}

{isAdmin_ &&
this.getRoleLabelPill({
label: I18NextService.i18n.t("admin"),
tooltip: I18NextService.i18n.t("admin"),
classes: "text-bg-danger text-black",
})}

{cv.creator.bot_account &&
this.getRoleLabelPill({
label: I18NextService.i18n.t("bot_account").toLowerCase(),
tooltip: I18NextService.i18n.t("bot_account"),
})}

{this.props.showCommunity && (
<>
<span className="mx-1">{I18NextService.i18n.t("to")}</span>
Expand All @@ -344,7 +355,9 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</Link>
</>
)}
{this.linkBtn(true)}

{this.getLinkButton(true)}

{cv.comment.language_id !== 0 && (
<span className="badge text-bg-light d-none d-sm-inline me-2">
{
Expand Down Expand Up @@ -410,7 +423,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
/>
)}
<div className="d-flex justify-content-between justify-content-lg-start flex-wrap text-muted fw-bold">
{this.props.showContext && this.linkBtn()}
{this.props.showContext && this.getLinkButton()}
{this.props.markable && (
<button
className="btn btn-link btn-animate text-muted"
Expand Down Expand Up @@ -1186,7 +1199,29 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
}
}

linkBtn(small = false) {
getRoleLabelPill({
label,
tooltip,
classes,
shrink = true,
}: {
label: string;
tooltip: string;
classes?: string;
shrink?: boolean;
}) {
return (
<span
className={`badge me-1 ${classes ?? "text-bg-light"}`}
aria-label={tooltip}
data-tippy-content={tooltip}
>
{shrink ? label[0].toUpperCase() : label}
</span>
);
}

getLinkButton(small = false) {
const cv = this.commentView;

const classnames = classNames("btn btn-link btn-animate text-muted", {
Expand Down