void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pinned chats in main list.

Browse source
This commit is contained in:
John Preston 2022-05-18 15:35:12 +04:00
parent ca731968ca
commit 0870a28443
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Telegram/SourceFiles/data/data_session.cpp
View file

@ -3771,6 +3771,9 @@ void Session::refreshChatListEntry(Dialogs::Key key) {
} }
for (const auto &filter : _chatsFilters->list()) { for (const auto &filter : _chatsFilters->list()) {
const auto id = filter.id(); const auto id = filter.id();
if (!id) {
continue;
}
const auto filterList = chatsFilters().chatsList(id); const auto filterList = chatsFilters().chatsList(id);
auto event = ChatListEntryRefresh{ .key = key, .filterId = id }; auto event = ChatListEntryRefresh{ .key = key, .filterId = id };
if (filter.contains(history)) { if (filter.contains(history)) {
@ -3808,7 +3811,7 @@ void Session::removeChatListEntry(Dialogs::Key key) {
Assert(entry->folderKnown()); Assert(entry->folderKnown());
for (const auto &filter : _chatsFilters->list()) { for (const auto &filter : _chatsFilters->list()) {
const auto id = filter.id(); const auto id = filter.id();
if (entry->inChatList(id)) { if (id && entry->inChatList(id)) {
entry->removeFromChatList(id, chatsFilters().chatsList(id)); entry->removeFromChatList(id, chatsFilters().chatsList(id));
_chatListEntryRefreshes.fire(ChatListEntryRefresh{ _chatListEntryRefreshes.fire(ChatListEntryRefresh{
.key = key, .key = key,

18
Telegram/SourceFiles/settings/settings_folders.cpp
View file

@ -132,7 +132,7 @@ struct FilterRow {
const auto &list = session->data().chatsFilters().list(); const auto &list = session->data().chatsFilters().list();
const auto id = filter.id(); const auto id = filter.id();
const auto i = ranges::find(list, id, &Data::ChatFilter::id); const auto i = ranges::find(list, id, &Data::ChatFilter::id);
if (i != end(list) if ((id && i != end(list))
&& (!check && (!check
|| (i->flags() == filter.flags() || (i->flags() == filter.flags()
&& i->always() == filter.always() && i->always() == filter.always()
@ -515,7 +515,8 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
const auto id = row.filter.id(); const auto id = row.filter.id();
if (row.removed) { if (row.removed) {
continue; continue;
} else if (!ranges::contains(list, id, &Data::ChatFilter::id)) { } else if (!id
|| !ranges::contains(list, id, &Data::ChatFilter::id)) {
result.emplace(row.button, chooseNextId()); result.emplace(row.button, chooseNextId());
} }
} }
@ -564,6 +565,19 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
MTP_int(newId), MTP_int(newId),
tl)); tl));
} }
if (!ranges::contains(order, FilterId(0))) {
auto position = 0;
for (const auto &filter : list) {
const auto id = filter.id();
if (!id) {
break;
} else if (const auto i = ranges::find(order, id)
; i != order.end()) {
position = int(i - order.begin()) + 1;
}
}
order.insert(order.begin() + position, FilterId(0));
}
auto previousId = mtpRequestId(0); auto previousId = mtpRequestId(0);
auto &&requests = ranges::views::concat(removeRequests, addRequests); auto &&requests = ranges::views::concat(removeRequests, addRequests);
for (auto &request : requests) { for (auto &request : requests) {