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

Merge pull request #934 from pavlukivan/master

Browse source 
use shortcode as a fallback for custom emote title
This commit is contained in:
DeepBlueV7.X 2022-02-21 00:27:22 +00:00 committed by GitHub
commit fd25f6ee91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CombinedImagePackModel.cpp
View file

@ -60,7 +60,9 @@ CombinedImagePackModel::data(const QModelIndex &index, int role) const
return QStringLiteral( return QStringLiteral(
"<img data-mx-emoticon height=32 src=\"%1\" alt=\"%2\" title=\"%2\">") "<img data-mx-emoticon height=32 src=\"%1\" alt=\"%2\" title=\"%2\">")
.arg(QString::fromStdString(images[index.row()].image.url).toHtmlEscaped(), .arg(QString::fromStdString(images[index.row()].image.url).toHtmlEscaped(),
QString::fromStdString(images[index.row()].image.body)); !images[index.row()].image.body.empty()
? QString::fromStdString(images[index.row()].image.body)
: images[index.row()].shortcode);
case Roles::Url: case Roles::Url:
return QString::fromStdString(images[index.row()].image.url); return QString::fromStdString(images[index.row()].image.url);
case CompletionModel::SearchRole: case CompletionModel::SearchRole: