Skip to content

Commit 8334edd

Browse files
committedJun 4, 2020
fix: не работало удаление сообщений в лс
1 parent 71ae60e commit 8334edd

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed
 

Diff for: ‎src/components/ContextMenus/MessageContextMenu.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ export default {
135135
}
136136
137137
function deleteMsg() {
138-
const currentUser = store.state.users.activeUser;
139138
const DAY = 1000 * 60 * 60 * 24;
140139
141140
const canDeleteForAll = (
141+
store.state.users.activeUser !== state.peer.id &&
142142
state.peer.id > 2e9 &&
143143
state.peer.acl.can_moderate &&
144144
!state.hasCallAttach &&
@@ -153,7 +153,7 @@ export default {
153153
submit(deleteForAll) {
154154
vkapi('messages.delete', {
155155
message_ids: state.msg.id,
156-
delete_for_all: (currentUser === state.peer.id || deleteForAll) ? 1 : 0
156+
delete_for_all: deleteForAll ? 1 : 0
157157
});
158158
}
159159
});

Diff for: ‎src/components/messages/chat/Header.vue

+7-6
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,13 @@ export default {
142142
}),
143143
144144
canDeleteForAll: computed(() => (
145+
store.state.users.activeUser !== props.peer_id &&
145146
props.peer_id > 2e9 &&
146-
!!props.peer.acl.can_moderate &&
147-
state.selectedMessages.every((id) => {
148-
const msg = getMessage(id);
149-
return !props.peer.admin_ids.includes(msg.from) && (Date.now() - msg.date * 1000 < DAY);
150-
})
147+
props.peer.acl.can_moderate &&
148+
state.selectedMessages.map(getMessage).every((msg) => (
149+
!props.peer.admin_ids.includes(msg.from) &&
150+
Date.now() - msg.date * 1000 < DAY
151+
))
151152
))
152153
});
153154
@@ -208,7 +209,7 @@ export default {
208209
submit(deleteForAll) {
209210
vkapi('messages.delete', {
210211
message_ids: state.selectedMessages.join(','),
211-
delete_for_all: store.state.users.activeUser === props.peer_id || deleteForAll
212+
delete_for_all: deleteForAll ? 1 : 0
212213
});
213214
214215
cancelSelect();

0 commit comments

Comments
 (0)
Please sign in to comment.