rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow creating spaces

This commit is contained in:
Nicolas Werner 2022-09-05 02:00:20 +02:00
parent c6bf1e6508
commit 1d7575036e
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
7 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -582,7 +582,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 43e88905659b027bc47c40fe0d31cf28fd639ef9
GIT_TAG a00a04adaddf856feaa21087217608e05b9c7ed3
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
io.github.NhekoReborn.Nheko.yaml
View File

@ -203,7 +203,7 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- commit: 43e88905659b027bc47c40fe0d31cf28fd639ef9
- commit: a00a04adaddf856feaa21087217608e05b9c7ed3
#tag: v0.8.0
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git

9
resources/qml/RoomList.qml
View File

@ -729,6 +729,15 @@ Page {
}
}
Platform.MenuItem {
text: qsTr("Create a new community")
onTriggered: {
var createRoom = createRoomComponent.createObject(timelineRoot, { "space": true });
createRoom.show();
timelineRoot.destroyOnClose(createRoom);
}
}
}
}

11
resources/qml/dialogs/CreateRoom.qml
View File

@ -12,7 +12,10 @@ import im.nheko 1.0
ApplicationWindow {
id: createRoomRoot
title: qsTr("Create Room")
property bool space: false
title: space ? qsTr("New community") : qsTr("New Room")
minimumWidth: Math.max(rootLayout.implicitWidth+2*rootLayout.anchors.margins, footer.implicitWidth + Nheko.paddingLarge)
minimumHeight: rootLayout.implicitHeight+footer.implicitHeight+2*rootLayout.anchors.margins
modality: Qt.NonModal
@ -95,6 +98,7 @@ ApplicationWindow {
checked: false
}
Label {
visible: !space
Layout.preferredWidth: implicitWidth
Layout.alignment: Qt.AlignLeft
text: qsTr("Trusted")
@ -107,6 +111,7 @@ ApplicationWindow {
ToolTip.delay: Nheko.tooltipDelay
}
ToggleButton {
visible: !space
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: implicitWidth
id: isTrusted
@ -114,6 +119,7 @@ ApplicationWindow {
enabled: !isPublic.checked
}
Label {
visible: !space
Layout.preferredWidth: implicitWidth
Layout.alignment: Qt.AlignLeft
text: qsTr("Encryption")
@ -126,6 +132,7 @@ ApplicationWindow {
ToolTip.delay: Nheko.tooltipDelay
}
ToggleButton {
visible: !space
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: implicitWidth
id: isEncrypted
@ -150,7 +157,7 @@ ApplicationWindow {
else {
preset = isTrusted.checked ? 2 : 0;
}
Nheko.createRoom(newRoomName.text, newRoomTopic.text, newRoomAlias.text, isEncrypted.checked, preset)
Nheko.createRoom(space, newRoomName.text, newRoomTopic.text, newRoomAlias.text, isEncrypted.checked, preset)
createRoomRoot.close();
}
}

23
src/timeline/CommunitiesModel.cpp
View File

@ -449,7 +449,8 @@ CommunitiesModel::clear()
void
CommunitiesModel::sync(const mtx::responses::Sync &sync_)
{
bool tagsUpdated = false;
bool tagsUpdated = false;
const auto userid = http::client()->user_id().to_string();
for (const auto &[roomid, room] : sync_.rooms.join) {
for (const auto &e : room.account_data.events)
@ -457,20 +458,28 @@ CommunitiesModel::sync(const mtx::responses::Sync &sync_)
mtx::events::AccountDataEvent<mtx::events::account_data::Tags>>(e)) {
tagsUpdated = true;
}
for (const auto &e : room.state.events)
for (const auto &e : room.state.events) {
if (std::holds_alternative<mtx::events::StateEvent<mtx::events::state::space::Child>>(
e) ||
std::holds_alternative<mtx::events::StateEvent<mtx::events::state::space::Parent>>(
e)) {
e))
tagsUpdated = true;
}
for (const auto &e : room.timeline.events)
if (auto ev = std::get_if<mtx::events::StateEvent<mtx::events::state::Member>>(&e);
ev && ev->state_key == userid)
tagsUpdated = true;
}
for (const auto &e : room.timeline.events) {
if (std::holds_alternative<mtx::events::StateEvent<mtx::events::state::space::Child>>(
e) ||
std::holds_alternative<mtx::events::StateEvent<mtx::events::state::space::Parent>>(
e)) {
e))
tagsUpdated = true;
}
if (auto ev = std::get_if<mtx::events::StateEvent<mtx::events::state::Member>>(&e);
ev && ev->state_key == userid)
tagsUpdated = true;
}
auto roomId = QString::fromStdString(roomid);
auto &oldUnreads = roomNotificationCache[roomId];

14
src/ui/NhekoGlobalObject.cpp
View File

@ -136,10 +136,22 @@ Nheko::setTransientParent(QWindow *window, QWindow *parentWindow) const
}
void
Nheko::createRoom(QString name, QString topic, QString aliasLocalpart, bool isEncrypted, int preset)
Nheko::createRoom(bool space,
QString name,
QString topic,
QString aliasLocalpart,
bool isEncrypted,
int preset)
{
mtx::requests::CreateRoom req;
if (space) {
req.creation_content = mtx::events::state::Create{};
req.creation_content->type = mtx::events::state::room_type::space;
req.creation_content->creator.clear();
req.creation_content->room_version.clear();
}
switch (preset) {
case 1:
req.preset = mtx::requests::Preset::PublicChat;

8
src/ui/NhekoGlobalObject.h
View File

@ -56,8 +56,12 @@ public:
Q_INVOKABLE void setStatusMessage(QString msg) const;
Q_INVOKABLE void showUserSettingsPage() const;
Q_INVOKABLE void logout() const;
Q_INVOKABLE void
createRoom(QString name, QString topic, QString aliasLocalpart, bool isEncrypted, int preset);
Q_INVOKABLE void createRoom(bool space,
QString name,
QString topic,
QString aliasLocalpart,
bool isEncrypted,
int preset);
Q_INVOKABLE PowerlevelEditingModels *editPowerlevels(QString room_id_) const
{
return new PowerlevelEditingModels(room_id_);