Remove redundant NeoChatRoom::htmlSafeDisplayName
This commit is contained in:
committed by
Tobias Fella
parent
dbc10685f0
commit
8abd0db012
@@ -111,7 +111,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
|
|||||||
qWarning() << "using this room's avatar";
|
qWarning() << "using this room's avatar";
|
||||||
avatar_image = avatar(128);
|
avatar_image = avatar(128);
|
||||||
}
|
}
|
||||||
NotificationsManager::instance().postInviteNotification(this, htmlSafeDisplayName(), htmlSafeMemberName(senderId), avatar_image);
|
NotificationsManager::instance().postInviteNotification(this, displayNameForHtml(), htmlSafeMemberName(senderId), avatar_image);
|
||||||
});
|
});
|
||||||
connect(this, &Room::changed, this, [this] {
|
connect(this, &Room::changed, this, [this] {
|
||||||
Q_EMIT canEncryptRoomChanged();
|
Q_EMIT canEncryptRoomChanged();
|
||||||
@@ -978,11 +978,6 @@ bool NeoChatRoom::isUserBanned(const QString &user) const
|
|||||||
return roomMemberEvent->membership() == Membership::Ban;
|
return roomMemberEvent->membership() == Membership::Ban;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString NeoChatRoom::htmlSafeDisplayName() const
|
|
||||||
{
|
|
||||||
return displayName().toHtmlEscaped();
|
|
||||||
}
|
|
||||||
|
|
||||||
void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reason)
|
void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reason)
|
||||||
{
|
{
|
||||||
doDeleteMessagesByUser(user, reason);
|
doDeleteMessagesByUser(user, reason);
|
||||||
|
|||||||
@@ -111,11 +111,6 @@ class NeoChatRoom : public Quotient::Room
|
|||||||
*/
|
*/
|
||||||
Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
|
Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Display name with any html special characters escaped.
|
|
||||||
*/
|
|
||||||
Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The avatar image to be used for the room.
|
* @brief The avatar image to be used for the room.
|
||||||
*/
|
*/
|
||||||
@@ -591,8 +586,6 @@ public:
|
|||||||
|
|
||||||
[[nodiscard]] bool readMarkerLoaded() const;
|
[[nodiscard]] bool readMarkerLoaded() const;
|
||||||
|
|
||||||
QString htmlSafeDisplayName() const;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Get subtitle text for room
|
* @brief Get subtitle text for room
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user