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

Reduce nesting

Browse Source
This commit is contained in:
Tobias Fella
2025-08-29 22:20:08 +02:00
parent 5ee5991c39
commit 19e74b60a9
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/libneochat/neochatroom.cpp
View File

@@ -886,10 +886,11 @@ void NeoChatRoom::addParent(const QString &parentId, bool canonical, bool setPar
setState("m.space.parent"_L1, parentId, QJsonObject{{"canonical"_L1, canonical}, {"via"_L1, QJsonArray{connection()->domain()}}}); setState("m.space.parent"_L1, parentId, QJsonObject{{"canonical"_L1, canonical}, {"via"_L1, QJsonArray{connection()->domain()}}});
if (setParentChild) { if (!setParentChild) {
if (auto parent = static_cast<NeoChatRoom *>(connection()->room(parentId))) { return;
parent->setState("m.space.child"_L1, id(), QJsonObject{{"via"_L1, QJsonArray{connection()->domain()}}}); }
} if (auto parent = static_cast<NeoChatRoom *>(connection()->room(parentId))) {
parent->setState("m.space.child"_L1, id(), QJsonObject{{"via"_L1, QJsonArray{connection()->domain()}}});
} }
} }
@@ -940,23 +941,27 @@ void NeoChatRoom::addChild(const QString &childId, bool setChildParent, bool can
} }
setState("m.space.child"_L1, childId, QJsonObject{{"via"_L1, QJsonArray{connection()->domain()}}, {"suggested"_L1, suggested}, {"order"_L1, order}}); setState("m.space.child"_L1, childId, QJsonObject{{"via"_L1, QJsonArray{connection()->domain()}}, {"suggested"_L1, suggested}, {"order"_L1, order}});
if (setChildParent) { if (!setChildParent) {
if (auto child = static_cast<NeoChatRoom *>(connection()->room(childId))) { return;
if (child->canSendState("m.space.parent"_L1)) { }
child->setState("m.space.parent"_L1, id(), QJsonObject{{"canonical"_L1, canonical}, {"via"_L1, QJsonArray{connection()->domain()}}}); if (auto child = static_cast<NeoChatRoom *>(connection()->room(childId))) {
if (!child->canSendState("m.space.parent"_L1)) {
return;
}
child->setState("m.space.parent"_L1, id(), QJsonObject{{"canonical"_L1, canonical}, {"via"_L1, QJsonArray{connection()->domain()}}});
if (canonical) { if (!canonical) {
// Only one canonical parent can exist so make sure others are set to false. return;
auto parentEvents = child->currentState().eventsOfType("m.space.parent"_L1); }
for (const auto &parentEvent : parentEvents) { // Only one canonical parent can exist so make sure others are set to false.
if (parentEvent->contentPart<bool>("canonical"_L1)) { auto parentEvents = child->currentState().eventsOfType("m.space.parent"_L1);
auto content = parentEvent->contentJson(); for (const auto &parentEvent : parentEvents) {
content.insert("canonical"_L1, false); if (!parentEvent->contentPart<bool>("canonical"_L1)) {
setState("m.space.parent"_L1, parentEvent->stateKey(), content); continue;
}
}
}
} }
auto content = parentEvent->contentJson();
content.insert("canonical"_L1, false);
setState("m.space.parent"_L1, parentEvent->stateKey(), content);
} }
} }
} }
@@ -971,12 +976,14 @@ void NeoChatRoom::removeChild(const QString &childId, bool unsetChildParent)
} }
setState("m.space.child"_L1, childId, {}); setState("m.space.child"_L1, childId, {});
if (unsetChildParent) { if (!unsetChildParent) {
if (auto child = static_cast<NeoChatRoom *>(connection()->room(childId))) { return;
if (child->canSendState("m.space.parent"_L1) && child->currentState().contains("m.space.parent"_L1, id())) { }
child->setState("m.space.parent"_L1, id(), {}); if (auto child = static_cast<NeoChatRoom *>(connection()->room(childId))) {
} if (!child->canSendState("m.space.parent"_L1) || !child->currentState().contains("m.space.parent"_L1, id())) {
return;
} }
child->setState("m.space.parent"_L1, id(), {});
} }
} }