From a3d171884d43aecde827c5067419ef7f6a9f5ccc Mon Sep 17 00:00:00 2001 From: Beaudan Brown Date: Mon, 25 Nov 2019 15:58:25 +1100 Subject: [PATCH] Added ban user right click functionality --- js/models/messages.js | 2 ++ ts/components/conversation/Message.tsx | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/js/models/messages.js b/js/models/messages.js index cd089398f..6b5314e33 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -655,6 +655,8 @@ !this.get('isPublic') || this.getConversation().isModerator(this.OUR_NUMBER) || this.getSource() === this.OUR_NUMBER, + hasModPerms: + this.getConversation().isModerator(this.OUR_NUMBER), onCopyText: () => this.copyText(), onSelectMessage: () => this.selectMessage(), diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 534374f03..70e1f61ae 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -57,6 +57,7 @@ export interface Props { disableMenu?: boolean; isModerator?: boolean; isDeletable: boolean; + hasModPerms?: boolean; text?: string; textPending?: boolean; id?: string; @@ -112,6 +113,7 @@ export interface Props { onDownload?: (isDangerous: boolean) => void; onDelete?: () => void; onCopyPubKey?: () => void; + onBanUser?: () => void; onShowDetail: () => void; } @@ -861,6 +863,8 @@ export class Message extends React.PureComponent { onCopyPubKey, isPublic, i18n, + hasModPerms, + onBanUser, } = this.props; const showRetry = status === 'error' && direction === 'outgoing'; @@ -960,6 +964,11 @@ export class Message extends React.PureComponent { {i18n('copyPublicKey')} ) : null} + {(hasModPerms && isPublic) ? ( + + {i18n('banUser')} + + ) : null} ); }