From aac21e1f7101cb1c585c66c1753e8ba10ebe3a26 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 15 Apr 2022 13:59:44 +0300 Subject: [PATCH] Removed ttl menu for deleted accounts. --- Telegram/SourceFiles/menu/menu_ttl_validator.cpp | 4 +++- Telegram/SourceFiles/window/window_peer_menu.cpp | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp index 2834b0c70..1947a8313 100644 --- a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp +++ b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_peer.h" +#include "data/data_user.h" #include "lang/lang_keys.h" #include "main/main_session.h" #include "menu/menu_ttl.h" @@ -104,7 +105,8 @@ Args TTLValidator::createArgs() const { bool TTLValidator::can() const { return (_peer->isUser() && !_peer->isSelf() - && !_peer->isNotificationsUser()) + && !_peer->isNotificationsUser() + && !_peer->asUser()->isInaccessible()) || (_peer->isChat() && _peer->asChat()->canDeleteMessages()) || (_peer->isChannel() diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 3381c0328..7aa4f66c6 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -637,7 +637,11 @@ void Filler::addReport() { void Filler::addNewContact() { const auto user = _peer->asUser(); - if (!user || user->isContact() || user->isSelf() || user->isBot()) { + if (!user + || user->isContact() + || user->isSelf() + || user->isInaccessible() + || user->isBot()) { return; } const auto controller = _controller;