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

Fix some images not showing up

Browse source
This commit is contained in:
Nicolas Werner 2020-09-07 18:02:17 +02:00
parent c2f2e8324c
commit fef0cc2d71
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/MxcImageProvider.cpp
View file

@ -17,6 +17,8 @@ MxcImageResponse::run()
auto data = cache::image(fileName); auto data = cache::image(fileName);
if (!data.isNull()) { if (!data.isNull()) {
m_image = utils::readImage(&data); m_image = utils::readImage(&data);
if (!m_image.isNull()) {
m_image = m_image.scaled( m_image = m_image.scaled(
m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
m_image.setText("mxc url", "mxc://" + m_id); m_image.setText("mxc url", "mxc://" + m_id);
@ -26,6 +28,7 @@ MxcImageResponse::run()
return; return;
} }
} }
}
mtx::http::ThumbOpts opts; mtx::http::ThumbOpts opts;
opts.mxc_url = "mxc://" + m_id.toStdString(); opts.mxc_url = "mxc://" + m_id.toStdString();
@ -34,7 +37,7 @@ MxcImageResponse::run()
opts.method = "crop"; opts.method = "crop";
http::client()->get_thumbnail( http::client()->get_thumbnail(
opts, [this, fileName](const std::string &res, mtx::http::RequestErr err) { opts, [this, fileName](const std::string &res, mtx::http::RequestErr err) {
if (err) { if (err || res.empty()) {
nhlog::net()->error("Failed to download image {}", nhlog::net()->error("Failed to download image {}",
m_id.toStdString()); m_id.toStdString());
m_error = "Failed download"; m_error = "Failed download";
@ -46,6 +49,10 @@ MxcImageResponse::run()
auto data = QByteArray(res.data(), res.size()); auto data = QByteArray(res.data(), res.size());
cache::saveImage(fileName, data); cache::saveImage(fileName, data);
m_image = utils::readImage(&data); m_image = utils::readImage(&data);
if (!m_image.isNull()) {
m_image = m_image.scaled(
m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
}
m_image.setText("mxc url", "mxc://" + m_id); m_image.setText("mxc url", "mxc://" + m_id);
emit finished(); emit finished();