d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 18:50:47 +03:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -777,6 +777,7 @@ set(QML_SOURCES
resources/qml/dialogs/AllowedRoomsSettingsDialog.qml
resources/qml/dialogs/RoomSettings.qml
resources/qml/dialogs/UserProfile.qml
resources/qml/dialogs/IgnoredUsers.qml
resources/qml/emoji/StickerPicker.qml
resources/qml/pages/LoginPage.qml
resources/qml/pages/RegisterPage.qml

69
resources/qml/dialogs/IgnoredUsers.qml Normal file
View file

@ -0,0 +1,69 @@
// SPDX-FileCopyrightText: Nheko Contributors
//
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQml 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 2.15
import QtQuick.Window 2.15
import im.nheko 1.0
Window {
id: ignoredUsers
required property var profile
title: qsTr("Ignored users")
flags: Qt.WindowCloseButtonHint | Qt.WindowTitleHint
height: 650
width: 420
minimumHeight: 420
color: palette.window
Connections {
target: profile
function onUnignoredUserError(id, err) {
const text = qsTr("Failed to unignore \"%1\": %2").arg(id).arg(err)
MainWindow.showNotification(text)
}
}
ListView {
id: view
anchors.fill: parent
spacing: Nheko.paddingMedium
model: TimelineManager.ignoredUsers
header: ColumnLayout {
Text {
Layout.fillWidth: true
Layout.maximumWidth: view.width
wrapMode: Text.Wrap
color: palette.text
text: qsTr("Ignoring a user hides their messages (they can still see yours!).")
}
Item { Layout.preferredHeight: Nheko.paddingLarge }
}
delegate: RowLayout {
width: view.width
Text {
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft
elide: Text.ElideRight
color: palette.text
text: modelData
}
ImageButton {
Layout.preferredHeight: 24
Layout.preferredWidth: 24
image: ":/icons/icons/ui/delete.svg"
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Stop Ignoring.")
onClicked: profile.ignoredStatus(modelData, false)
}
}
}
}

32
resources/qml/dialogs/UserProfile.qml
View file

@ -289,6 +289,19 @@ ApplicationWindow {
visible: !profile.isGlobalUserProfile && profile.room.permissions.canBan()
}
ImageButton {
Layout.preferredHeight: 24
Layout.preferredWidth: 24
image: ":/icons/icons/ui/volume-off-indicator.svg"
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Ignore the user.")
onClicked: {
profile.ignoredStatus(profile.userid, true)
}
visible: !profile.isSelf && !profile.isGlobalUserProfile
}
ImageButton {
Layout.preferredHeight: 24
Layout.preferredWidth: 24
@ -299,6 +312,25 @@ ApplicationWindow {
onClicked: profile.refreshDevices()
}
ImageButton {
Layout.preferredHeight: 24
Layout.preferredWidth: 24
image: ":/icons/icons/ui/volume-off-indicator.svg"
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: qsTr("Ignored users.")
onClicked: {
var component = Qt.createComponent("IgnoredUsers.qml")
if (component.status == Component.Ready) {
var window = component.createObject(userProfileDialog, { profile: profile})
window.show()
timelineRoot.destroyOnClose(window)
} else {
console.error("Failed to create component: " + component.errorString());
}
}
visible: profile.isSelf && profile.isGlobalUserProfile
}
}
TabBar {

12
src/timeline/TimelineModel.cpp
View file

@ -521,6 +521,8 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
cache::client()->updateState(room_id_.toStdString(), events_, true);
this->syncState({std::move(events_.events)});
});
connect(this, &TimelineModel::ignoredUser, this, &TimelineModel::handleIgnoredUser);
}
QHash<int, QByteArray>
@ -2220,6 +2222,16 @@ TimelineModel::scrollTimerEvent()
}
}
void
TimelineModel::handleIgnoredUser(const QString &id, const std::optional<QString> &err)
{
if (err) {
MainWindow::instance()->showNotification(tr("Failed to ignore \"%1\": %2").arg(id, *err));
} else {
this->clearTimeline();
}
}
void
TimelineModel::requestKeyForEvent(const QString &id)
{

4
src/timeline/TimelineModel.h
View file

@ -463,6 +463,7 @@ public slots:
private slots:
void addPendingMessage(mtx::events::collections::TimelineEvents event);
void scrollTimerEvent();
void handleIgnoredUser(const QString &id, const std::optional<QString> &err);
signals:
void dataAtIdChanged(QString id);
@ -512,6 +513,9 @@ signals:
void fetchedMore();
// The user may close the profile window before we receive a response, so handle it here
void ignoredUser(const QString &id, const std::optional<QString> &err);
private:
template<typename T>
void sendEncryptedMessage(mtx::events::RoomEvent<T> msg, mtx::events::EventType eventType);

40
src/timeline/TimelineViewManager.cpp
View file

@ -12,6 +12,7 @@
#include <QString>
#include "Cache.h"
#include "Cache_p.h"
#include "ChatPage.h"
#include "CombinedImagePackModel.h"
#include "CommandCompleter.h"
@ -210,6 +211,7 @@ TimelineViewManager::sync(const mtx::responses::Sync &sync_)
this->rooms_->sync(sync_);
this->communities_->sync(sync_);
this->presenceEmitter->sync(sync_.presence);
this->processIgnoredUsers(sync_.account_data);
if (isInitialSync_) {
this->isInitialSync_ = false;
@ -560,3 +562,41 @@ TimelineViewManager::fixImageRendering(QQuickTextDocument *t, QQuickItem *i)
QObject::connect(t->textDocument(), SIGNAL(imagesLoaded()), i, SLOT(updateWholeDocument()));
}
}
using IgnoredUsers = mtx::events::EphemeralEvent<mtx::events::account_data::IgnoredUsers>;
static QVector<QString>
convertIgnoredToQt(const IgnoredUsers &ev)
{
QVector<QString> users;
for (const mtx::events::account_data::IgnoredUser &user : ev.content.users) {
users.push_back(QString::fromStdString(user.id));
}
return users;
}
QVector<QString>
TimelineViewManager::getIgnoredUsers()
{
const auto cache = cache::client()->getAccountData(mtx::events::EventType::IgnoredUsers);
if (!cache) {
return {};
}
return convertIgnoredToQt(std::get<IgnoredUsers>(*cache));
}
void
TimelineViewManager::processIgnoredUsers(const mtx::responses::AccountData &data)
{
for (const mtx::events::collections::RoomAccountDataEvents::variant &ev : data.events) {
if (!std::holds_alternative<IgnoredUsers>(ev)) {
continue;
}
const auto &ignoredEv = std::get<IgnoredUsers>(ev);
emit this->ignoredUsersChanged(convertIgnoredToQt(ignoredEv));
break;
}
}

8
src/timeline/TimelineViewManager.h
View file

@ -39,6 +39,7 @@ class TimelineViewManager final : public QObject
Q_PROPERTY(
bool isInitialSync MEMBER isInitialSync_ READ isInitialSync NOTIFY initialSyncChanged)
Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged)
Q_PROPERTY(QVector<QString> ignoredUsers READ getIgnoredUsers NOTIFY ignoredUsersChanged)
public:
TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr);
@ -62,6 +63,10 @@ public:
return instance_;
}
static TimelineViewManager *instance() { return TimelineViewManager::instance_; }
QVector<QString> getIgnoredUsers();
void sync(const mtx::responses::Sync &sync_);
VerificationManager *verificationManager() { return verificationManager_; }
@ -113,6 +118,7 @@ signals:
QString url,
double originalWidth,
double proportionalHeight);
void ignoredUsersChanged(const QVector<QString> &ignoredUsers);
public slots:
void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
@ -154,4 +160,6 @@ private:
QHash<QPair<QString, quint64>, QColor> userColors;
inline static TimelineViewManager *instance_ = nullptr;
void processIgnoredUsers(const mtx::responses::AccountData &data);
};

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();