Nexus/nexus
Nexus/nexus
3
2
Fork 4
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Fix via handling

Browse source
This commit is contained in:
Henry Hiles 2026-04-06 09:57:03 -04:00
commit 2c23951ea8
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
5 changed files with 101 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/helpers/extensions/focus_room.dart
View file

@ -1,27 +0,0 @@
import "package:collection/collection.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/controllers/key_controller.dart";
import "package:nexus/controllers/spaces_controller.dart";
extension FocusRoom on WidgetRef {
Future<void> focusRoom(String id) async {
final spaces = watch(SpacesController.provider);
final space = spaces.firstWhereOrNull((space) => space.id == id);
await watch(KeyController.provider(KeyController.spaceKey).notifier).set(
space?.id ??
spaces
.firstWhere(
(space) =>
space.children.any((child) => child.metadata?.id == id),
)
.id,
);
if (space == null) {
await watch(
KeyController.provider(KeyController.roomKey).notifier,
).set(id);
}
}
}

63
lib/helpers/extensions/join_room_with_snackbars.dart
View file

@ -1,63 +0,0 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/client_controller.dart";
import "package:nexus/helpers/extensions/focus_room.dart";
import "package:nexus/helpers/extensions/link_to_mention.dart";
import "package:nexus/models/requests/join_room_request.dart";
extension JoinRoomWithSnackbars on ClientController {
Future<void> joinRoomWithSnackBars(
BuildContext context,
String roomAlias,
WidgetRef ref,
) async {
final roomIdOrAlias = roomAlias.mention ?? roomAlias;
// TODO: Parse vias properly
final scaffoldMessenger = ScaffoldMessenger.of(context);
final snackbar = scaffoldMessenger.showSnackBar(
SnackBar(
content: Text("Joining room $roomIdOrAlias."),
duration: Duration(days: 999),
),
);
try {
final id = await joinRoom(
JoinRoomRequest(
roomIdOrAlias: roomIdOrAlias,
via: IList(Uri.tryParse(roomAlias)?.queryParametersAll["via"] ?? []),
),
);
snackbar.close();
scaffoldMessenger.showSnackBar(
SnackBar(
content: Text("Room $roomIdOrAlias successfully joined."),
action: SnackBarAction(
label: "Open",
onPressed: () => ref.focusRoom(id),
),
),
);
} catch (error) {
snackbar.close();
if (context.mounted) {
scaffoldMessenger.showSnackBar(
SnackBar(
backgroundColor: Theme.of(context).colorScheme.errorContainer,
content: Text(
error.toString(),
style: TextStyle(
color: Theme.of(context).colorScheme.onErrorContainer,
),
),
),
);
}
}
}
}

3
lib/helpers/extensions/link_to_mention.dart
View file

@ -30,7 +30,8 @@ extension LinkToMention on String {
final identifier = uri.pathSegments.last;
if (identifier.isNotEmpty) {
return "${switch (uri.pathSegments.firstOrNull) {
"r" || "roomid" => "#",
"r" => "#",
"roomid" => "!",
"u" => "@",
_ => "",
}}${Uri.decodeComponent(identifier)}";

105
lib/widgets/chat_page/join_dialog.dart
View file

@ -1,15 +1,21 @@
import "package:collection/collection.dart";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart";
import "package:flutter_hooks/flutter_hooks.dart";
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/client_controller.dart";
import "package:nexus/helpers/extensions/join_room_with_snackbars.dart";
import "package:nexus/controllers/key_controller.dart";
import "package:nexus/controllers/spaces_controller.dart";
import "package:nexus/helpers/extensions/link_to_mention.dart";
import "package:nexus/models/requests/join_room_request.dart";
import "package:nexus/widgets/form_text_input.dart";
class JoinDialog extends HookConsumerWidget {
const JoinDialog({super.key});
class JoinDialog extends HookWidget {
final WidgetRef ref;
const JoinDialog(this.ref, {super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
Widget build(BuildContext context) {
final roomAlias = useTextEditingController();
return AlertDialog(
title: Text("Join a Room"),
@ -17,7 +23,7 @@ class JoinDialog extends HookConsumerWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Enter the room alias, ID, or a Matrix.to link."),
Text("Enter the room alias, Matrix URI, or Matrix.to link."),
SizedBox(height: 12),
FormTextInput(
required: false,
@ -33,9 +39,94 @@ class JoinDialog extends HookConsumerWidget {
onPressed: () async {
Navigator.of(context).pop();
final client = ref.watch(ClientController.provider.notifier);
if (context.mounted) {
client.joinRoomWithSnackBars(context, roomAlias.text, ref);
final roomIdOrAlias = roomAlias.text.mention ?? roomAlias.text;
final scaffoldMessenger = ScaffoldMessenger.of(context);
final snackbar = scaffoldMessenger.showSnackBar(
SnackBar(
content: Text("Joining room $roomIdOrAlias."),
duration: Duration(days: 999),
),
);
try {
final id = await ref
.watch(ClientController.provider.notifier)
.joinRoom(
JoinRoomRequest(
roomIdOrAlias: roomIdOrAlias,
via: IList(
Uri.tryParse(
roomAlias.text.replaceAll("/#", ""),
)?.queryParametersAll["via"] ??
[],
),
),
);
snackbar.close();
scaffoldMessenger.showSnackBar(
SnackBar(
content: Text("Room $roomIdOrAlias successfully joined."),
action: SnackBarAction(
label: "Open",
onPressed: () async {
final spaces = ref.watch(SpacesController.provider);
final space = spaces.firstWhereOrNull(
(space) => space.id == id,
);
await ref
.watch(
KeyController.provider(
KeyController.spaceKey,
).notifier,
)
.set(
space?.id ??
spaces
.firstWhere(
(space) => space.children.any(
(child) => child.metadata?.id == id,
),
)
.id,
);
if (space == null) {
await ref
.watch(
KeyController.provider(
KeyController.roomKey,
).notifier,
)
.set(id);
}
},
),
),
);
} catch (error) {
snackbar.close();
if (context.mounted) {
scaffoldMessenger.showSnackBar(
SnackBar(
backgroundColor: Theme.of(
context,
).colorScheme.errorContainer,
content: Text(
error.toString(),
style: TextStyle(
color: Theme.of(context).colorScheme.onErrorContainer,
),
),
),
);
}
}
}
},
child: Text("Join"),

2
lib/widgets/chat_page/sidebar.dart
View file

@ -88,7 +88,7 @@ class Sidebar extends HookConsumerWidget {
PopupMenuItem(
onTap: () => showDialog(
context: context,
builder: (_) => JoinDialog(),
builder: (_) => JoinDialog(ref),
),
child: ListTile(
title: Text("Join an existing room (or space)"),