Change the behaviour when clicking on a space

- When click on a space the space home page is shown, unless the current room is also a member of the new space
- When changing to friends or global the first is entered
- The global now only contains rooms that are not part of a space
- Global is now home

src/models/roomlistmodel.cpp

@@ -361,7 +361,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return room->isSpace();
     }
     if (role == IsChildSpaceRole) {
-        return SpaceHierarchyCache::instance().isChildSpace(room->id());
+        return SpaceHierarchyCache::instance().isChild(room->id());
     }
     if (role == ReplacementIdRole) {
         return room->successorId();

src/models/sortfilterroomlistmodel.cpp

@@ -106,7 +106,10 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
     }
 
     if (m_activeSpaceId.isEmpty()) {
-        return acceptRoom;
+        if (!SpaceHierarchyCache::instance().isChild(sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::RoomIdRole).toString())) {
+            return acceptRoom;
+        }
+        return false;
     } else {
         const auto &rooms = SpaceHierarchyCache::instance().getRoomListForSpace(m_activeSpaceId, false);
         return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::RoomIdRole).toString())