procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix infinite group set requests on bad API responses.

This commit is contained in:
John Preston 2019-03-26 10:38:54 +04:00
parent 9b247ce5ed
commit 8aaa70a05a
2 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -2015,38 +2015,47 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
if (canEdit && hidden) { if (canEdit && hidden) {
removeHiddenForGroup(); removeHiddenForGroup();
} }
if (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetID) { if (_megagroupSet->mgInfo->stickerSet.type() != mtpc_inputStickerSetID) {
auto &set = _megagroupSet->mgInfo->stickerSet.c_inputStickerSetID();
auto &sets = Auth().data().stickerSets();
auto it = sets.constFind(set.vid.v);
if (it != sets.cend()) {
auto isInstalled = (it->flags & MTPDstickerSet::Flag::f_installed_date)
&& !(it->flags & MTPDstickerSet::Flag::f_archived);
if (isInstalled && !canEdit) {
removeHiddenForGroup();
} else if (isShownHere(hidden)) {
const auto shortName = QString();
const auto thumbnail = ImagePtr();
const auto externalLayout = false;
_mySets.emplace_back(
Stickers::MegagroupSetId,
MTPDstickerSet_ClientFlag::f_special | 0,
lang(lng_group_stickers),
shortName,
thumbnail,
externalLayout,
it->count,
it->stickers);
}
return;
}
}
if (!isShownHere(hidden)) {
return; return;
} }
request(MTPmessages_GetStickerSet(_megagroupSet->mgInfo->stickerSet)).done([this](const MTPmessages_StickerSet &result) { auto &set = _megagroupSet->mgInfo->stickerSet.c_inputStickerSetID();
if (auto set = Stickers::FeedSetFull(result)) { auto &sets = Auth().data().stickerSets();
auto it = sets.constFind(set.vid.v);
if (it != sets.cend()) {
auto isInstalled = (it->flags & MTPDstickerSet::Flag::f_installed_date)
&& !(it->flags & MTPDstickerSet::Flag::f_archived);
if (isInstalled && !canEdit) {
removeHiddenForGroup();
} else if (isShownHere(hidden)) {
const auto shortName = QString();
const auto thumbnail = ImagePtr();
const auto externalLayout = false;
_mySets.emplace_back(
Stickers::MegagroupSetId,
MTPDstickerSet_ClientFlag::f_special | 0,
lang(lng_group_stickers),
shortName,
thumbnail,
externalLayout,
it->count,
it->stickers);
}
return;
} else if (!isShownHere(hidden)
|| _megagroupSetIdRequested == set.vid.v) {
return;
}
_megagroupSetIdRequested = set.vid.v;
request(MTPmessages_GetStickerSet(
_megagroupSet->mgInfo->stickerSet
)).done([=](const MTPmessages_StickerSet &result) {
if (const auto set = Stickers::FeedSetFull(result)) {
refreshStickers(); refreshStickers();
if (set->id == _megagroupSetIdRequested) {
_megagroupSetIdRequested = 0;
} else {
LOG(("API Error: Got different set."));
}
} }
}).send(); }).send();
} }

1
Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
View File

@ -246,6 +246,7 @@ private:
void showPreview(); void showPreview();
ChannelData *_megagroupSet = nullptr; ChannelData *_megagroupSet = nullptr;
uint64 _megagroupSetIdRequested = 0;
std::vector<Set> _mySets; std::vector<Set> _mySets;
std::vector<Set> _featuredSets; std::vector<Set> _featuredSets;
std::vector<Set> _searchSets; std::vector<Set> _searchSets;