Merge tag 'v5.10.7' into dev

This commit is contained in:
AlexeyZavar
2025-01-29 01:48:14 +03:00
251 changed files with 6508 additions and 2322 deletions
@@ -137,7 +137,8 @@ DocumentData *Document::readFromStreamHelper(
|| info->setId == Data::Stickers::CloudRecentSetId
|| info->setId == Data::Stickers::CloudRecentAttachedSetId
|| info->setId == Data::Stickers::FavedSetId
|| info->setId == Data::Stickers::CustomSetId) {
|| info->setId == Data::Stickers::CustomSetId
|| info->setId == Data::Stickers::CollectibleSetId) {
typeOfSet = StickerSetTypeEmpty;
}
@@ -162,6 +162,10 @@ QString Account::tempDirectory() const {
return _tempPath;
}
QString Account::supportModePath() const {
return _databasePath + u"support"_q;
}
StartResult Account::legacyStart(const QByteArray &passcode) {
const auto result = readMapWith(MTP::AuthKeyPtr(), passcode);
if (result == ReadMapResult::Failed) {
@@ -2193,7 +2197,8 @@ void Account::writeInstalledStickers() {
writeStickerSets(_installedStickersKey, [](const Data::StickersSet &set) {
if (set.id == Data::Stickers::CloudRecentSetId
|| set.id == Data::Stickers::FavedSetId
|| set.id == Data::Stickers::CloudRecentAttachedSetId) {
|| set.id == Data::Stickers::CloudRecentAttachedSetId
|| set.id == Data::Stickers::CollectibleSetId) {
// separate files for them
return StickerSetCheckResult::Skip;
} else if (set.flags & SetFlag::Special) {
@@ -2220,7 +2225,8 @@ void Account::writeFeaturedStickers() {
writeStickerSets(_featuredStickersKey, [](const Data::StickersSet &set) {
if (set.id == Data::Stickers::CloudRecentSetId
|| set.id == Data::Stickers::FavedSetId
|| set.id == Data::Stickers::CloudRecentAttachedSetId) {
|| set.id == Data::Stickers::CloudRecentAttachedSetId
|| set.id == Data::Stickers::CollectibleSetId) {
// separate files for them
return StickerSetCheckResult::Skip;
} else if ((set.flags & SetFlag::Special)
@@ -76,6 +76,7 @@ public:
}
[[nodiscard]] QString tempDirectory() const;
[[nodiscard]] QString supportModePath() const;
[[nodiscard]] MTP::AuthKeyPtr peekLegacyLocalKey() const {
return _localKey;