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

Adapt to newer API

Browse Source
This commit is contained in:
Tomaz Canabrava
2024-04-19 10:42:03 +02:00
parent f4b87caefe
commit 7cc68d2658
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/neochatroom.cpp
View File

@@ -259,18 +259,18 @@ void NeoChatRoom::forget()
QVariantList NeoChatRoom::getUsersTyping() const QVariantList NeoChatRoom::getUsersTyping() const
{ {
auto users = usersTyping(); auto users = membersTyping();
users.removeAll(localMember()); users.removeAll(localMember());
QVariantList userVariants; QVariantList userVariants;
for (const auto &user : users) { for (const auto &user : users) {
if (connection()->isIgnored(user->id())) { if (connection()->isIgnored(user.id())) {
continue; continue;
} }
userVariants.append(QVariantMap{ userVariants.append(QVariantMap{
{"id"_ls, user->id()}, {"id"_ls, user.id()},
{"avatarMediaId"_ls, user->avatarMediaId(this)}, {"avatarMediaId"_ls, user.avatarMediaId()},
{"displayName"_ls, user->displayname()}, {"displayName"_ls, user.displayName()},
{"display"_ls, user->name()}, {"display"_ls, user.name()},
}); });
} }
return userVariants; return userVariants;
@@ -316,7 +316,7 @@ const RoomEvent *NeoChatRoom::lastEvent() const
} }
} }
if (connection()->isIgnored(user(event->senderId()))) { if (connection()->isIgnored(event->senderId())) {
continue; continue;
} }
@@ -382,7 +382,7 @@ void NeoChatRoom::checkForHighlights(const Quotient::TimelineItem &ti)
} }
if (auto *e = ti.viewAs<RoomMessageEvent>()) { if (auto *e = ti.viewAs<RoomMessageEvent>()) {
const auto &text = e->plainBody(); const auto &text = e->plainBody();
if (text.contains(localMemberId) || text.contains(safeMemberName(localMemberId))) { if (text.contains(localMemberId) || text.contains(member(localMemberId).htmlSafeDisplayName())) {
highlights.insert(e); highlights.insert(e);
} }
} }
@@ -441,7 +441,8 @@ static const QVariantMap emptyUser = {
QVariantMap NeoChatRoom::getUser(const QString &userID) const QVariantMap NeoChatRoom::getUser(const QString &userID) const
{ {
return getUser(user(userID)); auto u = User(userID, connection());
return getUser(&u);
} }
QVariantMap NeoChatRoom::getUser(User *user) const QVariantMap NeoChatRoom::getUser(User *user) const
@@ -472,7 +473,7 @@ QString NeoChatRoom::avatarMediaId() const
const auto dcUsers = directChatMembers(); 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();
} }
} }