From fe262701c0c0198f172fa8ecfc5a6af0d591c5f7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 12 Feb 2018 14:10:40 +0300 Subject: [PATCH] Add notification toggle in feed channels. --- Telegram/SourceFiles/boxes/peer_list_box.cpp | 7 +- Telegram/SourceFiles/boxes/peer_list_box.h | 10 ++- Telegram/SourceFiles/data/data_feed.cpp | 25 +++---- Telegram/SourceFiles/data/data_feed.h | 2 +- .../history/feed/history_feed_section.cpp | 16 ++--- Telegram/SourceFiles/history/history.cpp | 52 ++++++++------ Telegram/SourceFiles/history/history.h | 1 + .../SourceFiles/history/history_widget.cpp | 26 +++---- .../view/history_view_context_menu.cpp | 10 ++- .../feed/info_feed_channels_controllers.cpp | 45 ++++++++++--- .../feed/info_feed_channels_controllers.h | 4 +- .../info_profile_members_controllers.cpp | 6 +- .../profile/profile_channel_controllers.cpp | 4 +- .../profile/profile_channel_controllers.h | 2 +- .../window/notifications_manager.cpp | 44 +++++++++--- .../window/notifications_manager.h | 4 ++ .../SourceFiles/window/window_peer_menu.cpp | 67 ++++++++++--------- .../SourceFiles/window/window_peer_menu.h | 4 ++ 18 files changed, 200 insertions(+), 129 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index eb2240408..d556acdf2 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -250,6 +250,11 @@ void PeerListController::setSearchNoResultsText(const QString &text) { } } +base::unique_qptr PeerListController::rowContextMenu( + not_null row) { + return nullptr; +} + std::unique_ptr PeerListController::saveState() const { return delegate()->peerListSaveState(); } @@ -1008,7 +1013,7 @@ void PeerListContent::contextMenuEvent(QContextMenuEvent *e) { mousePressReleased(_pressButton); } - if (auto row = getRow(_contexted.index)) { + if (const auto row = getRow(_contexted.index)) { _contextMenu = _controller->rowContextMenu(row); if (_contextMenu) { _contextMenu->setDestroyedCallback(base::lambda_guarded( diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h index 19a3ee7c9..f1aeb88d8 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.h +++ b/Telegram/SourceFiles/boxes/peer_list_box.h @@ -344,10 +344,8 @@ public: } virtual void itemDeselectedHook(not_null peer) { } - virtual Ui::PopupMenu *rowContextMenu( - not_null row) { - return nullptr; - } + virtual base::unique_qptr rowContextMenu( + not_null row); bool isSearchLoading() const { return _searchController ? _searchController->isLoading() : false; } @@ -360,7 +358,7 @@ public: return nullptr; } - virtual std::unique_ptr saveState() const ; + virtual std::unique_ptr saveState() const; virtual void restoreState( std::unique_ptr state); @@ -625,7 +623,7 @@ private: std::vector> _searchRows; base::Timer _repaintByStatus; - QPointer _contextMenu; + base::unique_qptr _contextMenu; }; diff --git a/Telegram/SourceFiles/data/data_feed.cpp b/Telegram/SourceFiles/data/data_feed.cpp index 9b3a3fef6..061b13e45 100644 --- a/Telegram/SourceFiles/data/data_feed.cpp +++ b/Telegram/SourceFiles/data/data_feed.cpp @@ -379,26 +379,19 @@ void Feed::setUnreadPosition(const MessagePosition &position) { } void Feed::unreadCountChanged( - base::optional unreadCountDelta, + int unreadCountDelta, int mutedCountDelta) { - if (!unreadCountKnown() || (unreadCountDelta && !*unreadCountDelta)) { + if (!unreadCountKnown()) { return; } - if (unreadCountDelta) { - *_unreadCount = std::max(*_unreadCount + *unreadCountDelta, 0); - _unreadMutedCount = snap( - _unreadMutedCount + mutedCountDelta, - 0, - *_unreadCount); + *_unreadCount = std::max(*_unreadCount + unreadCountDelta, 0); + _unreadMutedCount = snap( + _unreadMutedCount + mutedCountDelta, + 0, + *_unreadCount); - _unreadCountChanges.fire(unreadCount()); - updateChatListEntry(); - } else { -// _parent->session().api().requestFeedDialogsEntries(this); - // Happens once for each channel with unknown unread count. - // Requesting all feed dialogs could be huge and even have slicing. - _parent->session().api().requestDialogEntry(this); - } + _unreadCountChanges.fire(unreadCount()); + updateChatListEntry(); } MessagePosition Feed::unreadPosition() const { diff --git a/Telegram/SourceFiles/data/data_feed.h b/Telegram/SourceFiles/data/data_feed.h index 0add86770..9b7ce8458 100644 --- a/Telegram/SourceFiles/data/data_feed.h +++ b/Telegram/SourceFiles/data/data_feed.h @@ -48,7 +48,7 @@ public: void setUnreadCounts(int unreadNonMutedCount, int unreadMutedCount); void setUnreadPosition(const MessagePosition &position); void unreadCountChanged( - base::optional unreadCountDelta, + int unreadCountDelta, int mutedCountDelta); rpl::producer unreadCountValue() const; MessagePosition unreadPosition() const; diff --git a/Telegram/SourceFiles/history/feed/history_feed_section.cpp b/Telegram/SourceFiles/history/feed/history_feed_section.cpp index 4f3c36b63..5a718ee36 100644 --- a/Telegram/SourceFiles/history/feed/history_feed_section.cpp +++ b/Telegram/SourceFiles/history/feed/history_feed_section.cpp @@ -69,10 +69,11 @@ Widget::Widget( , _scroll(this, st::historyScroll, false) , _topBar(this, controller) , _topBarShadow(this) -, _showNext( - this, - lang(lng_feed_show_next).toUpper(), - st::historyComposeButton) +, _showNext(nullptr) +//, _showNext( +// this, +// lang(lng_feed_show_next).toUpper(), +// st::historyComposeButton) , _scrollDown(_scroll, st::historyToDown) { _topBar->setActiveChat(_feed); @@ -107,10 +108,9 @@ Widget::Widget( this, [this] { onScroll(); }); - _showNext->setClickedCallback([this] { - // #TODO feeds show next - }); - _showNext->hide(); + //_showNext->setClickedCallback([this] { + // // TODO feeds show next + //}); _feed->unreadPositionChanges( ) | rpl::filter([=](const Data::MessagePosition &position) { diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index c55ea9977..19e894774 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -293,7 +293,7 @@ void History::itemVanished(not_null item) { if ((!item->out() || item->isPost()) && item->unread() && unreadCount() > 0) { - setUnreadCount(unreadCount() - 1); + changeUnreadCount(-1); } if (const auto channel = peer->asChannel()) { if (channel->pinnedMessageId() == item->id) { @@ -1534,7 +1534,7 @@ void History::calculateFirstUnreadMessage() { MsgId History::readInbox() { const auto upTo = msgIdForRead(); - setUnreadCount(0); + changeUnreadCount(-unreadCount()); if (upTo) { inboxRead(upTo); } @@ -1542,11 +1542,11 @@ MsgId History::readInbox() { } void History::inboxRead(MsgId upTo) { - if (unreadCount()) { + if (const auto nowUnreadCount = unreadCount()) { if (loadedAtBottom()) { App::main()->historyToDown(this); } - setUnreadCount(countUnread(upTo)); + changeUnreadCount(countUnread(upTo) - nowUnreadCount); } setInboxReadTill(upTo); updateChatListEntry(); @@ -1638,15 +1638,6 @@ void History::setUnreadCount(int newUnreadCount) { } } - const auto feed = peer->isChannel() - ? peer->asChannel()->feed() - : nullptr; - if (feed) { - const auto mutedCountDelta = (mute() && unreadCountDelta) - ? *unreadCountDelta - : 0; - feed->unreadCountChanged(unreadCountDelta, mutedCountDelta); - } if (inChatList(Dialogs::Mode::All)) { App::histories().unreadIncrement( unreadCountDelta ? *unreadCountDelta : newUnreadCount, @@ -1661,6 +1652,18 @@ void History::setUnreadCount(int newUnreadCount) { } } +void History::changeUnreadCount(int delta) { + if (_unreadCount) { + setUnreadCount(std::max(*_unreadCount + delta, 0)); + } + if (const auto channel = peer->asChannel()) { + if (const auto feed = channel->feed()) { + const auto mutedCountDelta = mute() ? delta : 0; + feed->unreadCountChanged(delta, mutedCountDelta); + } + } +} + bool History::mute() const { return _mute; } @@ -1674,10 +1677,17 @@ bool History::changeMute(bool newMute) { const auto feed = peer->isChannel() ? peer->asChannel()->feed() : nullptr; - if (feed && _unreadCount && *_unreadCount) { - const auto unreadCountDelta = 0; - const auto mutedCountDelta = _mute ? *_unreadCount : -*_unreadCount; - feed->unreadCountChanged(unreadCountDelta, mutedCountDelta); + if (feed) { + if (_unreadCount) { + if (*_unreadCount) { + const auto unreadCountDelta = 0; + const auto mutedCountDelta = _mute ? *_unreadCount : -*_unreadCount; + feed->unreadCountChanged(unreadCountDelta, mutedCountDelta); + } + } else { + Auth().api().requestDialogEntry(this); + Auth().api().requestDialogEntry(feed); + } } if (inChatList(Dialogs::Mode::All)) { if (_unreadCount && *_unreadCount) { @@ -2120,10 +2130,8 @@ bool History::shouldBeInChatList() const { } void History::unknownMessageDeleted(MsgId messageId) { - if (_unreadCount && *_unreadCount > 0 && _inboxReadBefore) { - if (messageId >= *_inboxReadBefore) { - setUnreadCount(*_unreadCount - 1); - } + if (_inboxReadBefore && messageId >= *_inboxReadBefore) { + changeUnreadCount(-1); } } @@ -2503,7 +2511,7 @@ void History::clearBlocks(bool leaveItems) { if (leaveItems) { lastKeyboardInited = false; } else { - setUnreadCount(0); + changeUnreadCount(-unreadCount()); if (auto channel = peer->asChannel()) { channel->clearPinnedMessage(); if (const auto feed = channel->feed()) { diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index 628cc69b8..64ce42908 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -224,6 +224,7 @@ public: int unreadCount() const; bool unreadCountKnown() const; void setUnreadCount(int newUnreadCount); + void changeUnreadCount(int delta); bool mute() const; bool changeMute(bool newMute); void addUnreadBar(); diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index d6a3ceaa1..3682a1e94 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -2240,7 +2240,7 @@ void HistoryWidget::newUnreadMsg(History *history, HistoryItem *item) { } } Auth().notifications().schedule(history, item); - history->setUnreadCount(history->unreadCount() + 1); + history->changeUnreadCount(1); } void HistoryWidget::historyToDown(History *history) { @@ -2406,14 +2406,9 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages } addMessagesToFront(peer, *histList); _firstLoadRequest = 0; - if (_history->loadedAtTop()) { - if (_history->unreadCount() > count) { - _history->setUnreadCount(count); - } - if (_history->isEmpty() && count > 0) { - firstLoadMessages(); - return; - } + if (_history->loadedAtTop() && _history->isEmpty() && count > 0) { + firstLoadMessages(); + return; } historyLoaded(); @@ -2434,14 +2429,11 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages _firstLoadRequest = -1; // hack - don't updateListSize yet addMessagesToFront(peer, *histList); _firstLoadRequest = 0; - if (_history->loadedAtTop()) { - if (_history->unreadCount() > count) { - _history->setUnreadCount(count); - } - if (_history->isEmpty() && count > 0) { - firstLoadMessages(); - return; - } + if (_history->loadedAtTop() + && _history->isEmpty() + && count > 0) { + firstLoadMessages(); + return; } } if (_replyReturn) { diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index 5acd2e42a..b503d2bb8 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -467,7 +467,15 @@ base::unique_qptr FillContextMenu( } else if (linkDocument) { AddDocumentActions(result, document, itemId); } else if (linkPeer) { - if (list->delegate()->listContext() == Context::Feed) { + const auto peer = linkPeer->peer(); + if (peer->isChannel() + && peer->asChannel()->feed() != nullptr + && (list->delegate()->listContext() == Context::Feed)) { + Window::PeerMenuAddMuteAction(peer, [&]( + const QString &text, + base::lambda handler) { + return result->addAction(text, handler); + }); AddToggleGroupingAction(result, linkPeer->peer()); } } else if (!request.overSelection && view && !hasSelection) { diff --git a/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.cpp b/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.cpp index 823b30086..4e1843201 100644 --- a/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.cpp +++ b/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.cpp @@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "history/history.h" #include "window/window_peer_menu.h" +#include "ui/widgets/popup_menu.h" #include "auth_session.h" #include "styles/style_widgets.h" #include "styles/style_info.h" @@ -23,7 +24,7 @@ namespace FeedProfile { class ChannelsController::Row final : public PeerListRow { public: - Row(not_null channel); + Row(not_null history); QSize actionSize() const override; QMargins actionMargins() const override; @@ -36,14 +37,18 @@ public: bool selected, bool actionSelected) override; - not_null channel() const { - return peer()->asChannel(); + not_null history() const { + return _history; } +private: + not_null _history; + }; -ChannelsController::Row::Row(not_null channel) -: PeerListRow(channel) { +ChannelsController::Row::Row(not_null history) +: PeerListRow(history->peer) +, _history(history) { } QSize ChannelsController::Row::actionSize() const { @@ -85,16 +90,16 @@ ChannelsController::ChannelsController(not_null controller) _controller->setSearchEnabledByContent(false); } -auto ChannelsController::createRow(not_null channel) +auto ChannelsController::createRow(not_null history) -> std::unique_ptr { - auto result = std::make_unique(channel); + auto result = std::make_unique(history); result->setCustomStatus(QString()); return result; } std::unique_ptr ChannelsController::createRestoredRow( not_null peer) { - return createRow(peer->asChannel()); + return createRow(App::history(peer)); } void ChannelsController::prepare() { @@ -133,7 +138,7 @@ void ChannelsController::rebuildRows() { } } for (const auto history : channels) { - if (auto row = createRow(history->peer->asChannel())) { + if (auto row = createRow(history)) { delegate()->peerListAppendRow(std::move(row)); } } @@ -169,5 +174,27 @@ void ChannelsController::rowActionClicked(not_null row) { Window::DeleteAndLeaveHandler(row->peer())(); } +base::unique_qptr ChannelsController::rowContextMenu( + not_null row) { + auto my = static_cast(row.get()); + auto channel = my->history()->peer->asChannel(); + + auto result = base::make_unique_q(nullptr); + Window::PeerMenuAddMuteAction(channel, [&]( + const QString &text, + base::lambda handler) { + return result->addAction(text, handler); + }); + result->addAction( + lang(lng_feed_ungroup), + [=] { Window::ToggleChannelGrouping(channel, false); }); + + result->addAction( + lang(lng_profile_leave_channel), + Window::DeleteAndLeaveHandler(channel)); + + return result; +} + } // namespace FeedProfile } // namespace Info diff --git a/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.h b/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.h index 2889e51c1..1c06ef621 100644 --- a/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.h +++ b/Telegram/SourceFiles/info/feed/info_feed_channels_controllers.h @@ -31,6 +31,8 @@ public: std::unique_ptr createRestoredRow( not_null peer) override; + base::unique_qptr rowContextMenu( + not_null row) override; std::unique_ptr saveState() const override; void restoreState(std::unique_ptr state) override; @@ -42,7 +44,7 @@ private: }; void rebuildRows(); - std::unique_ptr createRow(not_null channel); + std::unique_ptr createRow(not_null history); const not_null _controller; not_null _feed; diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index 637ae269b..775fd4c27 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -39,7 +39,7 @@ public: void prepare() override; void rowClicked(not_null row) override; void rowActionClicked(not_null row) override; - Ui::PopupMenu *rowContextMenu( + base::unique_qptr rowContextMenu( not_null row) override; rpl::producer onlineCountValue() const override { @@ -265,13 +265,13 @@ void ChatMembersController::rowActionClicked( removeMember(row->peer()->asUser()); } -Ui::PopupMenu *ChatMembersController::rowContextMenu( +base::unique_qptr ChatMembersController::rowContextMenu( not_null row) { auto my = static_cast(row.get()); auto user = my->user(); auto canRemoveMember = my->canRemove(); - auto result = new Ui::PopupMenu(nullptr); + auto result = base::make_unique_q(nullptr); result->addAction( lang(lng_context_view_profile), [weak = base::make_weak(this), user] { diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index e432e3cd9..4d30bf059 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -653,12 +653,12 @@ bool ParticipantsBoxController::canRestrictUser( return _channel->adminRights() & ChannelAdminRight::f_ban_users; } -Ui::PopupMenu *ParticipantsBoxController::rowContextMenu( +base::unique_qptr ParticipantsBoxController::rowContextMenu( not_null row) { Expects(row->peer()->isUser()); auto user = row->peer()->asUser(); - auto result = new Ui::PopupMenu(nullptr); + auto result = base::make_unique_q(nullptr); result->addAction( lang(lng_context_view_profile), [weak = base::make_weak(this), user] { diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h index 44a65b6fc..dc729e56b 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.h +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h @@ -61,7 +61,7 @@ public: void prepare() override; void rowClicked(not_null row) override; void rowActionClicked(not_null row) override; - Ui::PopupMenu *rowContextMenu( + base::unique_qptr rowContextMenu( not_null row) override; void loadMoreRows() override; diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index 26530ae38..63809471f 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -13,7 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/media_audio.h" #include "history/history.h" #include "history/history_item_components.h" +#include "history/feed/history_feed_section.h" #include "lang/lang_keys.h" +#include "window/window_controller.h" #include "mainwindow.h" #include "mainwidget.h" #include "apiwrap.h" @@ -397,20 +399,44 @@ void Manager::notificationActivated(PeerId peerId, MsgId msgId) { window->setInnerFocus(); system()->clearAll(); } else { - auto tomsg = !history->peer->isUser() && (msgId > 0); - if (tomsg) { - auto item = App::histItemById(peerToChannel(peerId), msgId); - if (!item || !item->mentionsMe()) { - tomsg = false; - } - } - Ui::showPeerHistory(history, tomsg ? msgId : ShowAtUnreadMsgId); - system()->clearFromHistory(history); + openNotificationMessage(history, msgId); } } onAfterNotificationActivated(peerId, msgId); } +void Manager::openNotificationMessage( + not_null history, + MsgId messageId) { + const auto openExactlyMessage = [&] { + if (history->peer->isUser() + || history->peer->isChannel() + || !IsServerMsgId(messageId)) { + return false; + } + const auto item = App::histItemById(history->channelId(), messageId); + if (!item || !item->mentionsMe()) { + return false; + } + return true; + }(); + const auto messageFeed = [&] { + if (const auto channel = history->peer->asChannel()) { + return channel->feed(); + } + return (Data::Feed*)nullptr; + }(); + if (openExactlyMessage) { + Ui::showPeerHistory(history, messageId); + } else if (messageFeed) { + App::wnd()->controller()->showSection( + HistoryFeed::Memento(messageFeed)); + } else { + Ui::showPeerHistory(history, ShowAtUnreadMsgId); + } + system()->clearFromHistory(history); +} + void Manager::notificationReplied( PeerId peerId, MsgId msgId, diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h index 61e49d172..9d90ec632 100644 --- a/Telegram/SourceFiles/window/notifications_manager.h +++ b/Telegram/SourceFiles/window/notifications_manager.h @@ -160,6 +160,10 @@ protected: } private: + void openNotificationMessage( + not_null history, + MsgId messageId); + System *_system = nullptr; }; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index c60adce19..ec45cec4c 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -45,7 +45,6 @@ private: bool showInfo(); void addPinToggle(); void addInfo(); - void addNotifications(); void addSearch(); void addUserActions(not_null user); void addBlockUser(not_null user); @@ -210,36 +209,6 @@ void Filler::addInfo() { }); } -void Filler::addNotifications() { - auto peer = _peer; - auto muteText = [](bool isMuted) { - return lang(isMuted - ? lng_enable_notifications_from_tray - : lng_disable_notifications_from_tray); - }; - auto muteAction = _addAction(muteText(peer->isMuted()), [peer] { - if (!peer->isMuted()) { - Ui::show(Box(peer)); - } else { - App::main()->updateNotifySettings( - peer, - Data::NotifySettings::MuteChange::Unmute); - } - }); - - auto lifetime = Notify::PeerUpdateViewer( - _peer, - Notify::PeerUpdate::Flag::NotificationsEnabled - ) | rpl::map([=] { - return peer->isMuted(); - }) | rpl::distinct_until_changed( - ) | rpl::start_with_next([=](bool muted) { - muteAction->setText(muteText(muted)); - }); - - Ui::AttachAsChild(muteAction, std::move(lifetime)); -} - void Filler::addSearch() { _addAction(lang(lng_profile_search_messages), [peer = _peer] { App::main()->searchInChat(App::history(peer)); @@ -410,7 +379,7 @@ void Filler::fill() { addInfo(); } if (_source != PeerMenuSource::Profile && !_peer->isSelf()) { - addNotifications(); + PeerMenuAddMuteAction(_peer, _addAction); } if (_source == PeerMenuSource::ChatsList) { addSearch(); @@ -592,6 +561,40 @@ void PeerMenuAddChannelMembers(not_null channel) { Auth().api().requestChannelMembersForAdd(channel, callback); } +void PeerMenuAddMuteAction( + not_null peer, + const PeerMenuCallback &addAction) { + if (peer->notifySettingsUnknown()) { + Auth().api().requestNotifySetting(peer); + } + auto muteText = [](bool isMuted) { + return lang(isMuted + ? lng_enable_notifications_from_tray + : lng_disable_notifications_from_tray); + }; + auto muteAction = addAction(muteText(peer->isMuted()), [=] { + if (!peer->isMuted()) { + Ui::show(Box(peer)); + } else { + App::main()->updateNotifySettings( + peer, + Data::NotifySettings::MuteChange::Unmute); + } + }); + + auto lifetime = Notify::PeerUpdateViewer( + peer, + Notify::PeerUpdate::Flag::NotificationsEnabled + ) | rpl::map([=] { + return peer->isMuted(); + }) | rpl::distinct_until_changed( + ) | rpl::start_with_next([=](bool muted) { + muteAction->setText(muteText(muted)); + }); + + Ui::AttachAsChild(muteAction, std::move(lifetime)); +} + void ToggleChannelGrouping(not_null channel, bool group) { const auto callback = [=] { Ui::Toast::Show(lang(group diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h index 589211822..f3d85ae2a 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.h +++ b/Telegram/SourceFiles/window/window_peer_menu.h @@ -40,6 +40,10 @@ void FillFeedMenu( const PeerMenuCallback &addAction, PeerMenuSource source); +void PeerMenuAddMuteAction( + not_null peer, + const PeerMenuCallback &addAction); + void PeerMenuDeleteContact(not_null user); void PeerMenuShareContactBox(not_null user); void PeerMenuAddContact(not_null user);