From 52a71125910c351cf3e6692f7a2c6c60762f3cfd Mon Sep 17 00:00:00 2001
From: negue <eugen.bolz@gmail.com>
Date: Tue, 20 Nov 2018 17:20:58 +0100
Subject: [PATCH] some ui fixes / requested changes

---
 website/client/components/chat/chatCard.vue  | 10 ++++------
 website/common/locales/en/groups.json        |  1 -
 website/common/locales/en/messages.json      |  3 ++-
 website/server/controllers/api-v4/members.js |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue
index ea22cad88b..be849b14fc 100644
--- a/website/client/components/chat/chatCard.vue
+++ b/website/client/components/chat/chatCard.vue
@@ -1,8 +1,8 @@
 <template lang="pug">
 div
   .mentioned-icon(v-if='isUserMentioned')
-  .message-hidden(v-if='msg.flagCount === 1 && user.contributor.admin') Message flagged once, not hidden
-  .message-hidden(v-if='msg.flagCount > 1 && user.contributor.admin') Message hidden
+  .message-hidden(v-if='!inbox && msg.flagCount === 1 && user.contributor.admin') Message flagged once, not hidden
+  .message-hidden(v-if='!inbox && msg.flagCount > 1 && user.contributor.admin') Message hidden
   .card-body
     h3.leader(
       :class='userLevelStyle(msg)',
@@ -17,11 +17,10 @@ div
       span.mr-1(v-if="msg.username") •
       span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }}
     .text(v-html='atHighlight(parseMarkdown(msg.text))')
-    hr
-    .reported(v-if="isMessageReported")
+    .reported(v-if="isMessageReported && inbox")
       span(v-once) {{ $t('reportedMessage')}}
       br
-      span(v-if="inbox") {{ $t('canDeleteNow') }}
+      span(v-once) {{ $t('canDeleteNow') }}
     hr
     .d-flex(v-if='msg.id')
       .action.d-flex.align-items-center(v-if='!inbox', @click='copyAsTodo(msg)')
@@ -30,7 +29,6 @@ div
       .action.d-flex.align-items-center(v-if='(inbox || (user.flags.communityGuidelinesAccepted && msg.uuid !== "system")) && !isMessageReported', @click='report(msg)')
         .svg-icon(v-html="icons.report", v-once)
         div(v-once) {{$t('report')}}
-        // @TODO make flagging/reporting work in the inbox. NOTE: it must work even if the communityGuidelines are not accepted and it MUST work for messages that you have SENT as well as received. -- Alys
       .action.d-flex.align-items-center(v-if='msg.uuid === user._id || inbox || user.contributor.admin', @click='remove()')
         .svg-icon(v-html="icons.delete", v-once)
         div(v-once) {{$t('delete')}}
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f859578be5..5ba49da05b 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -156,7 +156,6 @@
   "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.",
   "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.",
   "report": "Report",
-  "canDeleteNow": "You can now delete the message if you wish.",
   "abuseFlag": "Report violation of Community Guidelines",
   "abuseFlagModalHeading": "Report a Violation",
   "abuseFlagModalBody": "Are you sure you want to report this post? You should <strong>only</strong> report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.",
diff --git a/website/common/locales/en/messages.json b/website/common/locales/en/messages.json
index 4239abfa63..470ce23af5 100644
--- a/website/common/locales/en/messages.json
+++ b/website/common/locales/en/messages.json
@@ -72,5 +72,6 @@
 
   "messageDeletedUser": "Sorry, this user has deleted their account.",
   "messageMissingDisplayName": "Missing display name.",
-  "reportedMessage": "You have reported this message to moderators."
+  "reportedMessage": "You have reported this message to moderators.",
+  "canDeleteNow": "You can now delete the message if you wish."
 }
diff --git a/website/server/controllers/api-v4/members.js b/website/server/controllers/api-v4/members.js
index d3082f85d9..333b1686da 100644
--- a/website/server/controllers/api-v4/members.js
+++ b/website/server/controllers/api-v4/members.js
@@ -5,7 +5,7 @@ let api = {};
 
 /**
  * @api {post} /api/v4/members/flag-private-message/:messageId Flag a private message
- * @apiDescription An email is sent to the moderators about every flagged message.
+ * @apiDescription An email and slack message are sent to the moderators about every flagged message.
  * @apiName FlagPrivateMessage
  * @apiGroup Member
  *