Room::canSwitchVersions(): refactor and make Q_INVOKABLE

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/room.cpp b/lib/room.cpp
index 5d4e2141..dc65ebfc 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -758,15 +758,13 @@ bool Room::canSwitchVersions() const
     if (!successorId().isEmpty())
         return false; // No one can upgrade a room that's already upgraded
 
-    // TODO, #276: m.room.power_levels
-    const auto* plEvt =
-        d->getCurrentState<RoomPowerLevelsEvent>();
-    if (!plEvt)
-        return true;
-
-    const auto currentUserLevel = plEvt->powerLevelForUser(localUser()->id());
-    const auto tombstonePowerLevel = plEvt->powerLevelForState("m.room.tombstone"_ls);
-    return currentUserLevel >= tombstonePowerLevel;
+    if (const auto* plEvt = d->getCurrentState<RoomPowerLevelsEvent>()) {
+        const auto currentUserLevel = plEvt->powerLevelForUser(localUser()->id());
+        const auto tombstonePowerLevel =
+            plEvt->powerLevelForState("m.room.tombstone"_ls);
+        return currentUserLevel >= tombstonePowerLevel;
+    }
+    return true;
 }
 
 bool Room::hasUnreadMessages() const { return unreadCount() >= 0; }