set min version of macos to 13.0

this looks better in the macos launcher squircles

.github/workflows/macos.yml

@@ -26,15 +26,22 @@ jobs:
               with:
                   go-version-file: gomuks/go.mod
 
-            - name: Build app
+            - name: Build App
               run: |
                   flutter pub get
                   dart scripts/generate.dart
                   flutter pub run build_runner build
                   flutter build macos --release
 
-            - name: Upload installer artifact
+            - name: Create DMG
+              id: create-dmg
+              uses: L-Super/create-dmg-actions@28511e988b13ca34096d439159a66d468b8e724f
+              with:
+                  dmg_name: nexus
+                  src_dir: build/macos/Build/Products/Release/Nexus.app
+
+            - name: Upload DMG
               uses: actions/upload-artifact@v6
               with:
-                  name: Nexus.App
-                  path: build/macos/Build/Products/Release/Nexus.app
+                  name: nexus.dmg
+                  path: ${{ steps.create-dmg.outputs.dmg_path }}

README.md

@@ -19,7 +19,7 @@ A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
     - [x] Linux
     - [x] Windows - Currently has some bugs, due to us not having any developers on Windows. If you want to fix these, get in contact with us though the [Nexus Client Matrix room](https://matrix.to/#/#nexus:federated.nexus).
     - [x] Android
-    - [x] MacOS - Unsigned .App only
+    - [x] MacOS - Unsigned .dmg only
     - [x] iOS - Unsigned .ipa only
     - [ ] Web (may not be possible)
 - [x] Login (via OAuth)
@@ -117,7 +117,7 @@ If you want to try out Nexus, grab one of the following artifacts from CI:
 - [Android APK](https://nightly.link/Henry-Hiles/nexus/workflows/android/main/APK.zip)
 - [Windows EXE](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-installer.zip)
 - [Unsigned iOS IPA](https://nightly.link/Henry-Hiles/nexus/workflows/ios/main/Nexus.ipa.zip)
-- [Unsigned MacOS App](https://nightly.link/Henry-Hiles/nexus/workflows/macos/main/Nexus.App.zip)
+- [Unsigned MacOS DMG](https://nightly.link/Henry-Hiles/nexus/workflows/macos/main/nexus.dmg.zip)
 - [Windows EXE](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-installer.zip)
 - Flatpak
     - [AArch64/Arm64](https://nightly.link/Henry-Hiles/nexus/workflows/flatpak/main/flatpak-aarch64.zip)

hook/build.dart

@@ -50,7 +50,10 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
       break;
     case OS.macOS:
       libFileName = "libgomuks.dylib";
-      extraEnv = {"SDKROOT": await getXCodeTool()};
+      extraEnv = {
+        "SDKROOT": await getXCodeTool(),
+        "MACOSX_DEPLOYMENT_TARGET": codeConfig.macOS.targetVersion.toString(),
+      };
       break;
     case OS.windows:
       libFileName = "libgomuks.dll";

lib/controllers/client.dart

@@ -38,6 +38,7 @@ import "package:nexus/models/requests/set_membership.dart";
 import "package:nexus/models/requests/set_state.dart";
 import "package:nexus/models/requests/upload_media.dart";
 import "package:nexus/models/room.dart";
+import "package:nexus/models/room_summary.dart";
 import "package:nexus/models/spec_versions_response.dart";
 import "package:nexus/models/sync_data.dart";
 import "package:nexus/src/third_party/gomuks.g.dart";
@@ -213,10 +214,11 @@ class ClientController extends AsyncNotifier<int> {
     }
   }
 
-  Future<String> joinRoom(JoinRoomRequest request) async {
-    final response = await _sendCommand("join_room", request.toJson());
-    return response["room_id"];
-  }
+  Future<String> joinRoom(JoinRoomRequest request) async =>
+      (await _sendCommand("join_room", request.toJson()))["room_id"];
+
+  Future<RoomSummary> getRoomSummary(JoinRoomRequest request) async =>
+      .fromJson(await _sendCommand("get_room_summary", request.toJson()));
 
   Future<void> leaveRoom(Room room) async {
     if (room.metadata == null) return;
@@ -311,7 +313,7 @@ class ClientController extends AsyncNotifier<int> {
   Future<Uri?> discoverHomeserver(Uri homeserver) async {
     try {
       final response = await _sendCommand("discover_homeserver", {
-        "user_id": "@fake-user:${homeserver.host}",
+        "user_id": "@fake-user:${homeserver.authority}",
       });
       return Uri.parse(response["m.homeserver"]?["base_url"]);
     } catch (error) {

lib/controllers/room_chat.dart

@@ -75,12 +75,13 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
       );
 
   Future<bool> loadOlder() async {
+    state = AsyncLoading();
     final timelineKeys = ref
         .read(RoomsController.provider.select((value) => value[roomId]))
         ?.timeline
         .keys;
     final response = await ref
-        .watch(ClientController.provider.notifier)
+        .read(ClientController.provider.notifier)
         .paginate(
           .new(
             roomId: roomId,
@@ -90,26 +91,30 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
           ),
         );
 
-    ref
-        .watch(RoomsController.provider.notifier)
-        .update(
-          IMap({
-            roomId: Room(
-              events: IMap.fromIterable(
-                response.events.addAll(response.relatedEvents),
-                keyMapper: (event) => event.rowId,
-                valueMapper: (event) => event,
+    if (response.events.isEmpty) {
+      state = .data(state.value);
+    } else {
+      ref
+          .read(RoomsController.provider.notifier)
+          .update(
+            IMap({
+              roomId: Room(
+                events: IMap.fromIterable(
+                  response.events.addAll(response.relatedEvents),
+                  keyMapper: (event) => event.rowId,
+                  valueMapper: (event) => event,
+                ),
+                hasMore: response.hasMore,
+                timeline: IMap.fromIterable(
+                  response.events,
+                  keyMapper: (event) => event.timelineRowId,
+                  valueMapper: (event) => event.rowId,
+                ),
               ),
-              hasMore: response.hasMore,
-              timeline: IMap.fromIterable(
-                response.events,
-                keyMapper: (event) => event.timelineRowId,
-                valueMapper: (event) => event.rowId,
-              ),
-            ),
-          }),
-          .new(),
-        );
+            }),
+            .new(),
+          );
+    }
 
     return response.hasMore;
   }

lib/controllers/room_summary.dart

@@ -0,0 +1,18 @@
+import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/client.dart";
+import "package:nexus/models/requests/join_room.dart";
+import "package:nexus/models/room_summary.dart";
+
+class RoomSummaryController extends AsyncNotifier<RoomSummary> {
+  final JoinRoomRequest request;
+  RoomSummaryController(this.request);
+
+  @override
+  Future<RoomSummary> build() =>
+      ref.watch(ClientController.provider.notifier).getRoomSummary(request);
+
+  static final provider = AsyncNotifierProvider.family
+      .autoDispose<RoomSummaryController, RoomSummary, JoinRoomRequest>(
+        RoomSummaryController.new,
+      );
+}

lib/controllers/settings.dart

@@ -9,14 +9,14 @@ class SettingsController extends AsyncNotifier<Settings> {
     final file = await ref.watch(SettingsFileController.provider.future);
 
     try {
-      return Settings.fromJson(json.decode(await file.readAsString()));
+      return .fromJson(json.decode(await file.readAsString()));
     } catch (_) {
-      return Settings();
+      return .new();
     }
   }
 
   Future<void> set(Settings settings) async {
-    state = AsyncData(settings);
+    state = .data(settings);
     final file = await ref.watch(SettingsFileController.provider.future);
     await file.writeAsString(json.encode(settings.toJson()));
   }

lib/helpers/extensions/link_to_mention.dart

@@ -9,6 +9,7 @@ extension LinkToMention on String {
   ///
   /// Returns the decoded identifier (e.g. "#room:matrix.org")
   /// or null if this is not a Matrix link.
+  /// TODO: Needs to be reworked to handle event links. Might be worth just rewriting, I don't like this code.
   String? get mention {
     final trimmed = trim();
 

lib/models/requests/join_room.dart

@@ -7,7 +7,7 @@ part "join_room.g.dart";
 abstract class JoinRoomRequest with _$JoinRoomRequest {
   const factory JoinRoomRequest({
     required String roomIdOrAlias,
-    required IList<String> via,
+    @Default(IList.empty()) IList<String> via,
   }) = _JoinRoomRequest;
 
   factory JoinRoomRequest.fromJson(Map<String, Object?> json) =>

lib/models/room_summary.dart

@@ -0,0 +1,23 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+import "package:nexus/models/content/create.dart";
+import "package:nexus/models/join_rule.dart";
+part "room_summary.freezed.dart";
+part "room_summary.g.dart";
+
+@freezed
+abstract class RoomSummary with _$RoomSummary {
+  const factory RoomSummary({
+    required String roomId,
+    @JsonKey(name: "num_joined_members") required int joinedMembers,
+    JoinRule? joinRule,
+    String? name,
+    Uri? avatarUrl,
+    String? canonicalAlias,
+    String? topic,
+    String? roomVersion,
+    @JsonKey(unknownEnumValue: RoomType.room) RoomType? roomType,
+  }) = _RoomSummary;
+
+  factory RoomSummary.fromJson(Map<String, Object?> json) =>
+      _$RoomSummaryFromJson(json);
+}

lib/pages/select_server.dart

@@ -26,6 +26,17 @@ class SelectServerPage extends HookConsumerWidget {
     final homeserverUrl = useTextEditingController();
 
     Future<void> setHomeserver(Uri? newHomeserver) async {
+      if (newHomeserver == null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              "Failed to parse homeserver URL. Are you sure you typed it correctly?",
+              style: .new(color: theme.colorScheme.onErrorContainer),
+            ),
+            backgroundColor: theme.colorScheme.errorContainer,
+          ),
+        );
+      }
       isLoading.value = true;
 
       try {
@@ -33,26 +44,14 @@ class SelectServerPage extends HookConsumerWidget {
           newHomeserver = Uri.https(newHomeserver!.path);
         }
 
-        final newUrl = newHomeserver == null
-            ? null
-            : await ref
-                  .read(ClientController.provider.notifier)
-                  .discoverHomeserver(newHomeserver);
+        final newUrl = await ref
+            .read(ClientController.provider.notifier)
+            .discoverHomeserver(newHomeserver!);
 
         if (context.mounted) {
-          if (newUrl == null) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(
-                  "Homeserver verification failed. Is your homeserver down?",
-                  style: .new(color: theme.colorScheme.onErrorContainer),
-                ),
-                backgroundColor: theme.colorScheme.errorContainer,
-              ),
-            );
-          } else {
+          Future<void> tryLogin(Uri url) async {
             final codeResponse = await ref.watch(
-              AuthUrlController.provider(newUrl).future,
+              AuthUrlController.provider(url).future,
             );
 
             await ref.watch(LaunchHelper.provider).launchUrl(codeResponse.url);
@@ -70,7 +69,7 @@ class SelectServerPage extends HookConsumerWidget {
                       .watch(ClientController.provider.notifier)
                       .exchangeToken(
                         .new(
-                          homeserverUrl: newUrl,
+                          homeserverUrl: url,
                           codeVerifier: codeResponse.codeVerifier,
                           redirectUri: .new(
                             scheme: "nexus.federated.nexus",
@@ -78,7 +77,7 @@ class SelectServerPage extends HookConsumerWidget {
                           ),
                           code: code,
                           clientId: await ref.watch(
-                            ClientIdController.provider(newUrl).future,
+                            ClientIdController.provider(url).future,
                           ),
                         ),
                       )
@@ -89,6 +88,25 @@ class SelectServerPage extends HookConsumerWidget {
               }
             });
           }
+
+          if (newUrl == null) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  "Homeserver verification failed.",
+                  style: .new(color: theme.colorScheme.onErrorContainer),
+                ),
+                action: SnackBarAction(
+                  onPressed: () => tryLogin(newHomeserver!),
+                  label: "Attempt log in anyways",
+                  textColor: theme.colorScheme.onErrorContainer,
+                ),
+                backgroundColor: theme.colorScheme.errorContainer,
+              ),
+            );
+          } else {
+            tryLogin(newUrl);
+          }
         }
       } catch (error, stackTrace) {
         showError(error, stackTrace);

lib/widgets/html/mention_chip.dart

@@ -1,8 +1,11 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/room_summary.dart";
 import "package:nexus/controllers/user.dart";
 import "package:nexus/helpers/extensions/link_to_mention.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
+import "package:nexus/models/content/membership.dart";
+import "package:nexus/models/room_summary.dart";
 
 class MentionChip extends ConsumerWidget {
   final String? roomId;
@@ -12,29 +15,48 @@ class MentionChip extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final mention = content.mention;
-    final membership = mention?.startsWith("@") == true
-        ? ref
-              .watch(
-                UserController.provider(.new(roomId: roomId, userId: mention!)),
-              )
-              .whenOrNull(data: (data) => data)
-        : null;
+    final data = switch (mention?.characters.firstOrNull) {
+      "@" =>
+        ref
+            .watch(
+              UserController.provider(.new(roomId: roomId, userId: mention!)),
+            )
+            .whenOrNull(data: (data) => data),
+
+      "#" || "!" =>
+        ref
+            .watch(
+              RoomSummaryController.provider(.new(roomIdOrAlias: mention!)),
+            )
+            .whenOrNull(data: (data) => data),
+
+      _ => null,
+    };
 
     return mention == null
         ? SizedBox.shrink()
         : InkWell(
             onTap: () {
-              if (membership != null) {
+              if (data case MembershipContent membership) {
                 context.showUserPopover(membership, mention, roomId: roomId);
+              } else if (data case RoomSummary summary) {
+                // TODO: Handle summary
               }
             },
             child: IgnorePointer(
               child: Chip(
                 label: Text(
-                  (membership?.displayName == null
-                          ? null
-                          : "@${membership!.displayName}") ??
-                      mention,
+                  switch (data) {
+                    RoomSummary summary =>
+                      (summary.name == null ? null : "#${summary.name}") ??
+                          summary.canonicalAlias ??
+                          summary.roomId,
+                    MembershipContent membership =>
+                      membership.displayName == null
+                          ? mention
+                          : "@${membership.displayName}",
+                    _ => mention,
+                  },
                   style: .new(
                     fontWeight: .bold,
                     color: Theme.of(context).colorScheme.onPrimary,

lib/widgets/room_chat.dart

@@ -80,6 +80,7 @@ class RoomChat extends HookConsumerWidget {
     final controllerData = ref.watch(controllerProvider);
 
     final topEventBeforeLoad = useState<String?>(null);
+    final hasMore = useState<bool>(true);
 
     Future<void> jumpToId(String eventId) async {
       final index = controllerData.value?.indexWhere(
@@ -105,7 +106,7 @@ class RoomChat extends HookConsumerWidget {
     Future<void> loadOlder() async {
       if (controllerData case AsyncData(:final value?)) {
         topEventBeforeLoad.value = value.firstOrNull?.eventId;
-        await notifier.loadOlder();
+        hasMore.value = await notifier.loadOlder();
       }
     }
 
@@ -310,7 +311,7 @@ class RoomChat extends HookConsumerWidget {
             await Clipboard.setData(
               ClipboardData(
                 text:
-                    "matrix:roomid/${room.metadata?.id.substring(1)}/e/${event.eventId}$vias)",
+                    "matrix:roomid/${room.metadata?.id.substring(1)}/e/${event.eventId}$vias",
               ),
             );
           },
@@ -470,19 +471,20 @@ class RoomChat extends HookConsumerWidget {
                                 ScrollViewKeyboardDismissBehavior.onDrag,
                             controller: scrollController,
                             slivers: [
-                              SliverToBoxAdapter(
-                                child: Padding(
-                                  padding: .symmetric(vertical: 36),
-                                  child: Center(
-                                    child: ElevatedButton(
-                                      onPressed: controllerData is AsyncData
-                                          ? loadOlder
-                                          : null,
-                                      child: Text("Load More"),
+                              if (hasMore.value)
+                                SliverToBoxAdapter(
+                                  child: Padding(
+                                    padding: .symmetric(vertical: 36),
+                                    child: Center(
+                                      child: ElevatedButton(
+                                        onPressed: controllerData is AsyncData
+                                            ? loadOlder
+                                            : null,
+                                        child: Text("Load More"),
+                                      ),
                                     ),
                                   ),
                                 ),
-                              ),
 
                               SuperSliverList.builder(
                                 listController: listController.value,

lib/widgets/room_menu.dart

@@ -35,8 +35,7 @@ class RoomMenu extends ConsumerWidget {
 
               await Clipboard.setData(
                 .new(
-                  text:
-                      "matrix:roomid/${room!.metadata?.id.substring(1)}$vias)",
+                  text: "matrix:roomid/${room!.metadata?.id.substring(1)}$vias",
                 ),
               );
             },

macos/Podfile

@@ -1,4 +1,4 @@
-platform :osx, '10.15'
+platform :osx, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

macos/Runner.xcodeproj/project.pbxproj

@@ -567,7 +567,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -649,7 +649,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -699,7 +699,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
+    "info": {
+        "version": 1,
+        "author": "xcode"
     },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
+    "images": [
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_16.png",
+            "scale": "1x"
+        },
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "2x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "1x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_64.png",
+            "scale": "2x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_128.png",
+            "scale": "1x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "2x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "1x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "2x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "1x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_1024.png",
+            "scale": "2x"
+        }
+    ]
 }

pubspec.yaml

@@ -87,12 +87,15 @@ dev_dependencies:
     json_serializable: 6.14.1
 
 flutter_launcher_icons:
-    ios: true
-    android: true
     image_path: assets/icon.png
+    ios: true
+    image_path_ios: assets/mobile.png
+    android: true
     adaptive_icon_background: assets/background.png
     adaptive_icon_foreground: assets/foreground.png
     adaptive_icon_monochrome: assets/monochrome.png
-    remove_alpha_ios: true
     windows:
         generate: true
+    macos:
+        generate: true
+        image_path: assets/mobile.png