mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Support mixed custom / default recent emoji.

Browse Source
This commit is contained in:
John Preston
2022-07-14 14:20:56 +03:00
parent c0ec3a23bb
commit 44a7d11e4a
10 changed files with 401 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
View File

@@ -371,17 +371,7 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
auto i = _instances.find(parsed.id);
if (i == end(_instances)) {
using Loading = Ui::CustomEmoji::Loading;
auto loader = std::make_unique<CustomEmojiLoader>(
_owner,
parsed,
SizeTag::Normal);
if (loader->resolving()) {
_loaders[parsed.id].push_back(base::make_weak(loader.get()));
_pendingForRequest.emplace(parsed.id);
if (!_requestId && _pendingForRequest.size() == 1) {
crl::on_main(this, [=] { request(); });
}
}
auto loader = createLoader(parsed.id, SizeTag::Normal);
const auto repaint = [=](
not_null<Ui::CustomEmoji::Instance*> instance,
Ui::CustomEmoji::RepaintRequest request) {
@@ -406,6 +396,25 @@ std::unique_ptr<Ui::CustomEmoji::Loader> CustomEmojiManager::createLoader(
return std::make_unique<CustomEmojiLoader>(document, tag);
}
std::unique_ptr<Ui::CustomEmoji::Loader> CustomEmojiManager::createLoader(
DocumentId documentId,
SizeTag tag) {
const auto selfId = _owner->session().userId().bare;
auto result = std::make_unique<CustomEmojiLoader>(
_owner,
CustomEmojiId{ .selfId = selfId, .id = documentId },
tag);
if (result->resolving()) {
_loaders[documentId].push_back(base::make_weak(result.get()));
_pendingForRequest.emplace(documentId);
if (!_requestId && _pendingForRequest.size() == 1) {
crl::on_main(this, [=] { request(); });
}
}
return result;
}
void CustomEmojiManager::request() {
auto ids = QVector<MTPlong>();
ids.reserve(std::min(kMaxPerRequest, int(_pendingForRequest.size())));

3
Telegram/SourceFiles/data/stickers/data_custom_emoji.h
View File

@@ -45,6 +45,9 @@ public:
[[nodiscard]] std::unique_ptr<Ui::CustomEmoji::Loader> createLoader(
not_null<DocumentData*> document,
SizeTag tag);
[[nodiscard]] std::unique_ptr<Ui::CustomEmoji::Loader> createLoader(
DocumentId documentId,
SizeTag tag);
[[nodiscard]] Main::Session &session() const;
[[nodiscard]] Session &owner() const;

2
Telegram/SourceFiles/data/stickers/data_stickers_set.h
View File

@@ -99,7 +99,7 @@ public:
uint64 id = 0;
uint64 accessHash = 0;
uint64 hash = 0;
uint64 thumbnailDocumentId = 0;
DocumentId thumbnailDocumentId = 0;
QString title, shortName;
int count = 0;
StickersSetFlags flags;