Move to upstream JoinRuleEvent

src/neochatroom.cpp

@@ -40,7 +40,6 @@
 #include "chatbarcache.h"
 #include "clipboard.h"
 #include "eventhandler.h"
-#include "events/joinrulesevent.h"
 #include "events/pollevent.h"
 #include "filetransferpseudojob.h"
 #include "neochatconfig.h"
@@ -133,7 +132,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         Q_EMIT canEncryptRoomChanged();
         Q_EMIT parentIdsChanged();
         Q_EMIT canonicalParentChanged();
-        Q_EMIT joinRuleChanged();
         Q_EMIT readOnlyChanged();
     });
     connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
@@ -605,60 +603,6 @@ void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reaso
     doDeleteMessagesByUser(user, reason);
 }
 
-QString NeoChatRoom::joinRule() const
-{
-    auto joinRulesEvent = currentState().get<JoinRulesEvent>();
-    if (!joinRulesEvent) {
-        return {};
-    }
-    return joinRulesEvent->joinRule();
-}
-
-void NeoChatRoom::setJoinRule(const QString &joinRule, const QList<QString> &allowedSpaces)
-{
-    if (!canSendState("m.room.join_rules"_L1)) {
-        qWarning() << "Power level too low to set join rules";
-        return;
-    }
-    auto actualRule = joinRule;
-    if (joinRule == "restricted"_L1 && allowedSpaces.isEmpty()) {
-        actualRule = "private"_L1;
-    }
-
-    QJsonArray allowConditions;
-    if (actualRule == "restricted"_L1) {
-        for (auto allowedSpace : allowedSpaces) {
-            allowConditions += QJsonObject{{"type"_L1, "m.room_membership"_L1}, {"room_id"_L1, allowedSpace}};
-        }
-    }
-
-    QJsonObject content;
-    content.insert("join_rule"_L1, joinRule);
-    if (!allowConditions.isEmpty()) {
-        content.insert("allow"_L1, allowConditions);
-    }
-    qWarning() << content;
-    setState("m.room.join_rules"_L1, {}, content);
-    // Not emitting joinRuleChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
-}
-
-QList<QString> NeoChatRoom::restrictedIds() const
-{
-    auto joinRulesEvent = currentState().get<JoinRulesEvent>();
-    if (!joinRulesEvent) {
-        return {};
-    }
-    if (joinRulesEvent->joinRule() != "restricted"_L1) {
-        return {};
-    }
-
-    QList<QString> roomIds;
-    for (auto allow : joinRulesEvent->allow()) {
-        roomIds += allow.toObject().value("room_id"_L1).toString();
-    }
-    return roomIds;
-}
-
 QString NeoChatRoom::historyVisibility() const
 {
     if (auto stateEvent = currentState().get("m.room.history_visibility"_L1)) {