Fix editing messages in groups

Fix grouping messages sent by anonymous admins
This commit is contained in:
Eduard Kuzmenko 2023-01-17 11:21:32 +04:00
parent 719b7bfd00
commit fa2dd7875c
2 changed files with 8 additions and 5 deletions

View File

@ -403,6 +403,7 @@ export default class BubbleGroups {
item1.dateTimestamp === item2.dateTimestamp &&
!item1.single &&
!item2.single &&
item1.message.pFlags.out === item2.message.pFlags.out &&
(!this.chat.isAllMessagesForum || getMessageThreadId(item1.message, true) === getMessageThreadId(item2.message, true));
}

View File

@ -3375,14 +3375,16 @@ export class AppMessagesManager extends AppManager {
return true;
}
const isAnyChat = message.peerId.isAnyChat();
const canEditMessageInPeer = isAnyChat ? this.appChatsManager.hasRights(message.peerId.toChatId(), 'edit_messages') : message.pFlags.out;
const canEditMessageInPeer = this.appPeersManager.isBroadcast(message.peerId) ?
this.appChatsManager.hasRights(message.peerId.toChatId(), 'edit_messages') :
message.pFlags.out;
if(!canEditMessageInPeer || (
message.peer_id._ !== 'peerChannel' &&
if(
!canEditMessageInPeer || (
message.peer_id._ !== 'peerChannel' &&
message.date < (tsNow(true) - (await this.apiManager.getConfig()).edit_time_limit) &&
(message as Message.message).media?._ !== 'messageMediaPoll'
)
)
) {
return false;
}