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

Show user info even if the display name or avatar are missing

Browse source
This commit is contained in:
Konstantinos Sideris 2017-05-16 15:43:29 +03:00
parent 49831a2390
commit 992af5611b
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/UserInfoWidget.h
View file

@ -57,7 +57,7 @@ private:
QLabel *userIdLabel_;
QString display_name_;
QString userid_;
QString user_id_;
QImage avatar_image_;
};

3
src/ChatPage.cc
View file

@ -234,7 +234,8 @@ void ChatPage::updateOwnProfileInfo(const QUrl &avatar_url, const QString &displ
user_info_widget_->setUserId(userid);
user_info_widget_->setDisplayName(display_name);
client_->fetchOwnAvatar(avatar_url);
if (avatar_url.isValid())
client_->fetchOwnAvatar(avatar_url);
}
void ChatPage::changeTopRoomInfo(const QString &room_id)

11
src/Profile.cc
View file

@ -29,12 +29,9 @@ void ProfileResponse::deserialize(const QJsonDocument &data)
QJsonObject object = data.object();
if (object.value("avatar_url") == QJsonValue::Undefined)
throw DeserializationException("Missing avatar_url param");
if (object.contains("avatar_url"))
avatar_url_ = QUrl(object.value("avatar_url").toString());
if (object.value("displayname") == QJsonValue::Undefined)
throw DeserializationException("Missing displayname param");
avatar_url_ = QUrl(object.value("avatar_url").toString());
display_name_ = object.value("displayname").toString();
if (object.contains("displayname"))
display_name_ = object.value("displayname").toString();
}

18
src/UserInfoWidget.cc
View file

@ -21,7 +21,7 @@
UserInfoWidget::UserInfoWidget(QWidget *parent)
: QWidget(parent)
, display_name_("User")
, userid_("@user:homeserver.org")
, user_id_("@user:homeserver.org")
{
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
setSizePolicy(sizePolicy);
@ -36,8 +36,9 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
userAvatar_ = new Avatar(this);
userAvatar_->setLetter(QChar('?'));
userAvatar_->setSize(50);
userAvatar_->setMaximumSize(QSize(55, 55));
userAvatar_->setSize(55);
userAvatar_->setBackgroundColor("#f9f9f9");
userAvatar_->setTextColor("#333333");
displayNameLabel_ = new QLabel(this);
displayNameLabel_->setStyleSheet(
@ -102,12 +103,17 @@ void UserInfoWidget::setAvatar(const QImage &img)
void UserInfoWidget::setDisplayName(const QString &name)
{
display_name_ = name;
displayNameLabel_->setText(name);
if (name.isEmpty())
display_name_ = user_id_.split(':')[0].split('@')[1];
else
display_name_ = name;
displayNameLabel_->setText(display_name_);
userAvatar_->setLetter(QChar(display_name_[0]));
}
void UserInfoWidget::setUserId(const QString &userid)
{
userid_ = userid;
user_id_ = userid;
userIdLabel_->setText(userid);
}