thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move sticker parsing and enable room stickers

Browse source
This commit is contained in:
Nicolas Werner 2021-07-19 03:02:30 +02:00
parent 8a1666bc88
commit 9d5ba4f681
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 78 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/ImagePackModel.cpp
View file

@ -11,35 +11,12 @@ ImagePackModel::ImagePackModel(const std::string &roomId, bool stickers, QObject
: QAbstractListModel(parent)
, room_id(roomId)
{
auto accountpackV =
cache::client()->getAccountData(mtx::events::EventType::ImagePackInAccountData);
auto enabledRoomPacksV =
cache::client()->getAccountData(mtx::events::EventType::ImagePackRooms);
auto packs = cache::client()->getImagePacks(room_id, stickers);
std::optional<mtx::events::msc2545::ImagePack> accountPack;
if (accountpackV) {
auto tmp =
std::get_if<mtx::events::EphemeralEvent<mtx::events::msc2545::ImagePack>>(
&*accountpackV);
if (tmp)
accountPack = tmp->content;
}
// mtx::events::msc2545::ImagePackRooms *enabledRoomPacks = nullptr;
// if (enabledRoomPacksV)
// enabledRoomPacks =
// std::get_if<mtx::events::msc2545::ImagePackRooms>(&*enabledRoomPacksV);
if (accountPack && (!accountPack->pack || (stickers ? accountPack->pack->is_sticker()
: accountPack->pack->is_emoji()))) {
QString packname;
if (accountPack->pack)
packname = QString::fromStdString(accountPack->pack->display_name);
for (const auto &img : accountPack->images) {
if (img.second.overrides_usage() &&
(stickers ? !img.second.is_sticker() : !img.second.is_emoji()))
continue;
for (const auto &pack : packs) {
QString packname = QString::fromStdString(pack.packname);
for (const auto &img : pack.images) {
ImageDesc i{};
i.shortcode = QString::fromStdString(img.first);
i.packname = packname;