From 85b94bc6fdde500b3ac557ac05bbc430c037e728 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 10 Nov 2022 13:09:08 +0300 Subject: [PATCH] Changed behavior to always delete messages for bots. Fixed #17033. --- Telegram/SourceFiles/boxes/delete_messages_box.cpp | 5 ++++- Telegram/SourceFiles/boxes/delete_messages_box.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp index 7639782f0..33f1a0e4e 100644 --- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp +++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp @@ -249,6 +249,9 @@ void DeleteMessagesBox::prepare() { tr::lng_delete_for_me_chat_hint(tr::now, lt_count, count) }); } else if (!peer->isSelf()) { + if (const auto user = peer->asUser(); user && user->isBot()) { + _revokeForBot = true; + } appendDetails({ tr::lng_delete_for_me_hint(tr::now, lt_count, count) }); @@ -466,7 +469,7 @@ void DeleteMessagesBox::keyPressEvent(QKeyEvent *e) { } void DeleteMessagesBox::deleteAndClear() { - const auto revoke = _revoke ? _revoke->checked() : false; + const auto revoke = _revoke ? _revoke->checked() : _revokeForBot; const auto session = _session; const auto invokeCallbackAndClose = [&] { // deleteMessages can initiate closing of the current section, diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.h b/Telegram/SourceFiles/boxes/delete_messages_box.h index 48a80da9d..ccb0b20c2 100644 --- a/Telegram/SourceFiles/boxes/delete_messages_box.h +++ b/Telegram/SourceFiles/boxes/delete_messages_box.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "boxes/abstract_box.h" +#include "ui/layers/box_content.h" namespace Main { class Session; @@ -69,6 +69,8 @@ private: bool _moderateBan = false; bool _moderateDeleteAll = false; + bool _revokeForBot = false; + object_ptr _text = { nullptr }; object_ptr _revoke = { nullptr }; object_ptr _banUser = { nullptr };