2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Follow up join space children

Browse source
This commit is contained in:
krille-chan 2024-07-26 22:12:03 +02:00
commit 76b7fbf36f
No known key found for this signature in database
2 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/widgets/public_room_bottom_sheet.dart
View file

@ -15,13 +15,13 @@ class PublicRoomBottomSheet extends StatelessWidget {
final String? roomAlias;
final BuildContext outerContext;
final PublicRoomsChunk? chunk;
final VoidCallback? onRoomJoined;
final List<String>? via;
PublicRoomBottomSheet({
this.roomAlias,
required this.outerContext,
this.chunk,
this.onRoomJoined,
this.via,
super.key,
}) {
assert(roomAlias != null || chunk != null);
@ -38,8 +38,11 @@ class PublicRoomBottomSheet extends StatelessWidget {
return chunk.roomId;
}
final roomId = chunk != null && knock
? await client.knockRoom(chunk.roomId)
: await client.joinRoom(roomAlias ?? chunk!.roomId);
? await client.knockRoom(chunk.roomId, serverName: via)
: await client.joinRoom(
roomAlias ?? chunk!.roomId,
serverName: via,
);
if (!knock && client.getRoomById(roomId) == null) {
await client.waitForRoomInSync(roomId);
@ -51,7 +54,7 @@ class PublicRoomBottomSheet extends StatelessWidget {
return;
}
if (result.error == null) {
Navigator.of(context).pop();
Navigator.of(context).pop<bool>(true);
// don't open the room if the joined room is a space
if (chunk?.roomType != 'm.space' &&
!client.getRoomById(result.result!)!.isSpace) {