Merge pull request #652 from vincentbavitz/public-ban

Public ban

_locales/en/messages.json

@@ -1999,6 +1999,26 @@
       "Button action that the user can click to copy their public keys"
   },
 
+  "banUser": {
+    "message": "Ban user",
+    "description": "Ban user from public chat by public key."
+  },
+
+  "banUserConfirm": {
+    "message": "Are you sure you want to ban user?",
+    "description": "Message shown when confirming user ban."
+  },
+
+  "userBanned": {
+    "message": "User successfully banned",
+    "description": "Toast on succesful user ban."
+  },
+
+  "userBanFailed": {
+    "message": "User ban failed!",
+    "description": "Toast on unsuccesful user ban."
+  },
+
   "copyChatId": {
     "message": "Copy Chat ID"
   },

js/models/messages.js

@@ -643,6 +643,9 @@
       // for the public group chat
       const conversation = this.getConversation();
 
+      const isModerator =
+        conversation && !!conversation.isModerator(this.OUR_NUMBER);
+
       const convoId = conversation ? conversation.id : undefined;
       const isGroup = !!conversation && !conversation.isPrivate();
 
@@ -677,18 +680,21 @@
         isP2p: !!this.get('isP2p'),
         isPublic: !!this.get('isPublic'),
         isRss: !!this.get('isRss'),
-        isModerator:
+        senderIsModerator:
           !!this.get('isPublic') &&
-          this.getConversation().isModerator(this.getSource()),
+          conversation &&
+          conversation.isModerator(phoneNumber),
         isDeletable:
           !this.get('isPublic') ||
-          this.getConversation().isModerator(this.OUR_NUMBER) ||
-          this.getSource() === this.OUR_NUMBER,
+          isModerator ||
+          phoneNumber === this.OUR_NUMBER,
+        isModerator,
 
         onCopyText: () => this.copyText(),
         onSelectMessage: () => this.selectMessage(),
         onSelectMessageUnchecked: () => this.selectMessageUnchecked(),
         onCopyPubKey: () => this.copyPubKey(),
+        onBanUser: () => this.banUser(),
         onReply: () => this.trigger('reply', this),
         onRetrySend: () => this.retrySend(),
         onShowDetail: () => this.trigger('show-message-detail', this),
@@ -997,6 +1003,29 @@
       });
     },
 
+    banUser() {
+      window.Whisper.events.trigger('showConfirmationDialog', {
+        message: i18n('banUserConfirm'),
+        onOk: async () => {
+          const source = this.get('source');
+          const conversation = this.getConversation();
+
+          const channelAPI = await conversation.getPublicSendData();
+          const success = await channelAPI.banUser(source);
+
+          if (success) {
+            window.Whisper.events.trigger('showToast', {
+              message: i18n('userBanned'),
+            });
+          } else {
+            window.Whisper.events.trigger('showToast', {
+              message: i18n('userBanFailed'),
+            });
+          }
+        },
+      });
+    },
+
     // Select message even if the context menu is shown
     selectMessageUnchecked() {
       this.selected = !this.selected;

js/modules/loki_app_dot_net_api.js

@@ -689,6 +689,24 @@ class LokiPublicChannelAPI {
     // TODO: poll for group members here?
   }
 
+  async banUser(pubkey) {
+    const res = await this.serverRequest(
+      `loki/v1/moderation/blacklist/@${pubkey}`,
+      {
+        method: 'POST',
+      }
+    );
+
+    if (res.err || !res.response || !res.response.data) {
+      if (res.err) {
+        log.error(`Error ${res.err}`);
+      }
+      return false;
+    }
+
+    return true;
+  }
+
   stop() {
     this.running = false;
     if (this.timers.channel) {

ts/components/conversation/Message.tsx

@@ -55,8 +55,9 @@ interface LinkPreviewType {
 
 export interface Props {
   disableMenu?: boolean;
-  isModerator?: boolean;
+  senderIsModerator?: boolean;
   isDeletable: boolean;
+  isModerator?: 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;
 }
 
@@ -210,9 +212,13 @@ export class Message extends React.PureComponent<Props, State> {
   }
 
   public renderMetadataBadges() {
-    const { direction, isP2p, isPublic, isModerator } = this.props;
+    const { direction, isP2p, isPublic, senderIsModerator } = this.props;
 
-    const badges = [isPublic && 'Public', isP2p && 'P2p', isModerator && 'Mod'];
+    const badges = [
+      isPublic && 'Public',
+      isP2p && 'P2p',
+      senderIsModerator && 'Mod',
+    ];
 
     return badges
       .map(badgeText => {
@@ -655,7 +661,7 @@ export class Message extends React.PureComponent<Props, State> {
       authorPhoneNumber,
       authorProfileName,
       collapseMetadata,
-      isModerator,
+      senderIsModerator,
       authorColor,
       conversationType,
       direction,
@@ -682,7 +688,7 @@ export class Message extends React.PureComponent<Props, State> {
           profileName={authorProfileName}
           size={36}
         />
-        {isModerator && (
+        {senderIsModerator && (
           <div className="module-avatar__icon--crown-wrapper">
             <div className="module-avatar__icon--crown" />
           </div>
@@ -861,6 +867,8 @@ export class Message extends React.PureComponent<Props, State> {
       onCopyPubKey,
       isPublic,
       i18n,
+      isModerator,
+      onBanUser,
     } = this.props;
 
     const showRetry = status === 'error' && direction === 'outgoing';
@@ -960,6 +968,9 @@ export class Message extends React.PureComponent<Props, State> {
             {i18n('copyPublicKey')}
           </MenuItem>
         ) : null}
+        {isModerator && isPublic ? (
+          <MenuItem onClick={wrap(onBanUser)}>{i18n('banUser')}</MenuItem>
+        ) : null}
       </ContextMenu>
     );
   }