Linted

_locales/en/messages.json

@@ -2001,26 +2001,22 @@
 
   "banUser": {
     "message": "Ban user",
-    "description":
+    "description": "Ban user from public chat by public key."
-      "Ban user from public chat by public key."
   },
 
   "banUserConfirm": {
     "message": "Are you sure you want to ban user?",
-    "description":
+    "description": "Message shown when confirming user ban."
-      "Message shown when confirming user ban."
   },
 
   "userBanned": {
     "message": "User successfully banned",
-    "description":
+    "description": "Toast on succesful user ban."
-      "Toast on succesful user ban."
   },
 
   "userBanFailed": {
     "message": "User ban failed!",
-    "description":
+    "description": "Toast on unsuccesful user ban."
-      "Toast on unsuccesful user ban."
   },
 
   "copyChatId": {

js/models/messages.js

@@ -12,7 +12,6 @@
   Whisper,
   clipboard,
   libloki,
-  lokiPublicChatAPI,
 */
 
 /* eslint-disable more/no-then */
@@ -656,8 +655,7 @@
           !this.get('isPublic') ||
           this.getConversation().isModerator(this.OUR_NUMBER) ||
           this.getSource() === this.OUR_NUMBER,
-        hasModPerms:
+        hasModPerms: this.getConversation().isModerator(this.OUR_NUMBER),
-          this.getConversation().isModerator(this.OUR_NUMBER),
 
         onCopyText: () => this.copyText(),
         onSelectMessage: () => this.selectMessage(),
@@ -986,13 +984,12 @@
             window.Whisper.events.trigger('showToast', {
               message: i18n('userBanned'),
             });
-          }
+          } else {
-          else{
             window.Whisper.events.trigger('showToast', {
               message: i18n('userBanFailed'),
             });
           }
-        }
+        },
       });
     },
 

js/modules/loki_app_dot_net_api.js

@@ -545,10 +545,11 @@ class LokiPublicChannelAPI {
     // TODO: poll for group members here?
   }
 
-  async banUser(pubkey){
+  async banUser(pubkey) {
     const res = await this.serverRequest(
-      `loki/v1/moderation/blacklist/@${pubkey}`, {
+      `loki/v1/moderation/blacklist/@${pubkey}`,
-        method: 'POST'
+      {
+        method: 'POST',
       }
     );
 

ts/components/conversation/Message.tsx

@@ -964,10 +964,8 @@ export class Message extends React.PureComponent<Props, State> {
             {i18n('copyPublicKey')}
           </MenuItem>
         ) : null}
-        {(hasModPerms && isPublic) ? (
+        {hasModPerms && isPublic ? (
-          <MenuItem onClick={wrap(onBanUser)}>
+          <MenuItem onClick={wrap(onBanUser)}>{i18n('banUser')}</MenuItem>
-            {i18n('banUser')}
-          </MenuItem>
         ) : null}
       </ContextMenu>
     );