ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad commit

Browse Source
This commit is contained in:
Tomaz Canabrava
2024-04-19 10:18:31 +02:00
parent 35f1ace458
commit 07a9497f4c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neochatroom.cpp
View File

@@ -451,11 +451,11 @@ QVariantMap NeoChatRoom::getUser(User *user) const
return QVariantMap{ return QVariantMap{
{QStringLiteral("isLocalUser"), user->id() == localMember().id()}, {QStringLiteral("isLocalUser"), user->id() == localMember().id()},
{QStringLiteral("id"), user->id()}, {QStringLiteral("id"), user->id()},
{QStringLiteral("displayName"), user->displayname()}, // TODO: Missing methods. {QStringLiteral("displayName"), user->displayname()},
{QStringLiteral("escapedDisplayName"), user->displayname()}, // htmlSafeMemberName(user->id())}, {QStringLiteral("escapedDisplayName"), member(user->id()).htmlSafeDisplayName()},
{QStringLiteral("avatarSource"), avatarForMember(user)}, {QStringLiteral("avatarSource"), avatarForMember(user)},
{QStringLiteral("avatarMediaId"), user->avatarMediaId()}, {QStringLiteral("avatarMediaId"), user->avatarMediaId()},
{QStringLiteral("color"), QColor()}, // Utils::getUserColor(user->hueF())}, {QStringLiteral("color"), member(user->id()).hueF()},
{QStringLiteral("object"), QVariant::fromValue(user)}, {QStringLiteral("object"), QVariant::fromValue(user)},
}; };
} }
@@ -467,7 +467,7 @@ QString NeoChatRoom::avatarMediaId() const
} }
// Use the first (excluding self) user's avatar for direct chats // Use the first (excluding self) user's avatar for direct chats
const auto dcUsers = directChatMebers(); const auto dcUsers = directChatMembers();
for (const auto u : dcUsers) { for (const auto u : dcUsers) {
if (u != localMember()) { if (u != localMember()) {
return u->avatarMediaId(this); return u->avatarMediaId(this);
@@ -1895,7 +1895,7 @@ int NeoChatRoom::maxRoomVersion() const
Quotient::User *NeoChatRoom::directChatRemoteUser() const Quotient::User *NeoChatRoom::directChatRemoteUser() const
{ {
auto users = connection()->directChatMebers(this); auto users = connection()->directChatUsers(this);
if (users.isEmpty()) { if (users.isEmpty()) {
return nullptr; return nullptr;
} }