diff --git a/flake.nix b/flake.nix index 7503c87..4c06ac6 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ permissions = { share = [ "network" ]; sockets = [ - "pulseaudio" "fallback-x11" "wayland" ]; diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index b93885e..07b3650 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -54,10 +54,7 @@ class RoomChatController extends AsyncNotifier?> { return editedEvent == null ? foundEvent - : foundEvent?.copyWith( - content: editedEvent.content, - localContent: editedEvent.localContent, - ); + : foundEvent?.copyWith(content: editedEvent.content); }) .nonNulls .toIList(); diff --git a/lib/controllers/url_preview_controller.dart b/lib/controllers/url_preview_controller.dart index 3bdaae7..bb5626a 100644 --- a/lib/controllers/url_preview_controller.dart +++ b/lib/controllers/url_preview_controller.dart @@ -12,36 +12,33 @@ class UrlPreviewController extends AsyncNotifier { @override Future build() async { - try { - final homeserver = ref.watch( - ClientStateController.provider.select((value) => value?.homeserverUrl), - ); + final homeserver = ref.watch( + ClientStateController.provider.select((value) => value?.homeserverUrl), + ); - if (homeserver != null && !link.contains("matrix.to")) { - { - final response = await get( - .parse(homeserver) - .resolve("/_matrix/client/v1/media/preview_url") - .replace(queryParameters: {"url": link}), - headers: await ref.watch(HeaderController.provider.future), - ); + if (homeserver != null && !link.contains("matrix.to")) { + { + final response = await get( + .parse(homeserver) + .resolve("/_matrix/client/v1/media/preview_url") + .replace(queryParameters: {"url": link}), + headers: await ref.watch(HeaderController.provider.future), + ); - if (response.statusCode == 200) { - final decodedValue = json.decode(response.body); - if (decodedValue is! Map) return null; + if (response.statusCode == 200) { + final decodedValue = json.decode(response.body); + if (decodedValue is! Map) return null; - final mxc = decodedValue["og:image"]; - final image = mxc == null - ? null - : Uri.tryParse(mxc)?.mxcToHttps(homeserver); + final mxc = decodedValue["og:image"]; + final image = mxc == null + ? null + : Uri.tryParse(mxc)?.mxcToHttps(homeserver); - return .fromJson(decodedValue).copyWith(imageUrl: image); - } + return .fromJson(decodedValue).copyWith(imageUrl: image); } } - } catch (_) { - return null; } + return null; } diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index d4c645d..618d9ee 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -5,7 +5,6 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:fluttertagger/fluttertagger.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/power_level_controller.dart"; -import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/widgets/composer/mention_overlay.dart"; @@ -43,12 +42,7 @@ class Composer extends HookConsumerWidget { final query = useState(""); if (relationType == .edit && controller.value.text.isEmpty) { - controller.value.text = - relatedEvent?.localContent?.editSource ?? - switch (relatedEvent?.content) { - TextMessageContent(:final body) => body, - _ => "", - }; + controller.value.text = relatedEvent?.localContent?.editSource ?? ""; } void send() { diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart index e1036cc..2817172 100644 --- a/lib/widgets/room_chat.dart +++ b/lib/widgets/room_chat.dart @@ -508,6 +508,7 @@ class RoomChat extends HookConsumerWidget { MemberList(roomId), ], ), + endDrawer: showMembersByDefault ? null : MemberList(roomId), ); }