fix(messageEdit): only allow user to edit their own message (#281)

Co-authored-by: Matt Wisniewski <[email protected]>
Satellite-im · Nov 18, 2021 · 2bb3473 · 2bb3473
1 parent 73493f6
commit 2bb3473
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/components/tailored/messaging/message/Message.html b/components/tailored/messaging/message/Message.html
@@ -13,8 +13,12 @@
       <UiUsername :username="from" :badge="$mock.users.filter(u => u.name === from)[0].badge" />
       <TypographyText :text="$dayjs(message.at).from()" />
     </div>
-    <TailoredMessagingMessageActions v-if="messageHover && !hideActions"
-      :setReplyChatbarContent="setReplyChatbarContent" :emojiReaction="emojiReaction" :editMessage="editMessage" />
+    <TailoredMessagingMessageActions
+      v-if="messageHover && !hideActions"
+      :setReplyChatbarContent="setReplyChatbarContent"
+      :emojiReaction="emojiReaction"
+      :editMessage="editMessage" 
+      :messageOwner="this.$props.message.from" />
     <VueMarkdown v-if="!messageEdit && message.type === 'text'" :source="message.payload" class="markdown" />
     <UiImage v-else-if="message.type === 'image'" :source="message.payload.url" alt="" />
     <!-- Only for video types we can't embed directly without doing something sketchy, like sending it to a server somewhere to extract the HTML5 video-->

diff --git a/components/tailored/messaging/message/actions/Actions.html b/components/tailored/messaging/message/actions/Actions.html
@@ -26,9 +26,10 @@
   <div
     class="reply-command has-tooltip has-tooltip-primary"
     :data-tooltip="$t('global.edit')"
+    v-if="messageOwner === accounts.details.textilePubkey"
+    @click="editMessage"
   >
-    <edit-icon size="1x" :class="'control-icon'"
-      @click="editMessage" />
+    <edit-icon size="1x" :class="'control-icon'" />
   </div>
   <div
     class="reply-command has-tooltip has-tooltip-primary"

diff --git a/components/tailored/messaging/message/actions/Actions.vue b/components/tailored/messaging/message/actions/Actions.vue
@@ -37,9 +37,13 @@ export default Vue.extend({
       type: Function,
       default: () => () => {},
     },
+     messageOwner: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
-    ...mapState(['ui']),
+    ...mapState(['ui', 'accounts'])
   },
 })
 </script>