d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default body to shortcode if unset and sending sticker

Browse source
This commit is contained in:
Nicolas Werner 2022-03-22 19:45:25 +01:00
parent 922c63ef27
commit 637db55e08
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/CombinedImagePackModel.h
View file

@ -33,6 +33,12 @@ public:
return {}; return {};
return images.at(static_cast<size_t>(row)).image; return images.at(static_cast<size_t>(row)).image;
} }
QString shortcodeAt(int row)
{
if (row < 0 || static_cast<size_t>(row) >= images.size())
return {};
return images.at(static_cast<size_t>(row)).shortcode;
}
private: private:
std::string room_id; std::string room_id;

2
src/timeline/InputBar.cpp
View file

@ -636,7 +636,7 @@ InputBar::sticker(CombinedImagePackModel *model, int row)
mtx::events::msg::StickerImage sticker{}; mtx::events::msg::StickerImage sticker{};
sticker.info = img.info.value_or(mtx::common::ImageInfo{}); sticker.info = img.info.value_or(mtx::common::ImageInfo{});
sticker.url = img.url; sticker.url = img.url;
sticker.body = img.body; sticker.body = img.body.empty() ? model->shortcodeAt(row).toStdString() : img.body;
// workaround for https://github.com/vector-im/element-ios/issues/2353 // workaround for https://github.com/vector-im/element-ios/issues/2353
sticker.info.thumbnail_url = sticker.url; sticker.info.thumbnail_url = sticker.url;