thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ignore-users' of github.com:NepNep21/nheko into ignore-users

Browse source
This commit is contained in:
Nicolas Werner 2023-10-23 23:58:53 +02:00
commit fce026725e
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
9 changed files with 200 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ui/UserProfile.cpp
View file

@ -224,6 +224,38 @@ UserProfile::refreshDevices()
fetchDeviceList(this->userid_);
}
void
UserProfile::ignoredStatus(const QString &id, const bool ignore)
{
auto old = TimelineViewManager::instance()->getIgnoredUsers();
if (ignore) {
if (old.contains(id)) {
emit this->room()->ignoredUser(id, tr("Already ignored"));
return;
}
old.append(id);
} else {
old.removeOne(id);
}
std::vector<mtx::events::account_data::IgnoredUser> content;
for (const QString &item : old) {
const mtx::events::account_data::IgnoredUser data{.id = item.toStdString()};
content.push_back(data);
}
const mtx::events::account_data::IgnoredUsers payload{.users{content}};
http::client()->put_account_data(payload, [this, id, ignore](mtx::http::RequestErr e) {
if (ignore) {
emit this->room()->ignoredUser(
id, e ? std::optional(QString::fromStdString(e->matrix_error.error)) : std::nullopt);
} else if (e) {
emit this->unignoredUserError(id, QString::fromStdString(e->matrix_error.error));
}
});
}
void
UserProfile::fetchDeviceList(const QString &userID)
{
@ -345,10 +377,6 @@ UserProfile::banUser()
ChatPage::instance()->banUser(roomid_, this->userid_, QLatin1String(""));
}
// void ignoreUser(){
// }
void
UserProfile::kickUser()
{

3
src/ui/UserProfile.h
View file

@ -184,7 +184,7 @@ public:
Q_INVOKABLE void refreshDevices();
Q_INVOKABLE void banUser();
Q_INVOKABLE void signOutDevice(const QString &deviceID);
// Q_INVOKABLE void ignoreUser();
Q_INVOKABLE void ignoredStatus(const QString &id, const bool ignore);
Q_INVOKABLE void kickUser();
Q_INVOKABLE void startChat();
Q_INVOKABLE void startChat(bool encryptionEnabled);
@ -201,6 +201,7 @@ signals:
void displayError(const QString &errorMessage);
void globalUsernameRetrieved(const QString &globalUser);
void devicesChanged();
void unignoredUserError(const QString &id, const QVariant &err);
// internal
void verificationStatiChanged();