slightly tweak readme

[skip ci]

.github/workflows/macos.yml

@@ -0,0 +1,32 @@
+name: "Build MacOS App"
+
+on:
+  # TODO: Uncomment this once the MacOS workflow actually works
+  # push:
+  #   branches: ["main"]
+  #   tags: ["*"]
+  workflow_dispatch:
+
+jobs:
+  build-app:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Lix GHA Installer Action
+        uses: samueldr/lix-gha-installer-action@v2026-02-22
+        with:
+          extra_nix_config: experimental-features = nix-command flakes flake-self-attrs
+
+      - name: Build app
+        run: nix develop --command bash -c "flutter pub get && dart scripts/generate.dart && flutter pub run build_runner build && flutter build macos --release"
+
+      - name: Upload installer artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: App
+          path: build/macos/Build/Products/Release/Nexus.app

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "gomuks"]
 	path = gomuks
-	url = https://github.com/henry-hiles/gomuks
+	url = https://github.com/gomuks/gomuks
 	branch = main

README.md

@@ -127,15 +127,16 @@ If you want to try out Nexus, grab one of the following artifacts from CI:
 #### Linux
 
 - With Nix: Either use direnv and `direnv allow`, or `nix flake develop`
-- Without Nix: Install Flutter, Go, Git, Libclang, and Glibc. Do not use any Snap packages, they cause various compilation issues.
+- Without Nix: Install Flutter, Go, Git, Libclang, Libass, MPV, and Glibc. Do not use any Snap packages, they cause various compilation issues.
 
 #### Windows
 
 You will need:
 
 - Flutter
-- Android SDK + NDK
 - Git
+- Libass
+- MPV
 - Go
 - Visual Studio 2022 (Desktop development with C++)
 - [MSYS2/MinGW-w64 GCC](https://www.msys2.org/) (for CGO)
@@ -202,7 +203,7 @@ Development instructions can be found in [DEVELOPMENT.md](./DEVELOPMENT.md).
 
 ## Community
 
-Join the [Nexus Client Matrix Room](https://matrix.to/#/#nexus:federated.nexus) for questions or help with developing or using Nexus Client.
+Join the [Nexus Client Matrix room](https://matrix.to/#/#nexus:federated.nexus) for questions or help with developing or using Nexus Client.
 
 # Credits
 

gomuks

@@ -1 +1 @@
-Subproject commit 1f11743884a64765b1444b250377a09ebcaba93c
+Subproject commit 0f8fb261ab57977fa24a4f63b7aafbb9a4ff1b7b

lib/controllers/attachment.dart

@@ -17,18 +17,16 @@ class AttachmentController extends Notifier<(String, MessageContent?)?> {
     final filename = basename(file.path);
     state = (filename, null);
 
-    final room = ref.watch(
-      RoomsController.provider.select((value) => value[roomId]),
+    final isEncrypted = ref.read(
+      RoomsController.provider.select(
+        (value) =>
+            value[roomId]?.state[EventType.encryption.type]?.isNotEmpty == true,
+      ),
     );
 
     final content = await ref
         .watch(ClientController.provider.notifier)
-        .uploadMedia(
-          .new(
-            path: file.path,
-            encrypt: room?.state[EventType.encryption.type]?.isNotEmpty == true,
-          ),
-        );
+        .uploadMedia(.new(path: file.path, encrypt: isEncrypted));
 
     state = (filename, content);
   }

lib/controllers/client.dart

@@ -17,6 +17,7 @@ import "package:nexus/main.dart";
 import "package:nexus/models/content/message.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/oauth_auth_code_response.dart";
+import "package:nexus/models/open_graph_data.dart";
 import "package:nexus/models/paginate.dart";
 import "package:nexus/models/requests/download_media.dart";
 import "package:nexus/models/requests/get_event.dart";
@@ -215,11 +216,6 @@ class ClientController extends AsyncNotifier<int> {
     return response["room_id"];
   }
 
-  Future<String?> getAccessToken() async {
-    final response = await _sendCommand("get_account_info", {});
-    return response?["access_token"];
-  }
-
   Future<void> leaveRoom(Room room) async {
     if (room.metadata == null) return;
     await _sendCommand("leave_room", {"room_id": room.metadata!.id});
@@ -255,6 +251,9 @@ class ClientController extends AsyncNotifier<int> {
     return json == null ? null : .fromJson(json);
   }
 
+  Future<OpenGraphData> getUrlPreview(Uri url) async =>
+      .fromJson(await _sendCommand("get_url_preview", {"url": url.toString()}));
+
   Future<Paginate> paginate(PaginateRequest request) async =>
       .fromJson(await _sendCommand("paginate", request.toJson()));
 

lib/controllers/header.dart

@@ -1,20 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/client_state.dart";
-
-class HeaderController extends AsyncNotifier<Map<String, String>> {
-  @override
-  Future<Map<String, String>> build() async {
-    if (ref.watch(ClientStateController.provider)?.isLoggedIn != true) {
-      return {};
-    }
-    final client = ref.watch(ClientController.provider.notifier);
-    final accessToken = await client.getAccessToken();
-    return {"authorization": "Bearer $accessToken"};
-  }
-
-  static final provider =
-      AsyncNotifierProvider<HeaderController, Map<String, String>>(
-        HeaderController.new,
-      );
-}

lib/controllers/member_list_opened.dart

@@ -0,0 +1,22 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/shared_prefs.dart";
+
+class MemberListOpenedController extends Notifier<bool> {
+  static const String key = "memberListOpened";
+
+  @override
+  bool build() =>
+      ref.watch(SharedPrefsController.provider).requireValue.getBool(key) ??
+      true;
+
+  Future<void> set(bool value) async {
+    final prefs = ref.watch(SharedPrefsController.provider).requireValue;
+    state = value;
+
+    prefs.setBool(key, value);
+  }
+
+  static final provider = NotifierProvider<MemberListOpenedController, bool>(
+    MemberListOpenedController.new,
+  );
+}

lib/controllers/room_chat.dart

@@ -125,11 +125,9 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
     if (relationType == .edit) {
       baseContent = relation?.content;
     } else {
-      final attachment = ref.watch(AttachmentController.provider(roomId));
-      if (attachment != null && attachment.$2 == null) return;
-
-      baseContent = attachment?.$2;
-      ref.invalidate(AttachmentController.provider(roomId));
+      final provider = AttachmentController.provider(roomId);
+      baseContent = ref.watch(provider)?.$2;
+      ref.invalidate(provider);
     }
 
     var taggedMessage = text;

lib/controllers/url_preview.dart

@@ -1,50 +1,28 @@
-import "dart:convert";
+import "package:flutter/widgets.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:http/http.dart";
-import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/header.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/open_graph_data.dart";
 
 class UrlPreviewController extends AsyncNotifier<OpenGraphData?> {
-  final String link;
-  UrlPreviewController(this.link);
+  final Uri url;
+  UrlPreviewController(this.url);
 
   @override
   Future<OpenGraphData?> build() async {
+    if (url.host == "matrix.to") return null;
+
     try {
-      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 (response.statusCode == 200) {
-            final decodedValue = json.decode(response.body);
-            if (decodedValue is! Map<String, dynamic>) return null;
-
-            return .fromJson(
-              decodedValue,
-            ).copyWith(imageUrl: decodedValue["og:image"]);
-          }
-        }
-      }
-    } catch (_) {
+      return await ref
+          .watch(ClientController.provider.notifier)
+          .getUrlPreview(url);
+    } catch (error, stackTrace) {
+      debugPrintStack(label: error.toString(), stackTrace: stackTrace);
       return null;
     }
-    return null;
   }
 
   static final provider =
-      AsyncNotifierProvider.family<
-        UrlPreviewController,
-        OpenGraphData?,
-        String
-      >(UrlPreviewController.new);
+      AsyncNotifierProvider.family<UrlPreviewController, OpenGraphData?, Uri>(
+        UrlPreviewController.new,
+      );
 }

lib/helpers/extensions/get_headers.dart

@@ -1,7 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/header.dart";
-
-extension GetHeaders on WidgetRef {
-  Map<String, String> get headers =>
-      watch(HeaderController.provider).requireValue;
-}

lib/main.dart

@@ -6,7 +6,6 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:media_kit/media_kit.dart";
 import "package:nexus/controllers/client.dart";
 import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/header.dart";
 import "package:nexus/controllers/multi_provider.dart";
 import "package:nexus/controllers/settings.dart";
 import "package:nexus/controllers/shared_prefs.dart";
@@ -144,7 +143,6 @@ class App extends StatelessWidget {
                   IListConst([
                     SharedPrefsController.provider,
                     ClientController.provider,
-                    HeaderController.provider,
                   ]),
                 ),
               )

lib/widgets/composer/composer.dart

@@ -59,7 +59,10 @@ class Composer extends HookConsumerWidget {
     final attachment = ref.watch(AttachmentController.provider(roomId));
 
     void send() {
-      if (controller.value.text.isEmpty && attachment == null) return;
+      if (controller.value.text.isEmpty && attachment == null ||
+          attachment != null && attachment.$2 == null) {
+        return;
+      }
       onSend(
         controller.value.formattedText,
         shouldMention: shouldMention.value,

lib/widgets/players/audio.dart

@@ -1,17 +1,17 @@
 import "dart:async";
-
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:media_kit/media_kit.dart";
-import "package:nexus/helpers/extensions/get_headers.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/info/audio.dart";
 
 class AudioPlayer extends HookConsumerWidget {
-  final Uri url;
+  final Uri uri;
   final AudioInfo? info;
+  final bool encrypted;
 
-  const AudioPlayer(this.url, this.info, {super.key});
+  const AudioPlayer(this.uri, this.info, {this.encrypted = false, super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -24,11 +24,12 @@ class AudioPlayer extends HookConsumerWidget {
     final duration = useState(Duration.zero);
 
     useEffect(() {
+      player.platform?.state = player.platform!.state.copyWith(buffering: true);
       scheduleMicrotask(() async {
-        await player.open(
-          Media(url.toString(), httpHeaders: ref.headers),
-          play: false,
-        );
+        final video = await ref
+            .watch(ClientController.provider.notifier)
+            .downloadMedia(.new(mxc: uri, encrypted: encrypted));
+        await player.open(Media(video.path), play: false);
 
         player.stream.playing.listen((value) {
           playing.value = value;
@@ -67,12 +68,18 @@ class AudioPlayer extends HookConsumerWidget {
           padding: .only(left: 8, right: 16),
           child: Row(
             children: [
-              IconButton(
-                onPressed: player.playOrPause,
-                icon: Icon(
-                  playing.value ? Icons.pause_circle : Icons.play_circle,
+              if (player.state.buffering)
+                SizedBox.square(
+                  dimension: 24,
+                  child: CircularProgressIndicator(padding: .all(4)),
+                )
+              else
+                IconButton(
+                  onPressed: player.playOrPause,
+                  icon: Icon(
+                    playing.value ? Icons.pause_circle : Icons.play_circle,
+                  ),
                 ),
-              ),
               SizedBox(width: 8),
               Text(
                 format(position.value),

lib/widgets/players/video.dart

@@ -2,16 +2,17 @@ import "dart:async";
 
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/info/video.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:media_kit/media_kit.dart";
 import "package:media_kit_video/media_kit_video.dart";
-import "package:nexus/helpers/extensions/get_headers.dart";
 
 class VideoPlayer extends HookConsumerWidget {
   final VideoInfo? info;
-  final Uri url;
-  const VideoPlayer(this.url, this.info, {super.key});
+  final Uri uri;
+  final bool encrypted;
+  const VideoPlayer(this.uri, this.info, {this.encrypted = false, super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -21,12 +22,13 @@ class VideoPlayer extends HookConsumerWidget {
     final controller = useMemoized(() => VideoController(player));
 
     useEffect(() {
-      scheduleMicrotask(
-        () => player.open(
-          Media(url.toString(), httpHeaders: ref.headers),
-          play: false,
-        ),
-      );
+      player.platform?.state = player.platform!.state.copyWith(buffering: true);
+      scheduleMicrotask(() async {
+        final video = await ref
+            .watch(ClientController.provider.notifier)
+            .downloadMedia(.new(mxc: uri, encrypted: encrypted));
+        await player.open(Media(video.path), play: false);
+      });
 
       return player.dispose;
     }, []);

lib/widgets/renderers/event.dart

@@ -216,10 +216,13 @@ class EventRenderer extends HookConsumerWidget {
               if (event.content is! MessageContent) ReactionRow(event),
 
               if (event.sendError != null && event.sendError != "not sent")
-                Text(
-                  event.sendError!,
-                  style: theme.textTheme.labelSmall?.copyWith(
-                    color: theme.colorScheme.error,
+                Padding(
+                  padding: .only(bottom: 4),
+                  child: Text(
+                    event.sendError!,
+                    style: theme.textTheme.labelSmall?.copyWith(
+                      color: theme.colorScheme.error,
+                    ),
                   ),
                 ),
             ].map((child) => Padding(padding: .only(left: 4), child: child)),

lib/widgets/renderers/message.dart

@@ -226,10 +226,25 @@ class MessageRenderer extends ConsumerWidget {
                                 ConstrainedBox(
                                   constraints: .loose(.square(500)),
                                   child: switch (event.content) {
-                                    VideoMessageContent(:final info) =>
-                                      VideoPlayer(url, info),
-                                    AudioMessageContent(:final info) =>
-                                      AudioPlayer(url, info),
+                                    VideoMessageContent(
+                                      :final info,
+                                      :final file,
+                                    ) =>
+                                      VideoPlayer(
+                                        url,
+                                        info,
+                                        encrypted: file != null,
+                                      ),
+                                    AudioMessageContent(
+                                      :final info,
+                                      :final file,
+                                    ) =>
+                                      AudioPlayer(
+                                        url,
+                                        info,
+
+                                        encrypted: file != null,
+                                      ),
                                     FileMessageContent(
                                       :final info,
                                       :final filename,
@@ -258,7 +273,8 @@ class MessageRenderer extends ConsumerWidget {
                                     (element) => element is UrlElement,
                                   )
                                   case final UrlElement link?)
-                                UrlPreview(link.url),
+                                if (Uri.tryParse(link.url) case final Uri url?)
+                                  UrlPreview(url),
 
                               ReactionRow(event),
                             ],
@@ -270,9 +286,8 @@ class MessageRenderer extends ConsumerWidget {
                                   "This message is redacted",
                                   style: errorStyle,
                                 )
-                              : Row(
+                              : Wrap(
                                   spacing: 8,
-                                  mainAxisSize: .min,
                                   children: [
                                     Text(
                                       "Unknown message type:",

lib/widgets/room_chat.dart

@@ -7,6 +7,7 @@ import "package:measure_size/measure_size.dart";
 import "package:nexus/controllers/account_data.dart";
 import "package:nexus/controllers/client.dart";
 import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/member_list_opened.dart";
 import "package:nexus/controllers/pinned_ids.dart";
 import "package:nexus/controllers/power_level.dart";
 import "package:nexus/controllers/rooms.dart";
@@ -46,9 +47,8 @@ class RoomChat extends HookConsumerWidget {
 
     final composerSize = useState<double>(64);
 
-    final memberListOpened = useState<bool>(showMembersByDefault);
-
     final userId = ref.watch(ClientStateController.provider)?.userId;
+    final memberListOpened = ref.watch(MemberListOpenedController.provider);
     final theme = Theme.of(context);
 
     final nothing = Center(
@@ -448,7 +448,9 @@ class RoomChat extends HookConsumerWidget {
             isDesktop: isDesktop,
             onOpenDrawer: Scaffold.of(context).openDrawer,
             onOpenMemberList: (thisContext) {
-              memberListOpened.value = !memberListOpened.value;
+              ref
+                  .watch(MemberListOpenedController.provider.notifier)
+                  .set(!memberListOpened);
               Scaffold.of(thisContext).openEndDrawer();
             },
             onOpenPinnedMessagesList: () {
@@ -553,7 +555,7 @@ class RoomChat extends HookConsumerWidget {
                 ),
               ),
 
-              if (memberListOpened.value == true && showMembersByDefault)
+              if (memberListOpened == true && showMembersByDefault)
                 MemberList(roomId),
             ],
           ),

lib/widgets/url_preview.dart

@@ -6,7 +6,7 @@ import "package:nexus/helpers/launch_helper.dart";
 import "package:nexus/helpers/mxc_image.dart";
 
 class UrlPreview extends ConsumerWidget {
-  final String link;
+  final Uri link;
   const UrlPreview(this.link, {super.key});
 
   @override
@@ -18,8 +18,7 @@ class UrlPreview extends ConsumerWidget {
           data: (preview) => preview == null
               ? SizedBox.shrink()
               : InkWell(
-                  onTap: () =>
-                      ref.watch(LaunchHelper.provider).launchUrl(.parse(link)),
+                  onTap: () => ref.watch(LaunchHelper.provider).launchUrl(link),
                   child: Card(
                     margin: .symmetric(vertical: 4),
                     color: Theme.of(

linux/nix/devshell.nix

@@ -18,25 +18,25 @@ let
   };
 in
 pkgs.mkShell {
-  packages = with pkgs; [
-    go
-    git
-    jdk17
-    libGL
-    wayland
-    (flutter.override {
-      extraPkgConfigPackages = [
-        mpv-unwrapped
-        libass
-      ];
-    })
-    android.platform-tools
-  ];
+  packages =
+    with pkgs;
+    [
+      go
+      git
+      jdk17
+      libGL
+      (flutter.override {
+        extraPkgConfigPackages = [
+          mpv-unwrapped
+          libass
+        ];
+      })
+      android.platform-tools
+    ]
+    ++ lib.optional pkgs.stdenv.isLinux wayland;
 
   env = rec {
     LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
-    LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
-    CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
 
     ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
     ANDROID_SDK_ROOT = ANDROID_HOME;
@@ -44,5 +44,9 @@ pkgs.mkShell {
 
     TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
     GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
+  }
+  // lib.optionalAttrs pkgs.stdenv.isLinux {
+    CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
+    LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
   };
 }

linux/nix/pkg/default.nix

@@ -44,7 +44,7 @@ flutter.buildFlutterApplication {
   meta = {
     description = "A simple and user-friendly Matrix client";
     mainProgram = "nexus";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ quadradical ];
   };
 }

linux/nix/pkg/gomuks.nix

@@ -1,31 +1,38 @@
 {
   src,
+  stdenv,
   buildGoModule,
 }:
 
-buildGoModule (finalAttrs: {
-  pname = "gomuks-ffi";
-  version = "submodule";
+buildGoModule (
+  finalAttrs:
+  let
+    filename = "libgomuks${stdenv.hostPlatform.extensions.sharedLibrary}";
+  in
+  {
+    pname = "gomuks-ffi";
+    version = "submodule";
 
-  doCheck = false;
+    doCheck = false;
 
-  src = "${src}/gomuks";
+    src = "${src}/gomuks";
 
-  vendorHash = "sha256-4QU51WGiNKYm7z/ajnas2qQaMK5BgyHwPfmNpQvW0qg=";
+    vendorHash = "sha256-4QU51WGiNKYm7z/ajnas2qQaMK5BgyHwPfmNpQvW0qg=";
 
-  buildPhase = ''
-    runHook preBuild
+    buildPhase = ''
+      runHook preBuild
 
-    go build -buildmode=c-shared -o libgomuks.so -tags goolm,noheic,sqlite_fts5 ./pkg/ffi 
+      go build -buildmode=c-shared -o ${filename} -tags goolm,noheic,sqlite_fts5 ./pkg/ffi 
 
-    runHook postBuild
-  '';
+      runHook postBuild
+    '';
 
-  installPhase = ''
-    runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-    install -Dm0644 libgomuks.so -t $out/lib
+      install -Dm0644 ${filename} -t $out/lib
 
-    runHook postInstall
-  '';
-})
+      runHook postInstall
+    '';
+  }
+)

scripts/generate.dart

@@ -24,7 +24,18 @@ void main(List<String> args) async {
   ).generate(
     libclangDylib: libclangPath == null
         ? null
-        : Uri.file(join(libclangPath, "libclang.so")),
+        : Uri.file(
+            join(
+              libclangPath,
+              "libclang.${(Platform.isLinux || Platform.isAndroid)
+                  ? "so"
+                  : Platform.isMacOS
+                  ? "dylib"
+                  : Platform.isWindows
+                  ? "dll"
+                  : throw UnsupportedError("Unsupported Platform")}",
+            ),
+          ),
   );
   print("Done!");
 }