diff options
| author | Maksim Sukharev <antreesy.web@gmail.com> | 2024-01-18 12:39:35 +0100 |
|---|---|---|
| committer | Maksim Sukharev <antreesy.web@gmail.com> | 2024-01-24 18:06:32 +0100 |
| commit | 3dc08abfb0d6db7fc0c2ec884617e87ed1eddc54 (patch) | |
| tree | d675effec8c64231f897c436c194a35bd33666a7 | |
| parent | 007ec090df07b673c3a90e8a35dd2ab89764e1ae (diff) | |
fix(messages): check ownership for messages from remote serverfeat/11273/federation-chatting
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index 5a0a75147..381c609e4 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -519,7 +519,7 @@ export default { isEditable() { if (!this.isModifiable || this.isObjectShare - || (!this.$store.getters.isModerator && !this.isMyMsg)) { + || (!this.$store.getters.isModerator && !this.isOwnMessage)) { return false } @@ -534,7 +534,7 @@ export default { return (moment(this.timestamp * 1000).add(6, 'h')) > moment() && (this.messageType === 'comment' || this.messageType === 'voice-message') && !this.isDeleting - && (this.isMyMsg + && (this.isOwnMessage || (this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE && this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE_FORMER && (this.conversation.participantType === PARTICIPANT.TYPE.OWNER @@ -545,7 +545,7 @@ export default { return this.isReplyable && (this.conversation.type === CONVERSATION.TYPE.PUBLIC || this.conversation.type === CONVERSATION.TYPE.GROUP) - && !this.isMyMsg + && !this.isOwnMessage && this.actorType === ATTENDEE.ACTOR_TYPE.USERS && this.$store.getters.getActorType() === ATTENDEE.ACTOR_TYPE.USERS }, @@ -575,7 +575,11 @@ export default { return this.$store.getters.getActorType() === 'guests' }, - isMyMsg() { + isOwnMessage() { + if (this.conversation?.remoteToken) { + return this.actorId === this.$store.getters.getActorId() + '@' + window.location.host + && this.actorType === ATTENDEE.ACTOR_TYPE.FEDERATED_USERS + } return this.actorId === this.$store.getters.getActorId() && this.actorType === this.$store.getters.getActorType() }, |