File tree 2 files changed +9
-8
lines changed
2 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -135,10 +135,10 @@ export default {
135
135
}
136
136
137
137
function deleteMsg () {
138
- const currentUser = store .state .users .activeUser ;
139
138
const DAY = 1000 * 60 * 60 * 24 ;
140
139
141
140
const canDeleteForAll = (
141
+ store .state .users .activeUser !== state .peer .id &&
142
142
state .peer .id > 2e9 &&
143
143
state .peer .acl .can_moderate &&
144
144
! state .hasCallAttach &&
@@ -153,7 +153,7 @@ export default {
153
153
submit (deleteForAll ) {
154
154
vkapi (' messages.delete' , {
155
155
message_ids: state .msg .id ,
156
- delete_for_all: (currentUser === state . peer . id || deleteForAll) ? 1 : 0
156
+ delete_for_all: deleteForAll ? 1 : 0
157
157
});
158
158
}
159
159
});
Original file line number Diff line number Diff line change @@ -142,12 +142,13 @@ export default {
142
142
}),
143
143
144
144
canDeleteForAll: computed (() => (
145
+ store .state .users .activeUser !== props .peer_id &&
145
146
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
+ ) )
151
152
))
152
153
});
153
154
@@ -208,7 +209,7 @@ export default {
208
209
submit (deleteForAll ) {
209
210
vkapi (' messages.delete' , {
210
211
message_ids: state .selectedMessages .join (' ,' ),
211
- delete_for_all: store . state . users . activeUser === props . peer_id || deleteForAll
212
+ delete_for_all: deleteForAll ? 1 : 0
212
213
});
213
214
214
215
cancelSelect ();
You can’t perform that action at this time.
0 commit comments