mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Show featured custom sets in the panel.

Browse Source
This commit is contained in:
John Preston
2022-07-22 19:00:06 +03:00
parent ff55918da0
commit b0fab8c987
11 changed files with 478 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Telegram/SourceFiles/storage/storage_account.cpp
View File

@@ -2019,9 +2019,8 @@ void Account::writeInstalledStickers() {
return StickerSetCheckResult::Skip;
}
} else if (!(set.flags & SetFlag::Installed)
|| (set.flags & SetFlag::Archived)) {
return StickerSetCheckResult::Skip;
} else if (set.flags & (SetFlag::Masks | SetFlag::Emoji)) {
|| (set.flags & SetFlag::Archived)
|| (set.type() != Data::StickersType::Stickers)) {
return StickerSetCheckResult::Skip;
} else if (set.flags & SetFlag::NotLoaded) {
// waiting to receive
@@ -2042,9 +2041,9 @@ void Account::writeFeaturedStickers() {
|| set.id == Data::Stickers::CloudRecentAttachedSetId) {
// separate files for them
return StickerSetCheckResult::Skip;
} else if (set.flags & (SetFlag::Special | SetFlag::Emoji)) {
return StickerSetCheckResult::Skip;
} else if (!(set.flags & SetFlag::Featured)) {
} else if ((set.flags & SetFlag::Special)
|| !(set.flags & SetFlag::Featured)
|| (set.type() != Data::StickersType::Stickers)) {
return StickerSetCheckResult::Skip;
} else if (set.flags & SetFlag::NotLoaded) { // waiting to receive
return StickerSetCheckResult::Abort;
@@ -2059,9 +2058,8 @@ void Account::writeFeaturedCustomEmoji() {
using SetFlag = Data::StickersSetFlag;
writeStickerSets(_featuredCustomEmojiKey, [](const Data::StickersSet &set) {
if (!(set.flags & SetFlag::Emoji)) {
return StickerSetCheckResult::Skip;
} else if (!(set.flags & SetFlag::Featured)) {
if (!(set.flags & SetFlag::Featured)
|| (set.type() != Data::StickersType::Emoji)) {
return StickerSetCheckResult::Skip;
} else if (set.flags & SetFlag::NotLoaded) { // waiting to receive
return StickerSetCheckResult::Abort;
@@ -2095,10 +2093,8 @@ void Account::writeArchivedStickers() {
using SetFlag = Data::StickersSetFlag;
writeStickerSets(_archivedStickersKey, [](const Data::StickersSet &set) {
if (set.flags & (SetFlag::Masks | SetFlag::Emoji)) {
return StickerSetCheckResult::Skip;
}
if (!(set.flags & SetFlag::Archived)
|| (set.type() != Data::StickersType::Stickers)
|| set.stickers.isEmpty()) {
return StickerSetCheckResult::Skip;
}
@@ -2110,10 +2106,9 @@ void Account::writeArchivedMasks() {
using SetFlag = Data::StickersSetFlag;
writeStickerSets(_archivedStickersKey, [](const Data::StickersSet &set) {
if (!(set.flags & SetFlag::Masks)) {
return StickerSetCheckResult::Skip;
}
if (!(set.flags & SetFlag::Archived) || set.stickers.isEmpty()) {
if (!(set.flags & SetFlag::Archived)
|| (set.type() != Data::StickersType::Masks)
|| set.stickers.isEmpty()) {
return StickerSetCheckResult::Skip;
}
return StickerSetCheckResult::Write;
@@ -2124,7 +2119,10 @@ void Account::writeInstalledMasks() {
using SetFlag = Data::StickersSetFlag;
writeStickerSets(_installedMasksKey, [](const Data::StickersSet &set) {
if (!(set.flags & SetFlag::Masks) || set.stickers.isEmpty()) {
if (!(set.flags & SetFlag::Installed)
|| (set.flags & SetFlag::Archived)
|| (set.type() != Data::StickersType::Masks)
|| set.stickers.isEmpty()) {
return StickerSetCheckResult::Skip;
}
return StickerSetCheckResult::Write;
@@ -2145,14 +2143,14 @@ void Account::writeInstalledCustomEmoji() {
using SetFlag = Data::StickersSetFlag;
writeStickerSets(_installedCustomEmojiKey, [](const Data::StickersSet &set) {
if (!(set.flags & SetFlag::Emoji)) {
if (!(set.flags & SetFlag::Installed)
|| (set.flags & SetFlag::Archived)
|| (set.type() != Data::StickersType::Emoji)) {
return StickerSetCheckResult::Skip;
} else if (set.flags & SetFlag::NotLoaded) {
// waiting to receive
return StickerSetCheckResult::Abort;
} else if (!(set.flags & SetFlag::Installed)
|| (set.flags & SetFlag::Archived)
|| set.stickers.isEmpty()) {
} else if (set.stickers.isEmpty()) {
return StickerSetCheckResult::Skip;
}
return StickerSetCheckResult::Write;