From 75a40b83ae3801020e945b4b4ea59e9868ae0167 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 7 Jun 2018 22:28:09 +0300 Subject: [PATCH] Notify settings unknown => draw chats as muted. Also request common notify settings at the app launch. --- Telegram/SourceFiles/data/data_session.cpp | 2 +- Telegram/SourceFiles/history/history.cpp | 3 --- Telegram/SourceFiles/mainwidget.cpp | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index aecd05752..55c47efaf 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -1741,7 +1741,7 @@ bool Session::notifyIsMuted( if (const auto until = settings.muteUntil()) { return resultFromUntil(*until); } - return false; + return true; } bool Session::notifySilentPosts(not_null peer) const { diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 220c0e7d5..6f029193a 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -2198,9 +2198,6 @@ void History::applyDialog(const MTPDdialog &data) { MTP_notifyPeer(data.vpeer), data.vnotify_settings); - // Request default notification settings for this type of chat. - Auth().data().requestNotifySettings(peer); - if (data.has_draft() && data.vdraft.type() == mtpc_draftMessage) { Data::applyPeerCloudDraft(peer->id, data.vdraft.c_draftMessage()); } diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 74d5144c2..c4ddba659 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -3700,6 +3700,9 @@ void MainWidget::mtpPing() { } void MainWidget::start(const MTPUser *self) { + Auth().api().requestNotifySettings(MTP_inputNotifyUsers()); + Auth().api().requestNotifySettings(MTP_inputNotifyChats()); + if (!self) { MTP::send(MTPusers_GetFullUser(MTP_inputUserSelf()), rpcDone(&MainWidget::startWithSelf)); return; @@ -3713,7 +3716,7 @@ void MainWidget::start(const MTPUser *self) { Local::readSavedPeers(); cSetOtherOnline(0); - if (auto user = App::feedUsers(MTP_vector(1, *self))) { + if (const auto user = App::feedUsers(MTP_vector(1, *self))) { user->loadUserpic(); }