grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/lemmynet/lemmy into main

Browse source
This commit is contained in:
Dessalines 2020-08-07 23:21:30 -04:00
commit 410edc1df3
2 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/src/components/comment-node.tsx vendored
View file

@ -475,6 +475,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</button> </button>
))} ))}
{!node.comment.banned_from_community && {!node.comment.banned_from_community &&
node.comment.creator_local &&
(!this.state.showConfirmAppointAsMod ? ( (!this.state.showConfirmAppointAsMod ? (
<button <button
class="btn btn-link btn-animate text-muted" class="btn btn-link btn-animate text-muted"
@ -517,6 +518,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
{/* Community creators and admins can transfer community to another mod */} {/* Community creators and admins can transfer community to another mod */}
{(this.amCommunityCreator || this.canAdmin) && {(this.amCommunityCreator || this.canAdmin) &&
this.isMod && this.isMod &&
node.comment.creator_local &&
(!this.state.showConfirmTransferCommunity ? ( (!this.state.showConfirmTransferCommunity ? (
<button <button
class="btn btn-link btn-animate text-muted" class="btn btn-link btn-animate text-muted"
@ -579,6 +581,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</button> </button>
))} ))}
{!node.comment.banned && {!node.comment.banned &&
node.comment.creator_local &&
(!this.state.showConfirmAppointAsAdmin ? ( (!this.state.showConfirmAppointAsAdmin ? (
<button <button
class="btn btn-link btn-animate text-muted" class="btn btn-link btn-animate text-muted"
@ -621,6 +624,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
{/* Site Creator can transfer to another admin */} {/* Site Creator can transfer to another admin */}
{this.amSiteCreator && {this.amSiteCreator &&
this.isAdmin && this.isAdmin &&
node.comment.creator_local &&
(!this.state.showConfirmTransferSite ? ( (!this.state.showConfirmTransferSite ? (
<button <button
class="btn btn-link btn-animate text-muted" class="btn btn-link btn-animate text-muted"

72
ui/src/components/post-listing.tsx vendored
View file

@ -756,7 +756,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
)} )}
</li> </li>
)} )}
{!post.banned_from_community && ( {!post.banned_from_community && post.creator_local && (
<li className="list-inline-item"> <li className="list-inline-item">
<span <span
class="pointer" class="pointer"
@ -774,45 +774,47 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</> </>
)} )}
{/* Community creators and admins can transfer community to another mod */} {/* Community creators and admins can transfer community to another mod */}
{(this.amCommunityCreator || this.canAdmin) && this.isMod && ( {(this.amCommunityCreator || this.canAdmin) &&
<li className="list-inline-item"> this.isMod &&
{!this.state.showConfirmTransferCommunity ? ( post.creator_local && (
<span <li className="list-inline-item">
class="pointer" {!this.state.showConfirmTransferCommunity ? (
onClick={linkEvent(
this,
this.handleShowConfirmTransferCommunity
)}
>
{i18n.t('transfer_community')}
</span>
) : (
<>
<span class="d-inline-block mr-1">
{i18n.t('are_you_sure')}
</span>
<span <span
class="pointer d-inline-block mr-1" class="pointer"
onClick={linkEvent( onClick={linkEvent(
this, this,
this.handleTransferCommunity this.handleShowConfirmTransferCommunity
)} )}
> >
{i18n.t('yes')} {i18n.t('transfer_community')}
</span> </span>
<span ) : (
class="pointer d-inline-block" <>
onClick={linkEvent( <span class="d-inline-block mr-1">
this, {i18n.t('are_you_sure')}
this.handleCancelShowConfirmTransferCommunity </span>
)} <span
> class="pointer d-inline-block mr-1"
{i18n.t('no')} onClick={linkEvent(
</span> this,
</> this.handleTransferCommunity
)} )}
</li> >
)} {i18n.t('yes')}
</span>
<span
class="pointer d-inline-block"
onClick={linkEvent(
this,
this.handleCancelShowConfirmTransferCommunity
)}
>
{i18n.t('no')}
</span>
</>
)}
</li>
)}
{/* Admins can ban from all, and appoint other admins */} {/* Admins can ban from all, and appoint other admins */}
{this.canAdmin && ( {this.canAdmin && (
<> <>
@ -835,7 +837,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
)} )}
</li> </li>
)} )}
{!post.banned && ( {!post.banned && post.creator_local && (
<li className="list-inline-item"> <li className="list-inline-item">
<span <span
class="pointer" class="pointer"