From c3e02240bff004cfbde8e747894489dc939b1ebe Mon Sep 17 00:00:00 2001 From: Jedi18 Date: Mon, 1 Feb 2021 22:13:04 +0530 Subject: [PATCH] update room and global avatar through user profile --- resources/qml/UserProfile.qml | 2 +- src/ui/UserProfile.cpp | 103 ++++++++++++++++++++++++++++++---- src/ui/UserProfile.h | 6 ++ 3 files changed, 98 insertions(+), 13 deletions(-) diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index 26dfc48c..cff69a90 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -31,7 +31,7 @@ ApplicationWindow { displayName: profile.displayName userid: profile.userid Layout.alignment: Qt.AlignHCenter - onClicked: TimelineManager.openImageOverlay(TimelineManager.timeline.avatarUrl(userid), TimelineManager.timeline.data.id) + onClicked: profile.isSelf ? profile.changeAvatar() : TimelineManager.openImageOverlay(TimelineManager.timeline.avatarUrl(userid), TimelineManager.timeline.data.id) } TextInput { diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index 3872294a..960cfc4d 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -1,14 +1,17 @@ -#include "UserProfile.h" +#include +#include +#include +#include + #include "Cache_p.h" #include "ChatPage.h" #include "DeviceVerificationFlow.h" #include "Logging.h" +#include "UserProfile.h" #include "Utils.h" #include "mtx/responses/crypto.hpp" #include "timeline/TimelineModel.h" #include "timeline/TimelineViewManager.h" -#include -#include UserProfile::UserProfile(QString roomid, QString userid, @@ -260,15 +263,7 @@ UserProfile::changeUsername(QString username) .toStdString(); member.membership = mtx::events::state::Membership::Join; - http::client()->send_state_event( - roomid_.toStdString(), - http::client()->user_id().to_string(), - member, - [](mtx::responses::EventId, mtx::http::RequestErr err) { - if (err) - nhlog::net()->error("Failed to set room displayname: {}", - err->matrix_error.error); - }); + updateRoomMemberState(std::move(member)); } } @@ -293,4 +288,88 @@ UserProfile::setGlobalUsername(const QString &globalUser) { globalUsername = globalUser; emit displayNameChanged(); +} + +void +UserProfile::changeAvatar() +{ + const QString picturesFolder = + QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); + const QString fileName = QFileDialog::getOpenFileName( + nullptr, tr("Select an avatar"), picturesFolder, tr("All Files (*)")); + + if (fileName.isEmpty()) + return; + + QMimeDatabase db; + QMimeType mime = db.mimeTypeForFile(fileName, QMimeDatabase::MatchContent); + + const auto format = mime.name().split("/")[0]; + + QFile file{fileName, this}; + if (format != "image") { + // displayErrorMessage(tr("The selected file is not an image")); + return; + } + + if (!file.open(QIODevice::ReadOnly)) { + // displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString())); + return; + } + + const auto bin = file.peek(file.size()); + const auto payload = std::string(bin.data(), bin.size()); + const auto dimensions = QImageReader(&file).size(); + + // First we need to create a new mxc URI + // (i.e upload media to the Matrix content repository) for the new avatar. + http::client()->upload( + payload, + mime.name().toStdString(), + QFileInfo(fileName).fileName().toStdString(), + [this, + dimensions, + payload, + mimetype = mime.name().toStdString(), + size = payload.size(), + room_id = roomid_.toStdString(), + content = std::move(bin)](const mtx::responses::ContentURI &res, + mtx::http::RequestErr err) { + if (err) { + nhlog::ui()->error("Failed to upload image", err->matrix_error.error); + return; + } + + if (isGlobalUserProfile()) { + http::client()->set_avatar_url( + res.content_uri, [](mtx::http::RequestErr err) { + if (err) { + nhlog::ui()->error("Failed to set user avatar url", + err->matrix_error.error); + } + }); + } else { + // change room username + mtx::events::state::Member member; + member.display_name = cache::displayName(roomid_, userid_).toStdString(); + member.avatar_url = res.content_uri; + member.membership = mtx::events::state::Membership::Join; + + updateRoomMemberState(std::move(member)); + } + }); +} + +void +UserProfile::updateRoomMemberState(mtx::events::state::Member member) +{ + http::client()->send_state_event(roomid_.toStdString(), + http::client()->user_id().to_string(), + member, + [](mtx::responses::EventId, mtx::http::RequestErr err) { + if (err) + nhlog::net()->error( + "Failed to update room member state : ", + err->matrix_error.error); + }); } \ No newline at end of file diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h index 11f588b6..69c1542c 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h @@ -4,6 +4,8 @@ #include #include #include +#include +#include namespace verification { Q_NAMESPACE @@ -112,6 +114,7 @@ public: Q_INVOKABLE void kickUser(); Q_INVOKABLE void startChat(); Q_INVOKABLE void changeUsername(QString username); + Q_INVOKABLE void changeAvatar(); signals: void userStatusChanged(); @@ -121,6 +124,9 @@ signals: protected slots: void setGlobalUsername(const QString &globalUser); +private: + void updateRoomMemberState(mtx::events::state::Member member); + private: QString roomid_, userid_; QString globalUsername;