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

Fix room avatars in settings

Browse source
This commit is contained in:
Nicolas Werner 2020-01-21 21:33:35 +01:00
parent fcc7c0ce5b
commit aa7ac71cfe
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AvatarProvider.cpp
View file

@ -31,7 +31,7 @@ namespace AvatarProvider {
void void
resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback callback) resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback callback)
{ {
const auto cacheKey = avatarUrl + "_size_" + size; const auto cacheKey = QString("%1_size_%2").arg(avatarUrl).arg(size);
if (avatarUrl.isEmpty()) if (avatarUrl.isEmpty())
return; return;

9
src/dialogs/RoomSettings.cpp
View file

@ -352,11 +352,9 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
} }
avatar_ = new Avatar(this, 128); avatar_ = new Avatar(this, 128);
if (avatarImg_.isNull())
avatar_->setLetter(utils::firstChar(QString::fromStdString(info_.name))); avatar_->setLetter(utils::firstChar(QString::fromStdString(info_.name)));
else if (!info_.avatar_url.empty())
avatar_->setImage(room_id_, avatar_->setImage(QString::fromStdString(info_.avatar_url));
QString::fromStdString(http::client()->user_id().to_string()));
if (canChangeAvatar(room_id_.toStdString(), utils::localUser().toStdString())) { if (canChangeAvatar(room_id_.toStdString(), utils::localUser().toStdString())) {
auto filter = new ClickableFilter(this); auto filter = new ClickableFilter(this);
@ -637,8 +635,7 @@ RoomSettings::setAvatar()
stopLoadingSpinner(); stopLoadingSpinner();
if (avatar_) if (avatar_)
avatar_->setImage(room_id_, avatar_->setImage(QString::fromStdString(info_.avatar_url));
QString::fromStdString(http::client()->user_id().to_string()));
} }
void void