Merge pull request #494 from pangeachat/students-can-add-subrooms

Students can add subrooms

lib/pages/chat_list/chat_list.dart

@@ -832,8 +832,7 @@ class ChatListController extends State<ChatList>
               label: space.nameIncludingParents(context),
               // If user is not admin of space, button is grayed out
               textStyle: TextStyle(
-                color: (firstSelectedRoom == null ||
-                        (firstSelectedRoom.isSpace && !space.isRoomAdmin))
+                color: (firstSelectedRoom == null)
                     ? Theme.of(context).colorScheme.outline
                     : Theme.of(context).colorScheme.surfaceTint,
               ),
@@ -851,10 +850,6 @@ class ChatListController extends State<ChatList>
         if (firstSelectedRoom == null) {
           throw L10n.of(context)!.nonexistentSelection;
         }
-        // If user is not admin of the would-be parent space, does not allow
-        if (firstSelectedRoom.isSpace && !space.isRoomAdmin) {
-          throw L10n.of(context)!.cantAddSpaceChild;
-        }
 
         if (space.canSendDefaultStates) {
           for (final roomId in selectedRoomIds) {

lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart

@@ -131,7 +131,8 @@ extension ChildrenAndParentsRoomExtension on Room {
     spaceMode = child?.isSpace ?? spaceMode;
 
     // get the bool for adding chats to spaces
-    final bool canAddChild = _canIAddSpaceChild(child, spaceMode: spaceMode);
+    final bool canAddChild =
+        (child?.isRoomAdmin ?? true) && canSendEvent(EventTypes.SpaceChild);
     if (!spaceMode) return canAddChild;
 
     // if adding space to a space, check if the child is an ancestor

lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart

@@ -306,10 +306,6 @@ extension PangeaRoom on Room {
 
   bool get canDelete => _canDelete;
 
-  bool canIAddSpaceChild(Room? room, {bool spaceMode = false}) {
-    return _canIAddSpaceChild(room, spaceMode: spaceMode);
-  }
-
   bool get canIAddSpaceParents => _canIAddSpaceParents;
 
   bool pangeaCanSendEvent(String eventType) => _pangeaCanSendEvent(eventType);

lib/pangea/extensions/pangea_room_extension/room_analytics_extension.dart

@@ -54,20 +54,20 @@ extension AnalyticsRoomExtension on Room {
       return Future.value();
     }
 
+    if (!canSendEvent(EventTypes.SpaceChild)) return;
     if (spaceChildren.any((sc) => sc.roomId == analyticsRoom.id)) return;
-    if (canIAddSpaceChild(null)) {
-      try {
-        await setSpaceChild(analyticsRoom.id);
-      } catch (err) {
-        debugPrint(
-          "Failed to add analytics room ${analyticsRoom.id} for student to space $id",
-        );
-        Sentry.addBreadcrumb(
-          Breadcrumb(
-            message: "Failed to add analytics room to space $id",
-          ),
-        );
-      }
+
+    try {
+      await setSpaceChild(analyticsRoom.id);
+    } catch (err) {
+      debugPrint(
+        "Failed to add analytics room ${analyticsRoom.id} for student to space $id",
+      );
+      Sentry.addBreadcrumb(
+        Breadcrumb(
+          message: "Failed to add analytics room to space $id",
+        ),
+      );
     }
   }
 

lib/pangea/extensions/pangea_room_extension/user_permissions_extension.dart

@@ -78,36 +78,10 @@ extension UserPermissionsRoomExtension on Room {
 
   bool get _canDelete => isSpaceAdmin;
 
-  bool _canIAddSpaceChild(Room? room, {bool spaceMode = false}) {
-    if (!isSpace) {
-      ErrorHandler.logError(
-        m: "should not call canIAddSpaceChildren on non-space room. Room id: $id",
-        data: toJson(),
-        s: StackTrace.current,
-      );
-      return false;
-    }
-
-    final isSpaceAdmin = isRoomAdmin;
-    final isChildRoomAdmin = room?.isRoomAdmin ?? true;
-
-    // if user is not admin of child room, return false
-    if (!isChildRoomAdmin) return false;
-
-    // if the child room is a space, or will be a space,
-    // then the user must be an admin of the parent space
-    if (room?.isSpace ?? spaceMode) return isSpaceAdmin;
-
-    // otherwise, the user can add the child room to the parent
-    // if they're the admin of the parent or if the parent creation
-    // of group chats
-    return isSpaceAdmin || (pangeaRoomRules?.isCreateRooms ?? false);
-  }
-
   bool get _canIAddSpaceParents =>
       _isRoomAdmin || pangeaCanSendEvent(EventTypes.SpaceParent);
 
-  //overriding the default canSendEvent to check power levels
+  // Overriding the default canSendEvent to check power levels
   bool _pangeaCanSendEvent(String eventType) {
     final powerLevelsMap = getState(EventTypes.RoomPowerLevels)?.content;
     if (powerLevelsMap == null) return 0 <= ownPowerLevel;

lib/pangea/widgets/class/add_space_toggles.dart

@@ -76,18 +76,6 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
           )
         : null;
 
-    if (widget.activeSpaceId != null) {
-      final activeSpace =
-          Matrix.of(context).client.getRoomById(widget.activeSpaceId!);
-      if (activeSpace != null && activeSpace.canIAddSpaceChild(null)) {
-        parent = activeSpace;
-      } else {
-        ErrorHandler.logError(
-          e: Exception('activeSpaceId ${widget.activeSpaceId} not found'),
-        );
-      }
-    }
-
     //sort possibleParents
     //if possibleParent in parents, put first
     //use sort but use any instead of contains because contains uses == and we want to compare by id
@@ -102,6 +90,20 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
     });
 
     isOpen = widget.startOpen;
+
+    if (widget.activeSpaceId != null) {
+      final activeSpace =
+          Matrix.of(context).client.getRoomById(widget.activeSpaceId!);
+      if (activeSpace == null) {
+        ErrorHandler.logError(
+          e: Exception('activeSpaceId ${widget.activeSpaceId} not found'),
+        );
+        return;
+      }
+      if (activeSpace.canSendEvent(EventTypes.SpaceChild)) {
+        parent = activeSpace;
+      }
+    }
   }
 
   Future<void> _addSingleSpace(String roomToAddId, Room newParent) async {