rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix avatars not updating after deletion

This commit is contained in:
Nicolas Werner 2020-03-22 20:43:45 +01:00
parent 7a2b996f18
commit 95272ce4ab
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Cache.cpp
View File

@ -1423,7 +1423,8 @@ Cache::getRoomAvatarUrl(lmdb::txn &txn,
StateEvent<Avatar> msg =
json::parse(std::string(event.data(), event.size()));
return QString::fromStdString(msg.content.url);
if (!msg.content.url.empty())
return QString::fromStdString(msg.content.url);
} catch (const json::exception &e) {
nhlog::db()->warn("failed to parse m.room.avatar event: {}", e.what());
}

5
src/RoomInfoListItem.cpp
View File

@ -419,7 +419,10 @@ RoomInfoListItem::mousePressEvent(QMouseEvent *event)
void
RoomInfoListItem::setAvatar(const QString &avatar_url)
{
avatar_->setImage(avatar_url);
if (avatar_url.isEmpty())
avatar_->setLetter(utils::firstChar(roomName_));
else
avatar_->setImage(avatar_url);
}
void

3
src/RoomList.cpp
View File

@ -94,9 +94,6 @@ RoomList::addRoom(const QString &room_id, const RoomInfo &info)
void
RoomList::updateAvatar(const QString &room_id, const QString &url)
{
if (url.isEmpty())
return;
emit updateRoomAvatarCb(room_id, url);
}