From 29960748383d1742996bd06a79074bc8cc455949 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 22 Jan 2026 17:05:59 +0000 Subject: [PATCH 01/34] wip go --- analysis_options.yaml | 1 + devtools_options.yaml | 3 - flake.nix | 7 +- hook/build.dart | 111 +++++++++++++++++++++++++ lib/controllers/client_controller.dart | 27 ++++-- pubspec.lock | 43 ++++++++-- pubspec.yaml | 9 +- 7 files changed, 179 insertions(+), 22 deletions(-) delete mode 100644 devtools_options.yaml create mode 100644 hook/build.dart diff --git a/analysis_options.yaml b/analysis_options.yaml index c2aaaa0..a8b1078 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,6 +1,7 @@ analyzer: errors: invalid_annotation_target: ignore + avoid_print: ignore exclude: - "build/**" - "**/*.g.dart" diff --git a/devtools_options.yaml b/devtools_options.yaml deleted file mode 100644 index fa0b357..0000000 --- a/devtools_options.yaml +++ /dev/null @@ -1,3 +0,0 @@ -description: This file stores settings for Dart & Flutter DevTools. -documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states -extensions: diff --git a/flake.nix b/flake.nix index 027db59..0d380af 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ _module.args.pkgs = import nixpkgs { inherit system; config = { + permittedInsecurePackages = [ "olm-3.2.16" ]; android_sdk.accept_license = true; allowUnfree = true; }; @@ -44,7 +45,11 @@ pkgs.mkShell { packages = with pkgs; [ # jdk17 + go + olm + git cargo + clang (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; }) # android.platform-tools @@ -56,7 +61,7 @@ pkgs.lib.makeLibraryPath ([ pkgs.sqlite ]) - }:./build/linux/x64/debug/plugins/flutter_vodozemac"; + }:./.dart_tool/hooks_runner/shared/nexus/build/gomuks"; # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; # ANDROID_SDK_ROOT = ANDROID_HOME; diff --git a/hook/build.dart b/hook/build.dart new file mode 100644 index 0000000..a8f43b3 --- /dev/null +++ b/hook/build.dart @@ -0,0 +1,111 @@ +import "dart:io"; +import "package:hooks/hooks.dart"; +import "package:code_assets/code_assets.dart"; +import "package:path/path.dart"; +import "package:ffigen/ffigen.dart"; + +Future main(List args) => build(args, (input, output) async { + final targetOS = input.config.code.targetOS; + final targetArch = input.config.code.targetArchitecture; + String libFileName; + switch (targetOS) { + case OS.linux: + libFileName = "libgomuks.so"; + break; + case OS.macOS: + libFileName = "libgomuks.dylib"; + break; + case OS.windows: + libFileName = "libgomuks.dll"; + break; + default: + throw UnsupportedError("Unsupported OS: $targetOS"); + } + + // Where we put the Gomuks repo and compiled library + final buildDir = Directory.fromUri( + input.outputDirectoryShared.resolve("gomuks/"), + ); + if (!await buildDir.exists()) await buildDir.create(recursive: true); + + final repoDir = Directory(join(buildDir.path, "source")); + + bool skipBuild = false; + + final generatedSourcePath = "src/third_party/gomuks.g.dart"; + final generatedLibPath = input.packageRoot.resolve( + join("lib", generatedSourcePath), + ); + final bindingsFile = File(generatedLibPath.toFilePath()); + + if (await bindingsFile.exists() && + await File(join(buildDir.path, libFileName)).exists() && + await repoDir.exists()) { + final result = await Process.run("git", [ + "fetch", + "--dry-run", + ], workingDirectory: repoDir.path); + + if ((result.stdout as String).trim().isEmpty) { + skipBuild = true; + } + } + + if (skipBuild) { + return print( + "Gomuks build skipped: bindings and library exist and repo is up to date.", + ); + } + + if (await repoDir.exists()) await repoDir.delete(recursive: true); + + print("Cloning Gomuks repository..."); + final cloneResult = await Process.run("git", [ + "clone", + "--depth", + "1", + "--branch", + "tulir/ffi", + "https://mau.dev/gomuks/gomuks", + repoDir.path, + ]); + if (cloneResult.exitCode != 0) { + throw Exception( + "Failed to clone Gomuks repository: \n${cloneResult.stderr}", + ); + } + + final libFile = File(join(buildDir.path, libFileName)); + + print("Building Gomuks shared library for $targetOS/$targetArch..."); + final result = await Process.run("go", [ + "build", + "-o", + libFile.path, + "-buildmode=c-shared", + ], workingDirectory: join(repoDir.path, "pkg/ffi")); + + if (result.exitCode != 0) { + throw Exception("Failed to build Gomuks shared library\n${result.stderr}"); + } + + // Add the library as a code asset so Dart can find it + output.assets.code.add( + CodeAsset( + package: "nexus", + name: "src/third_party/gomuks.g.dart", + linkMode: DynamicLoadingBundled(), + file: libFile.uri, + ), + ); + output.dependencies.add(libFile.uri); + + print("Generating FFI Bindings..."); + FfiGenerator( + output: Output(dartFile: generatedLibPath), + headers: Headers( + entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], + ), + functions: Functions.includeAll, + ).generate(); +}); diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 9f69e8f..13bc0eb 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,15 +1,24 @@ import "dart:convert"; +import "dart:ffi"; import "dart:io"; +import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; import "package:matrix/encryption.dart"; import "package:nexus/controllers/database_controller.dart"; -import "package:vodozemac/vodozemac.dart" as vod; -import "package:flutter_vodozemac/flutter_vodozemac.dart" as fl_vod; +import "package:nexus/src/third_party/gomuks.g.dart"; import "package:matrix/matrix.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/secure_storage_controller.dart"; import "package:nexus/models/session_backup.dart"; +void gomuksCallback(Pointer command, int requestId, GomuksBuffer data) { + // Convert the C string to Dart + final cmdStr = command.cast().toDartString(); + print("Received event: $cmdStr (requestId=$requestId)"); + + // Optionally inspect 'data' if you need +} + class ClientController extends AsyncNotifier { @override bool updateShouldNotify( @@ -22,7 +31,15 @@ class ClientController extends AsyncNotifier { @override Future build() async { - if (!vod.isInitialized()) fl_vod.init(); + final handle = GomuksInit(); + + GomuksStart( + handle, + Pointer.fromFunction, Int64, GomuksBuffer)>( + gomuksCallback, + ), + ); + final client = Client( "nexus", logLevel: kReleaseMode ? Level.warning : Level.verbose, @@ -33,10 +50,6 @@ class ClientController extends AsyncNotifier { "nexus", database: await ref.watch(DatabaseController.provider.future), ), - nativeImplementations: NativeImplementationsIsolate( - compute, - vodozemacInit: fl_vod.init, - ), ); final backupJson = await ref diff --git a/pubspec.lock b/pubspec.lock index 01d55a5..49a2fc3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -217,6 +217,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" + code_assets: + dependency: "direct main" + description: + name: code_assets + sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" + url: "https://pub.dev" + source: hosted + version: "1.0.0" code_builder: dependency: transitive description: @@ -394,13 +402,21 @@ packages: source: hosted version: "11.1.0" ffi: - dependency: transitive + dependency: "direct main" description: name: ffi sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c url: "https://pub.dev" source: hosted version: "2.1.5" + ffigen: + dependency: "direct main" + description: + name: ffigen + sha256: b7803707faeec4ce3c1b0c2274906504b796e3b70ad573577e72333bd1c9b3ba + url: "https://pub.dev" + source: hosted + version: "20.1.1" file: dependency: transitive description: @@ -728,6 +744,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + hooks: + dependency: "direct main" + description: + name: hooks + sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7" + url: "https://pub.dev" + source: hosted + version: "1.0.0" hooks_riverpod: dependency: "direct main" description: @@ -1160,6 +1184,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + quiver: + dependency: transitive + description: + name: quiver + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 + url: "https://pub.dev" + source: hosted + version: "3.2.2" random_string: dependency: transitive description: @@ -1672,11 +1704,10 @@ packages: vodozemac: dependency: "direct main" description: - path: dart - ref: "krille/use-specced-olm-session-config" - resolved-ref: "8770e0555b1bb692e3e1a43a7726b27eae285b20" - url: "https://github.com/famedly/dart-vodozemac" - source: git + name: vodozemac + sha256: "39144e20740807731871c9248d811ed5a037b21d0aa9ffcfa630954de74139d9" + url: "https://pub.dev" + source: hosted version: "0.4.0" watcher: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index e733f2e..0e9adce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,11 +12,6 @@ environment: sdk: "^3.9.2" dependency_overrides: - vodozemac: - git: - url: https://github.com/famedly/dart-vodozemac - ref: krille/use-specced-olm-session-config - path: dart analyzer: ^8.4.0 source_gen: ^4.0.2 flutter_hooks: ^0.21.2 @@ -74,6 +69,10 @@ dependencies: dynamic_polls: ^0.0.6 flutter_hooks: ^0.21.3+1 cross_cache: ^1.1.0 + ffi: ^2.1.5 + hooks: ^1.0.0 + code_assets: ^1.0.0 + ffigen: ^20.1.1 dev_dependencies: build_runner: ^2.4.11 From a012a2e762d5e74815e0616338122f67c74d8e82 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 23 Jan 2026 13:47:21 +0000 Subject: [PATCH 02/34] wip go 2 --- build.yaml | 6 ++ lib/controllers/client_controller.dart | 124 +++++++--------------- lib/helpers/extensions/gomuks_buffer.dart | 41 +++++++ lib/main.dart | 77 +++++++------- lib/models/client_state.dart | 15 +++ lib/models/full_room.dart | 13 --- lib/models/homeserver.dart | 12 --- lib/models/image_data.dart | 11 -- lib/models/relation_type.dart | 1 - lib/models/session_backup.dart | 17 --- lib/models/space.dart | 20 ---- lib/models/sync_status.dart | 18 ++++ 12 files changed, 156 insertions(+), 199 deletions(-) create mode 100644 build.yaml create mode 100644 lib/helpers/extensions/gomuks_buffer.dart create mode 100644 lib/models/client_state.dart delete mode 100644 lib/models/full_room.dart delete mode 100644 lib/models/homeserver.dart delete mode 100644 lib/models/image_data.dart delete mode 100644 lib/models/relation_type.dart delete mode 100644 lib/models/session_backup.dart delete mode 100644 lib/models/space.dart create mode 100644 lib/models/sync_status.dart diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..5d6aeda --- /dev/null +++ b/build.yaml @@ -0,0 +1,6 @@ +targets: + $default: + builders: + json_serializable: + options: + field_rename: snake diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 13bc0eb..3d3127b 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,37 +1,36 @@ import "dart:convert"; import "dart:ffi"; -import "dart:io"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; -import "package:matrix/encryption.dart"; -import "package:nexus/controllers/database_controller.dart"; +import "package:nexus/helpers/extensions/gomuks_buffer.dart"; +import "package:nexus/models/client_state.dart"; +import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; -import "package:matrix/matrix.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/secure_storage_controller.dart"; -import "package:nexus/models/session_backup.dart"; void gomuksCallback(Pointer command, int requestId, GomuksBuffer data) { - // Convert the C string to Dart - final cmdStr = command.cast().toDartString(); - print("Received event: $cmdStr (requestId=$requestId)"); + try { + final muksEventType = command.cast().toDartString(); + final Map decodedMuksEvent = data.toJson(); - // Optionally inspect 'data' if you need + switch (muksEventType) { + case "client_state": + final clientState = ClientState.fromJson(decodedMuksEvent); + debugPrint("Received event: $clientState"); + case "sync_status": + final syncStatus = SyncStatus.fromJson(decodedMuksEvent); + debugPrint("Received event: $syncStatus"); + } + } catch (error, stackTrace) { + debugPrintStack(stackTrace: stackTrace, label: error.toString()); + } } -class ClientController extends AsyncNotifier { +class ClientController extends Notifier { @override - bool updateShouldNotify( - AsyncValue previous, - AsyncValue next, - ) => - previous.hasValue != next.hasValue || - previous.value?.accessToken != next.value?.accessToken; - static const sessionBackupKey = "sessionBackup"; - - @override - Future build() async { + int build() { final handle = GomuksInit(); + ref.onDispose(() => GomuksDestroy(handle)); GomuksStart( handle, @@ -40,80 +39,29 @@ class ClientController extends AsyncNotifier { ), ); - final client = Client( - "nexus", - logLevel: kReleaseMode ? Level.warning : Level.verbose, - importantStateEvents: {"im.ponies.room_emotes"}, - supportedLoginTypes: {AuthenticationTypes.password}, - verificationMethods: {KeyVerificationMethod.emoji}, - database: await MatrixSdkDatabase.init( - "nexus", - database: await ref.watch(DatabaseController.provider.future), - ), - ); - - final backupJson = await ref - .watch(SecureStorageController.provider.notifier) - .get(sessionBackupKey); - - if (backupJson != null) { - final backup = SessionBackup.fromJson(json.decode(backupJson)); - - await client.init( - waitForFirstSync: false, - newToken: backup.accessToken, - newHomeserver: backup.homeserver, - newUserID: backup.userID, - newDeviceID: backup.deviceID, - newDeviceName: backup.deviceName, - ); - } - - return client; + return handle; } - Future setHomeserver(Uri homeserverUrl) async { - final client = await future; + (int requestId, Map response) sendCommand( + String command, + Map data, + ) { + final responsePtr = calloc(); try { - await client.checkHomeserver(homeserverUrl); - return true; - } catch (_) { - return false; - } - } - - Future login(String username, String password) async { - final client = await future; - try { - final deviceName = "Nexus Client login on ${Platform.localHostname}"; - final details = await MatrixApi(homeserver: client.homeserver).login( - LoginType.mLoginPassword, - initialDeviceDisplayName: deviceName, - identifier: AuthenticationUserIdentifier(user: username), - password: password, + final requestId = GomuksSubmitCommand( + state, + command.toNativeUtf8().cast(), + data.toGomuksBuffer(), + responsePtr, ); - await ref - .watch(SecureStorageController.provider.notifier) - .set( - sessionBackupKey, - json.encode( - SessionBackup( - accessToken: details.accessToken, - homeserver: client.homeserver!, - userID: details.userId, - deviceID: details.deviceId, - deviceName: deviceName, - ).toJson(), - ), - ); - ref.invalidateSelf(asReload: true); - return true; - } catch (_) { - return false; + + return (requestId, responsePtr.ref.toJson()); + } finally { + calloc.free(responsePtr); } } - static final provider = AsyncNotifierProvider( + static final provider = NotifierProvider( ClientController.new, ); } diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart new file mode 100644 index 0000000..4cd42db --- /dev/null +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -0,0 +1,41 @@ +import "dart:convert"; +import "dart:ffi"; +import "dart:typed_data"; + +import "package:ffi/ffi.dart"; +import "package:nexus/src/third_party/gomuks.g.dart"; + +extension GomuksBufferX on GomuksBuffer { + /// Safely converts the Go buffer into a Dart `Uint8List` + Uint8List toBytes() { + if (base == nullptr || length <= 0) return Uint8List(0); + return base.asTypedList(length); + } + + /// Decodes the bytes as JSON + Map toJson() { + final bytes = toBytes(); + if (bytes.isEmpty) return {}; + return jsonDecode(utf8.decode(bytes)); + } +} + +extension JsonToGomuksBuffer on Map { + GomuksBuffer toGomuksBuffer() { + final jsonString = json.encode(this); + final bytes = utf8.encode(jsonString); + + final dataPtr = calloc(bytes.length); + dataPtr.asTypedList(bytes.length).setAll(0, bytes); + + final bufPtr = calloc(); + bufPtr.ref.base = dataPtr; + bufPtr.ref.length = bytes.length; + + final bufByValue = bufPtr.ref; + + calloc.free(bufPtr); + + return bufByValue; + } +} diff --git a/lib/main.dart b/lib/main.dart index 9e829a7..4fbc6ef 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,17 +1,11 @@ import "dart:io"; - import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/shared_prefs_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; -import "package:nexus/pages/chat_page.dart"; -import "package:nexus/pages/login_page.dart"; -import "package:nexus/pages/settings_page.dart"; -import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/error_dialog.dart"; -import "package:nexus/widgets/loading.dart"; import "package:window_manager/window_manager.dart"; import "package:flutter/material.dart"; import "package:dynamic_system_colors/dynamic_system_colors.dart"; @@ -103,37 +97,46 @@ class App extends ConsumerWidget { builder: (context) => ref .watch(SharedPrefsController.provider) .betterWhen( - data: (_) => ref - .watch(ClientController.provider) - .betterWhen( - data: (client) => - client.accessToken == null ? LoginPage() : ChatPage(), - loading: () => Scaffold( - body: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - spacing: 16, - children: [ - Text( - "Syncing...", - style: Theme.of(context).textTheme.headlineMedium, - ), - Loading(), - ], - ), - ), - appBar: Appbar( - actions: [ - IconButton( - onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => SettingsPage()), - ), - icon: Icon(Icons.settings), - ), - ], - ), - ), - ), + data: (_) { + final response = ref + .watch(ClientController.provider.notifier) + .sendCommand("login", { + "homeserver_url": "federated.nexus", + "username": "quadradical", + "password": "Quadmarad1!", + }); + debugPrint("$response"); + return Placeholder(); + }, + // .betterWhen( + // data: (client) => + // client.accessToken == null ? LoginPage() : ChatPage(), + // loading: () => Scaffold( + // body: Center( + // child: Column( + // mainAxisSize: MainAxisSize.min, + // spacing: 16, + // children: [ + // Text( + // "Syncing...", + // style: Theme.of(context).textTheme.headlineMedium, + // ), + // Loading(), + // ], + // ), + // ), + // appBar: Appbar( + // actions: [ + // IconButton( + // onPressed: () => Navigator.of(context).push( + // MaterialPageRoute(builder: (_) => SettingsPage()), + // ), + // icon: Icon(Icons.settings), + // ), + // ], + // ), + // ), + // ), ), ), ), diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart new file mode 100644 index 0000000..2c1bf05 --- /dev/null +++ b/lib/models/client_state.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "client_state.freezed.dart"; +part "client_state.g.dart"; + +@freezed +abstract class ClientState with _$ClientState { + const factory ClientState({ + required bool isInitialized, + required bool isLoggedIn, + required bool isVerified, + }) = _ClientState; + + factory ClientState.fromJson(Map json) => + _$ClientStateFromJson(json); +} diff --git a/lib/models/full_room.dart b/lib/models/full_room.dart deleted file mode 100644 index ee61da6..0000000 --- a/lib/models/full_room.dart +++ /dev/null @@ -1,13 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -import "package:matrix/matrix.dart"; -part "full_room.freezed.dart"; - -@freezed -abstract class FullRoom with _$FullRoom { - const FullRoom._(); - const factory FullRoom({ - required Room roomData, - required String title, - required Uri? avatar, - }) = _FullRoom; -} diff --git a/lib/models/homeserver.dart b/lib/models/homeserver.dart deleted file mode 100644 index 903e23d..0000000 --- a/lib/models/homeserver.dart +++ /dev/null @@ -1,12 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "homeserver.freezed.dart"; - -@freezed -abstract class Homeserver with _$Homeserver { - const factory Homeserver({ - required String name, - required String description, - required Uri url, - required String iconUrl, - }) = _Homeserver; -} diff --git a/lib/models/image_data.dart b/lib/models/image_data.dart deleted file mode 100644 index e5bc57e..0000000 --- a/lib/models/image_data.dart +++ /dev/null @@ -1,11 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "image_data.freezed.dart"; - -@freezed -abstract class ImageData with _$ImageData { - const factory ImageData({ - required String uri, - required int? height, - required int? width, - }) = _ImageData; -} diff --git a/lib/models/relation_type.dart b/lib/models/relation_type.dart deleted file mode 100644 index 80c5223..0000000 --- a/lib/models/relation_type.dart +++ /dev/null @@ -1 +0,0 @@ -enum RelationType { edit, reply } diff --git a/lib/models/session_backup.dart b/lib/models/session_backup.dart deleted file mode 100644 index 0245c7e..0000000 --- a/lib/models/session_backup.dart +++ /dev/null @@ -1,17 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "session_backup.freezed.dart"; -part "session_backup.g.dart"; - -@freezed -abstract class SessionBackup with _$SessionBackup { - const factory SessionBackup({ - required String accessToken, - required Uri homeserver, - required String userID, - required String deviceID, - required String deviceName, - }) = _SessionBackup; - - factory SessionBackup.fromJson(Map json) => - _$SessionBackupFromJson(json); -} diff --git a/lib/models/space.dart b/lib/models/space.dart deleted file mode 100644 index d64dcc9..0000000 --- a/lib/models/space.dart +++ /dev/null @@ -1,20 +0,0 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:flutter/widgets.dart"; -import "package:freezed_annotation/freezed_annotation.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/models/full_room.dart"; -part "space.freezed.dart"; - -@freezed -abstract class Space with _$Space { - const Space._(); - const factory Space({ - required String title, - required String id, - required IList children, - required Client client, - Room? roomData, - Uri? avatar, - IconData? icon, - }) = _Space; -} diff --git a/lib/models/sync_status.dart b/lib/models/sync_status.dart new file mode 100644 index 0000000..4ea08e5 --- /dev/null +++ b/lib/models/sync_status.dart @@ -0,0 +1,18 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "sync_status.freezed.dart"; +part "sync_status.g.dart"; + +@freezed +abstract class SyncStatus with _$SyncStatus { + const factory SyncStatus({ + required Type type, + required int errorCount, + required int lastSync, + }) = _SyncStatus; + + factory SyncStatus.fromJson(Map json) => + _$SyncStatusFromJson(json); +} + +@JsonEnum(fieldRename: FieldRename.snake) +enum Type { ok, waiting, erroring, permanentlyFailed } From 33239c02c06764f0cdfab18de58b3f3cf04f3382 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 11:10:39 +0000 Subject: [PATCH 03/34] wip go 3 --- hook/build.dart | 94 ----------------------- lib/helpers/extensions/gomuks_buffer.dart | 15 ---- scripts/generate.dart | 90 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 109 deletions(-) create mode 100644 scripts/generate.dart diff --git a/hook/build.dart b/hook/build.dart index a8f43b3..51037f1 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -5,91 +5,6 @@ import "package:path/path.dart"; import "package:ffigen/ffigen.dart"; Future main(List args) => build(args, (input, output) async { - final targetOS = input.config.code.targetOS; - final targetArch = input.config.code.targetArchitecture; - String libFileName; - switch (targetOS) { - case OS.linux: - libFileName = "libgomuks.so"; - break; - case OS.macOS: - libFileName = "libgomuks.dylib"; - break; - case OS.windows: - libFileName = "libgomuks.dll"; - break; - default: - throw UnsupportedError("Unsupported OS: $targetOS"); - } - - // Where we put the Gomuks repo and compiled library - final buildDir = Directory.fromUri( - input.outputDirectoryShared.resolve("gomuks/"), - ); - if (!await buildDir.exists()) await buildDir.create(recursive: true); - - final repoDir = Directory(join(buildDir.path, "source")); - - bool skipBuild = false; - - final generatedSourcePath = "src/third_party/gomuks.g.dart"; - final generatedLibPath = input.packageRoot.resolve( - join("lib", generatedSourcePath), - ); - final bindingsFile = File(generatedLibPath.toFilePath()); - - if (await bindingsFile.exists() && - await File(join(buildDir.path, libFileName)).exists() && - await repoDir.exists()) { - final result = await Process.run("git", [ - "fetch", - "--dry-run", - ], workingDirectory: repoDir.path); - - if ((result.stdout as String).trim().isEmpty) { - skipBuild = true; - } - } - - if (skipBuild) { - return print( - "Gomuks build skipped: bindings and library exist and repo is up to date.", - ); - } - - if (await repoDir.exists()) await repoDir.delete(recursive: true); - - print("Cloning Gomuks repository..."); - final cloneResult = await Process.run("git", [ - "clone", - "--depth", - "1", - "--branch", - "tulir/ffi", - "https://mau.dev/gomuks/gomuks", - repoDir.path, - ]); - if (cloneResult.exitCode != 0) { - throw Exception( - "Failed to clone Gomuks repository: \n${cloneResult.stderr}", - ); - } - - final libFile = File(join(buildDir.path, libFileName)); - - print("Building Gomuks shared library for $targetOS/$targetArch..."); - final result = await Process.run("go", [ - "build", - "-o", - libFile.path, - "-buildmode=c-shared", - ], workingDirectory: join(repoDir.path, "pkg/ffi")); - - if (result.exitCode != 0) { - throw Exception("Failed to build Gomuks shared library\n${result.stderr}"); - } - - // Add the library as a code asset so Dart can find it output.assets.code.add( CodeAsset( package: "nexus", @@ -99,13 +14,4 @@ Future main(List args) => build(args, (input, output) async { ), ); output.dependencies.add(libFile.uri); - - print("Generating FFI Bindings..."); - FfiGenerator( - output: Output(dartFile: generatedLibPath), - headers: Headers( - entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], - ), - functions: Functions.includeAll, - ).generate(); }); diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index 4cd42db..0e44706 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -5,21 +5,6 @@ import "dart:typed_data"; import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; -extension GomuksBufferX on GomuksBuffer { - /// Safely converts the Go buffer into a Dart `Uint8List` - Uint8List toBytes() { - if (base == nullptr || length <= 0) return Uint8List(0); - return base.asTypedList(length); - } - - /// Decodes the bytes as JSON - Map toJson() { - final bytes = toBytes(); - if (bytes.isEmpty) return {}; - return jsonDecode(utf8.decode(bytes)); - } -} - extension JsonToGomuksBuffer on Map { GomuksBuffer toGomuksBuffer() { final jsonString = json.encode(this); diff --git a/scripts/generate.dart b/scripts/generate.dart new file mode 100644 index 0000000..5f23964 --- /dev/null +++ b/scripts/generate.dart @@ -0,0 +1,90 @@ +import "dart:io"; +import "package:ffigen/ffigen.dart"; +import "package:path/path.dart"; + +void main(List args) async { + // Where we put the Gomuks repo and compiled library + final buildDir = Directory.fromUri( + Platform.script.resolve(join("..", "build", "gomuks")), + ); + if (!await buildDir.exists()) await buildDir.create(recursive: true); + + final repoDir = Directory(join(buildDir.path, "source")); + + bool skipBuild = false; + + final generatedSourcePath = join("src", "third_party", "gomuks.g.dart"); + final generatedLibPath = Platform.script.resolve( + join("..", "lib", generatedSourcePath), + ); + final bindingsFile = File(generatedLibPath.toFilePath()); + + if (await bindingsFile.exists() && + await repoDir.exists() && + !args.contains("--rebuild")) { + final result = await Process.run("git", [ + "fetch", + "--dry-run", + ], workingDirectory: repoDir.path); + + if ((result.stdout as String).trim().isEmpty) { + skipBuild = true; + } + } + + if (skipBuild) { + return print( + "Gomuks build skipped: bindings and library exist and repo is up to date.", + ); + } + + if (await repoDir.exists()) await repoDir.delete(recursive: true); + + print("Cloning Gomuks repository..."); + final cloneResult = await Process.run("git", [ + "clone", + "--branch", + "tulir/ffi", + "--depth", + "1", + "https://mau.dev/gomuks/gomuks", + repoDir.path, + ]); + if (cloneResult.exitCode != 0) { + throw Exception( + "Failed to clone Gomuks repository: \n${cloneResult.stderr}", + ); + } + + for (final name in ["libgomuks.so", "libgomuks.dylib", "libgomuks.dll"]) { + final libFile = File(join(buildDir.path, name)); + + print("Building Gomuks shared library $name..."); + final result = await Process.run("go", [ + "build", + "-o", + libFile.path, + "-buildmode=c-shared", + ], workingDirectory: join(repoDir.path, "pkg/ffi")); + + if (result.exitCode != 0) { + throw Exception( + "Failed to build Gomuks shared library\n${result.stderr}", + ); + } + } + + print("Generating FFI Bindings..."); + final packageRoot = Platform.script.resolve("../"); + FfiGenerator( + output: Output( + dartFile: packageRoot.resolve("lib/src/third_party/gomuks.g.dart"), + ), + headers: Headers( + entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], + compilerOptions: ["-I${String.fromEnvironment("CPATH")}"], + ), + functions: Functions.includeAll, + ).generate(); + print("Done!"); +} From 5fe22867f8757ed9e574435e6afd76e1c52cddbd Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 11:36:19 +0000 Subject: [PATCH 04/34] fix build hook --- hook/build.dart | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/hook/build.dart b/hook/build.dart index 51037f1..e693a03 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -1,17 +1,34 @@ -import "dart:io"; import "package:hooks/hooks.dart"; import "package:code_assets/code_assets.dart"; import "package:path/path.dart"; -import "package:ffigen/ffigen.dart"; Future main(List args) => build(args, (input, output) async { + final targetOS = input.config.code.targetOS; + String libFileName; + switch (targetOS) { + case OS.linux: + libFileName = "libgomuks.so"; + break; + case OS.macOS: + libFileName = "libgomuks.dylib"; + break; + case OS.windows: + libFileName = "libgomuks.dll"; + break; + default: + throw UnsupportedError("Unsupported OS: $targetOS"); + } + + final generatedFile = join("src", "third_party", "gomuks.g.dart"); output.assets.code.add( CodeAsset( package: "nexus", - name: "src/third_party/gomuks.g.dart", + name: generatedFile, linkMode: DynamicLoadingBundled(), - file: libFile.uri, + file: input.packageRoot.resolve(join("build", "gomuks", libFileName)), ), ); - output.dependencies.add(libFile.uri); + output.dependencies.add( + input.packageRoot.resolve(join("lib", generatedFile)), + ); }); From c332d7361c3977dd92b850cfd87e4d41d8208845 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 11:56:03 +0000 Subject: [PATCH 05/34] add skip param --- scripts/generate.dart | 76 ++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/scripts/generate.dart b/scripts/generate.dart index 5f23964..e633890 100644 --- a/scripts/generate.dart +++ b/scripts/generate.dart @@ -3,7 +3,6 @@ import "package:ffigen/ffigen.dart"; import "package:path/path.dart"; void main(List args) async { - // Where we put the Gomuks repo and compiled library final buildDir = Directory.fromUri( Platform.script.resolve(join("..", "build", "gomuks")), ); @@ -11,7 +10,7 @@ void main(List args) async { final repoDir = Directory(join(buildDir.path, "source")); - bool skipBuild = false; + var skipBuild = args.contains("--skip"); final generatedSourcePath = join("src", "third_party", "gomuks.g.dart"); final generatedLibPath = Platform.script.resolve( @@ -19,9 +18,7 @@ void main(List args) async { ); final bindingsFile = File(generatedLibPath.toFilePath()); - if (await bindingsFile.exists() && - await repoDir.exists() && - !args.contains("--rebuild")) { + if (await bindingsFile.exists() && await repoDir.exists()) { final result = await Process.run("git", [ "fetch", "--dry-run", @@ -32,46 +29,43 @@ void main(List args) async { } } - if (skipBuild) { - return print( - "Gomuks build skipped: bindings and library exist and repo is up to date.", - ); - } + if (!skipBuild) { + if (await repoDir.exists()) await repoDir.delete(recursive: true); - if (await repoDir.exists()) await repoDir.delete(recursive: true); + print("Cloning Gomuks repository..."); + final cloneResult = await Process.run("git", [ + "clone", + "--branch", + "tulir/ffi", + "--depth", + "1", + "https://mau.dev/gomuks/gomuks", + repoDir.path, + ]); - print("Cloning Gomuks repository..."); - final cloneResult = await Process.run("git", [ - "clone", - "--branch", - "tulir/ffi", - "--depth", - "1", - "https://mau.dev/gomuks/gomuks", - repoDir.path, - ]); - if (cloneResult.exitCode != 0) { - throw Exception( - "Failed to clone Gomuks repository: \n${cloneResult.stderr}", - ); - } - - for (final name in ["libgomuks.so", "libgomuks.dylib", "libgomuks.dll"]) { - final libFile = File(join(buildDir.path, name)); - - print("Building Gomuks shared library $name..."); - final result = await Process.run("go", [ - "build", - "-o", - libFile.path, - "-buildmode=c-shared", - ], workingDirectory: join(repoDir.path, "pkg/ffi")); - - if (result.exitCode != 0) { + if (cloneResult.exitCode != 0) { throw Exception( - "Failed to build Gomuks shared library\n${result.stderr}", + "Failed to clone Gomuks repository: \n${cloneResult.stderr}", ); } + + for (final name in ["libgomuks.so", "libgomuks.dylib", "libgomuks.dll"]) { + final libFile = File(join(buildDir.path, name)); + + print("Building Gomuks shared library $name..."); + final result = await Process.run("go", [ + "build", + "-o", + libFile.path, + "-buildmode=c-shared", + ], workingDirectory: join(repoDir.path, "pkg/ffi")); + + if (result.exitCode != 0) { + throw Exception( + "Failed to build Gomuks shared library\n${result.stderr}", + ); + } + } } print("Generating FFI Bindings..."); @@ -82,7 +76,7 @@ void main(List args) async { ), headers: Headers( entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], - compilerOptions: ["-I${String.fromEnvironment("CPATH")}"], + // compilerOptions: ["-I${String.fromEnvironment("CPATH")}"], ), functions: Functions.includeAll, ).generate(); From 7de94531f78be1c182a9dcc84c730d88b5d65c93 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 11:58:55 +0000 Subject: [PATCH 06/34] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09a1a9b..2562704 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S ## Progress -- [ ] Move from the Dart SDK to the Rust SDK with Dart bindings: Waiting on https://github.com/fzyzcjy/flutter_rust_bridge/discussions/2967#discussioncomment-15522205. +- [ ] Move from the Dart SDK to the Gomuks SDK with bindings: WIP - [ ] Platform Support - [x] Linux - [x] Windows From 8d4331351219391a4e0ebba7213836c848fa95a2 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 12:20:52 +0000 Subject: [PATCH 07/34] working build of generated file --- flake.nix | 2 ++ lib/controllers/client_controller.dart | 12 ++++++++---- lib/helpers/extensions/gomuks_buffer.dart | 8 ++++++++ scripts/generate.dart | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 0d380af..a79d6b8 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ perSystem = { + lib, pkgs, system, ... @@ -62,6 +63,7 @@ pkgs.sqlite ]) }:./.dart_tool/hooks_runner/shared/nexus/build/gomuks"; + CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; # ANDROID_SDK_ROOT = ANDROID_HOME; diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 3d3127b..2599d7d 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -8,7 +8,11 @@ import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -void gomuksCallback(Pointer command, int requestId, GomuksBuffer data) { +void gomuksCallback( + Pointer command, + int requestId, + GomuksBorrowedBuffer data, +) { try { final muksEventType = command.cast().toDartString(); final Map decodedMuksEvent = data.toJson(); @@ -34,9 +38,9 @@ class ClientController extends Notifier { GomuksStart( handle, - Pointer.fromFunction, Int64, GomuksBuffer)>( - gomuksCallback, - ), + Pointer.fromFunction< + Void Function(Pointer, Int64, GomuksBorrowedBuffer) + >(gomuksCallback), ); return handle; diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index 0e44706..5de7eab 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -5,6 +5,14 @@ import "dart:typed_data"; import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; +extension GomuksBufferToJson on GomuksBorrowedBuffer { + Map toJson() { + final bytes = toBytes(); + if (bytes.isEmpty) return {}; + return jsonDecode(utf8.decode(bytes)); + } +} + extension JsonToGomuksBuffer on Map { GomuksBuffer toGomuksBuffer() { final jsonString = json.encode(this); diff --git a/scripts/generate.dart b/scripts/generate.dart index e633890..427df3f 100644 --- a/scripts/generate.dart +++ b/scripts/generate.dart @@ -76,7 +76,7 @@ void main(List args) async { ), headers: Headers( entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], - // compilerOptions: ["-I${String.fromEnvironment("CPATH")}"], + compilerOptions: ["--no-warnings"], ), functions: Functions.includeAll, ).generate(); From 058f68cffb6eba2f03a2229591900983febc22d3 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 13:44:16 +0000 Subject: [PATCH 08/34] working build scripts --- hook/build.dart | 28 ++++++-- lib/controllers/client_controller.dart | 23 ++----- lib/helpers/extensions/gomuks_buffer.dart | 29 ++++---- lib/main.dart | 1 - scripts/generate.dart | 83 ++++++----------------- scripts/generate.sh | 9 +++ 6 files changed, 75 insertions(+), 98 deletions(-) create mode 100755 scripts/generate.sh diff --git a/hook/build.dart b/hook/build.dart index e693a03..88e8fb2 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -1,8 +1,11 @@ +import "dart:io"; import "package:hooks/hooks.dart"; import "package:code_assets/code_assets.dart"; -import "package:path/path.dart"; Future main(List args) => build(args, (input, output) async { + final buildDir = input.packageRoot.resolve("build/"); + if (await File(buildDir.resolve("lock").toFilePath()).exists()) return; + final targetOS = input.config.code.targetOS; String libFileName; switch (targetOS) { @@ -19,16 +22,29 @@ Future main(List args) => build(args, (input, output) async { throw UnsupportedError("Unsupported OS: $targetOS"); } - final generatedFile = join("src", "third_party", "gomuks.g.dart"); + final gomuksBuildDir = buildDir.resolve("gomuks/"); + final libFile = gomuksBuildDir.resolve(libFileName); + + print("Building Gomuks shared library $libFileName..."); + final result = await Process.run("go", [ + "build", + "-o", + libFile.path, + "-buildmode=c-shared", + ], workingDirectory: gomuksBuildDir.resolve("source/pkg/ffi/").toFilePath()); + + if (result.exitCode != 0) { + throw Exception("Failed to build Gomuks shared library\n${result.stderr}"); + } + + final generatedFile = "src/third_party/gomuks.g.dart"; output.assets.code.add( CodeAsset( package: "nexus", name: generatedFile, linkMode: DynamicLoadingBundled(), - file: input.packageRoot.resolve(join("build", "gomuks", libFileName)), + file: libFile, ), ); - output.dependencies.add( - input.packageRoot.resolve(join("lib", generatedFile)), - ); + output.dependencies.add(input.packageRoot.resolve("lib/$generatedFile")); }); diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 2599d7d..78d2058 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -46,23 +46,14 @@ class ClientController extends Notifier { return handle; } - (int requestId, Map response) sendCommand( - String command, - Map data, - ) { - final responsePtr = calloc(); - try { - final requestId = GomuksSubmitCommand( - state, - command.toNativeUtf8().cast(), - data.toGomuksBuffer(), - responsePtr, - ); + void sendCommand(String command, Map data) { + // final response = GomuksSubmitCommand( + // state, + // command.toNativeUtf8().cast(), + // data.toGomuksBuffer(), + // ); - return (requestId, responsePtr.ref.toJson()); - } finally { - calloc.free(responsePtr); - } + // return response.buf; TODO } static final provider = NotifierProvider( diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index 5de7eab..c4c97f5 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -6,6 +6,11 @@ import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; extension GomuksBufferToJson on GomuksBorrowedBuffer { + Uint8List toBytes() { + if (base == nullptr || length <= 0) return Uint8List(0); + return base.asTypedList(length); + } + Map toJson() { final bytes = toBytes(); if (bytes.isEmpty) return {}; @@ -14,21 +19,21 @@ extension GomuksBufferToJson on GomuksBorrowedBuffer { } extension JsonToGomuksBuffer on Map { - GomuksBuffer toGomuksBuffer() { - final jsonString = json.encode(this); - final bytes = utf8.encode(jsonString); + // GomuksBorrowedBuffer toGomuksBuffer() { + // final jsonString = json.encode(this); + // final bytes = utf8.encode(jsonString); - final dataPtr = calloc(bytes.length); - dataPtr.asTypedList(bytes.length).setAll(0, bytes); + // final dataPtr = calloc(bytes.length); + // dataPtr.asTypedList(bytes.length).setAll(0, bytes); - final bufPtr = calloc(); - bufPtr.ref.base = dataPtr; - bufPtr.ref.length = bytes.length; + // final bufPtr = calloc(); + // bufPtr.ref.base = dataPtr; + // bufPtr.ref.length = bytes.length; - final bufByValue = bufPtr.ref; + // final bufByValue = bufPtr.ref; - calloc.free(bufPtr); + // calloc.free(bufPtr); - return bufByValue; - } + // return bufByValue; + // } } diff --git a/lib/main.dart b/lib/main.dart index 4fbc6ef..c97ef3e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -105,7 +105,6 @@ class App extends ConsumerWidget { "username": "quadradical", "password": "Quadmarad1!", }); - debugPrint("$response"); return Placeholder(); }, // .betterWhen( diff --git a/scripts/generate.dart b/scripts/generate.dart index 427df3f..04b7c4d 100644 --- a/scripts/generate.dart +++ b/scripts/generate.dart @@ -3,79 +3,36 @@ import "package:ffigen/ffigen.dart"; import "package:path/path.dart"; void main(List args) async { - final buildDir = Directory.fromUri( - Platform.script.resolve(join("..", "build", "gomuks")), + final repoDir = Directory.fromUri( + Platform.script.resolve("../build/gomuks/source"), ); - if (!await buildDir.exists()) await buildDir.create(recursive: true); + if (await repoDir.exists()) await repoDir.delete(recursive: true); + await repoDir.create(recursive: true); - final repoDir = Directory(join(buildDir.path, "source")); + print("Cloning Gomuks repository..."); + final cloneResult = await Process.run("git", [ + "clone", + "--branch", + "tulir/ffi", + "--depth", + "1", + "https://mau.dev/gomuks/gomuks", + repoDir.path, + ]); - var skipBuild = args.contains("--skip"); - - final generatedSourcePath = join("src", "third_party", "gomuks.g.dart"); - final generatedLibPath = Platform.script.resolve( - join("..", "lib", generatedSourcePath), - ); - final bindingsFile = File(generatedLibPath.toFilePath()); - - if (await bindingsFile.exists() && await repoDir.exists()) { - final result = await Process.run("git", [ - "fetch", - "--dry-run", - ], workingDirectory: repoDir.path); - - if ((result.stdout as String).trim().isEmpty) { - skipBuild = true; - } - } - - if (!skipBuild) { - if (await repoDir.exists()) await repoDir.delete(recursive: true); - - print("Cloning Gomuks repository..."); - final cloneResult = await Process.run("git", [ - "clone", - "--branch", - "tulir/ffi", - "--depth", - "1", - "https://mau.dev/gomuks/gomuks", - repoDir.path, - ]); - - if (cloneResult.exitCode != 0) { - throw Exception( - "Failed to clone Gomuks repository: \n${cloneResult.stderr}", - ); - } - - for (final name in ["libgomuks.so", "libgomuks.dylib", "libgomuks.dll"]) { - final libFile = File(join(buildDir.path, name)); - - print("Building Gomuks shared library $name..."); - final result = await Process.run("go", [ - "build", - "-o", - libFile.path, - "-buildmode=c-shared", - ], workingDirectory: join(repoDir.path, "pkg/ffi")); - - if (result.exitCode != 0) { - throw Exception( - "Failed to build Gomuks shared library\n${result.stderr}", - ); - } - } + if (cloneResult.exitCode != 0) { + throw Exception( + "Failed to clone Gomuks repository: \n${cloneResult.stderr}", + ); } print("Generating FFI Bindings..."); - final packageRoot = Platform.script.resolve("../"); FfiGenerator( output: Output( - dartFile: packageRoot.resolve("lib/src/third_party/gomuks.g.dart"), + dartFile: Platform.script.resolve("../lib/src/third_party/gomuks.g.dart"), ), headers: Headers( - entryPoints: [File(join(buildDir.path, "libgomuks.h")).uri], + entryPoints: [File(join(repoDir.path, "pkg", "ffi", "ffi.h")).uri], compilerOptions: ["--no-warnings"], ), functions: Functions.includeAll, diff --git a/scripts/generate.sh b/scripts/generate.sh new file mode 100755 index 0000000..faafd29 --- /dev/null +++ b/scripts/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +pushd "$(dirname "$(readlink -f "$0")")"/.. || exit + +mkdir -p build +touch build/lock +dart scripts/generate.dart +rm build/lock + +popd || exit \ No newline at end of file From 20f69ca0aab242525fb4577879bc13ccd7e31ee1 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 14:50:07 +0000 Subject: [PATCH 09/34] working build --- .gitignore | 2 +- flake.nix | 2 +- hook/build.dart | 23 +++++----- lib/controllers/client_controller.dart | 15 +++---- lib/helpers/extensions/gomuks_buffer.dart | 53 +++++++++++++++-------- lib/main.dart | 3 +- scripts/generate.dart | 2 +- 7 files changed, 60 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 747b159..757aeea 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ key.properties # Generated Files *.g.dart *.freezed.dart -/rust/ +/src/ # Devel Password password.txt \ No newline at end of file diff --git a/flake.nix b/flake.nix index a79d6b8..7424c83 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ pkgs.lib.makeLibraryPath ([ pkgs.sqlite ]) - }:./.dart_tool/hooks_runner/shared/nexus/build/gomuks"; + }:./build/native_assets/linux"; CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; diff --git a/hook/build.dart b/hook/build.dart index 88e8fb2..6ebc80e 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -3,7 +3,7 @@ import "package:hooks/hooks.dart"; import "package:code_assets/code_assets.dart"; Future main(List args) => build(args, (input, output) async { - final buildDir = input.packageRoot.resolve("build/"); + final buildDir = input.packageRoot.resolve("src/"); if (await File(buildDir.resolve("lock").toFilePath()).exists()) return; final targetOS = input.config.code.targetOS; @@ -38,13 +38,16 @@ Future main(List args) => build(args, (input, output) async { } final generatedFile = "src/third_party/gomuks.g.dart"; - output.assets.code.add( - CodeAsset( - package: "nexus", - name: generatedFile, - linkMode: DynamicLoadingBundled(), - file: libFile, - ), - ); - output.dependencies.add(input.packageRoot.resolve("lib/$generatedFile")); + print("Adding $libFileName as asset..."); + output + ..assets.code.add( + CodeAsset( + package: "nexus", + name: generatedFile, + linkMode: DynamicLoadingBundled(), + file: libFile, + ), + ) + ..dependencies.add(libFile); + print("Done!"); }); diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 78d2058..d91fd5e 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,4 +1,3 @@ -import "dart:convert"; import "dart:ffi"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; @@ -46,14 +45,14 @@ class ClientController extends Notifier { return handle; } - void sendCommand(String command, Map data) { - // final response = GomuksSubmitCommand( - // state, - // command.toNativeUtf8().cast(), - // data.toGomuksBuffer(), - // ); + Map sendCommand(String command, Map data) { + final response = GomuksSubmitCommand( + state, + command.toNativeUtf8().cast(), + data.toGomuksBuffer(), + ); - // return response.buf; TODO + return response.buf.toJson(); } static final provider = NotifierProvider( diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index c4c97f5..48fc5d9 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -5,7 +5,7 @@ import "dart:typed_data"; import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; -extension GomuksBufferToJson on GomuksBorrowedBuffer { +extension GomuksBorrowedBufferToJson on GomuksBorrowedBuffer { Uint8List toBytes() { if (base == nullptr || length <= 0) return Uint8List(0); return base.asTypedList(length); @@ -18,22 +18,39 @@ extension GomuksBufferToJson on GomuksBorrowedBuffer { } } -extension JsonToGomuksBuffer on Map { - // GomuksBorrowedBuffer toGomuksBuffer() { - // final jsonString = json.encode(this); - // final bytes = utf8.encode(jsonString); +extension GomuksOwnedBufferToJson on GomuksOwnedBuffer { + Uint8List toBytes() { + try { + if (base == nullptr || length <= 0) return Uint8List(0); + return Uint8List.fromList(base.asTypedList(length)); + } finally { + calloc.free(base); + } + } - // final dataPtr = calloc(bytes.length); - // dataPtr.asTypedList(bytes.length).setAll(0, bytes); - - // final bufPtr = calloc(); - // bufPtr.ref.base = dataPtr; - // bufPtr.ref.length = bytes.length; - - // final bufByValue = bufPtr.ref; - - // calloc.free(bufPtr); - - // return bufByValue; - // } + Map toJson() { + final bytes = toBytes(); + if (bytes.isEmpty) return {}; + return jsonDecode(utf8.decode(bytes)); + } +} + +extension JsonToGomuksBuffer on Map { + GomuksBorrowedBuffer toGomuksBuffer() { + final jsonString = json.encode(this); + final bytes = utf8.encode(jsonString); + + final dataPtr = calloc(bytes.length); + dataPtr.asTypedList(bytes.length).setAll(0, bytes); + + final bufPtr = calloc(); + bufPtr.ref.base = dataPtr; + bufPtr.ref.length = bytes.length; + + final bufByValue = bufPtr.ref; + + calloc.free(bufPtr); + + return bufByValue; + } } diff --git a/lib/main.dart b/lib/main.dart index c97ef3e..d0cc6fa 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -105,7 +105,8 @@ class App extends ConsumerWidget { "username": "quadradical", "password": "Quadmarad1!", }); - return Placeholder(); + + return Text(response.toString()); }, // .betterWhen( // data: (client) => diff --git a/scripts/generate.dart b/scripts/generate.dart index 04b7c4d..c332b2e 100644 --- a/scripts/generate.dart +++ b/scripts/generate.dart @@ -4,7 +4,7 @@ import "package:path/path.dart"; void main(List args) async { final repoDir = Directory.fromUri( - Platform.script.resolve("../build/gomuks/source"), + Platform.script.resolve("../src/gomuks/source"), ); if (await repoDir.exists()) await repoDir.delete(recursive: true); await repoDir.create(recursive: true); From c0dfb6370edac2eaff08511b9287e13ddeb771b7 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 16:39:56 +0000 Subject: [PATCH 10/34] kind of working! --- lib/controllers/client_controller.dart | 12 ++++++++---- lib/helpers/extensions/gomuks_buffer.dart | 19 +++++++++--------- lib/main.dart | 24 ++++++++++++----------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index d91fd5e..0ecf2cb 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -37,21 +37,25 @@ class ClientController extends Notifier { GomuksStart( handle, - Pointer.fromFunction< - Void Function(Pointer, Int64, GomuksBorrowedBuffer) - >(gomuksCallback), + NativeCallable< + Void Function(Pointer, Int64, GomuksBorrowedBuffer) + >.listener(gomuksCallback) + .nativeFunction, ); return handle; } Map sendCommand(String command, Map data) { + final bufferPointer = data.toGomuksBufferPtr(); final response = GomuksSubmitCommand( state, command.toNativeUtf8().cast(), - data.toGomuksBuffer(), + bufferPointer.ref, ); + calloc.free(bufferPointer); + return response.buf.toJson(); } diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index 48fc5d9..bfae939 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -31,26 +31,27 @@ extension GomuksOwnedBufferToJson on GomuksOwnedBuffer { Map toJson() { final bytes = toBytes(); if (bytes.isEmpty) return {}; - return jsonDecode(utf8.decode(bytes)); + final json = jsonDecode(utf8.decode(bytes)); + + if (json is Map?) return json ?? {}; + throw json; } } extension JsonToGomuksBuffer on Map { - GomuksBorrowedBuffer toGomuksBuffer() { + Pointer toGomuksBufferPtr() { final jsonString = json.encode(this); final bytes = utf8.encode(jsonString); final dataPtr = calloc(bytes.length); dataPtr.asTypedList(bytes.length).setAll(0, bytes); - final bufPtr = calloc(); - bufPtr.ref.base = dataPtr; - bufPtr.ref.length = bytes.length; + final ptr = calloc(); - final bufByValue = bufPtr.ref; + ptr.ref + ..base = dataPtr + ..length = bytes.length; - calloc.free(bufPtr); - - return bufByValue; + return ptr; } } diff --git a/lib/main.dart b/lib/main.dart index d0cc6fa..eaccbfb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -97,17 +97,19 @@ class App extends ConsumerWidget { builder: (context) => ref .watch(SharedPrefsController.provider) .betterWhen( - data: (_) { - final response = ref - .watch(ClientController.provider.notifier) - .sendCommand("login", { - "homeserver_url": "federated.nexus", - "username": "quadradical", - "password": "Quadmarad1!", - }); - - return Text(response.toString()); - }, + data: (_) => ElevatedButton( + onPressed: () async { + final response = ref + .watch(ClientController.provider.notifier) + .sendCommand("login", { + "homeserver_url": "https://matrix.federated.nexus", + "username": "quadradical", + "password": "Quadfnrad1!", + }); + print(response); + }, + child: Text("foo"), + ), // .betterWhen( // data: (client) => // client.accessToken == null ? LoginPage() : ChatPage(), From e7599f3e94644df886df81516ef5fd97a76a4d7d Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 16:42:18 +0000 Subject: [PATCH 11/34] fix up nix flake --- flake.nix | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index 7424c83..c4c5cc3 100644 --- a/flake.nix +++ b/flake.nix @@ -39,40 +39,26 @@ }; }; - devShells.default = - let - # android = pkgs.callPackage ./nix/android.nix { }; - in - pkgs.mkShell { - packages = with pkgs; [ - # jdk17 - go - olm - git - cargo - clang - (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; }) + devShells.default = pkgs.mkShell { + packages = with pkgs; [ + go + olm + git + clang + (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; }) - # android.platform-tools - (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) - ]; + (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) + ]; - env = rec { - LD_LIBRARY_PATH = "${ - pkgs.lib.makeLibraryPath ([ - pkgs.sqlite - ]) - }:./build/native_assets/linux"; - CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; - - # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; - # ANDROID_SDK_ROOT = ANDROID_HOME; - # JAVA_HOME = pkgs.jdk17; - - # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}"; - # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2"; - }; + env = { + LD_LIBRARY_PATH = "${ + pkgs.lib.makeLibraryPath ([ + pkgs.sqlite + ]) + }:./build/native_assets/linux"; + CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; }; + }; }; }; } From cd0d10555b60d3b678286f125f60d29b6ca56f5c Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 24 Jan 2026 20:28:53 +0000 Subject: [PATCH 12/34] add unhandled event printer --- lib/controllers/client_controller.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 0ecf2cb..ec10638 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -20,9 +20,13 @@ void gomuksCallback( case "client_state": final clientState = ClientState.fromJson(decodedMuksEvent); debugPrint("Received event: $clientState"); + break; case "sync_status": final syncStatus = SyncStatus.fromJson(decodedMuksEvent); debugPrint("Received event: $syncStatus"); + break; + default: + debugPrint("Unhandled event: $muksEventType: $decodedMuksEvent"); } } catch (error, stackTrace) { debugPrintStack(stackTrace: stackTrace, label: error.toString()); From 47a758a33b2138bdb35b7a11c4a1ec7f6f1f445f Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 25 Jan 2026 13:02:40 +0000 Subject: [PATCH 13/34] working login page --- lib/controllers/client_controller.dart | 102 +++++++++------ lib/controllers/sync_status_controller.dart | 13 ++ lib/main.dart | 48 +------ lib/models/homeserver.dart | 12 ++ lib/models/login.dart | 14 ++ lib/models/sync_status.dart | 4 +- lib/pages/login_page.dart | 39 +++--- linux/flutter/generated_plugins.cmake | 1 - pubspec.lock | 136 -------------------- pubspec.yaml | 4 - scripts/generate.dart | 4 +- windows/flutter/generated_plugins.cmake | 1 - 12 files changed, 133 insertions(+), 245 deletions(-) create mode 100644 lib/controllers/sync_status_controller.dart create mode 100644 lib/models/homeserver.dart create mode 100644 lib/models/login.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index ec10638..479b2f0 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,61 +1,71 @@ import "dart:ffi"; +import "dart:isolate"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; +import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; +import "package:nexus/models/login.dart"; import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -void gomuksCallback( - Pointer command, - int requestId, - GomuksBorrowedBuffer data, -) { - try { - final muksEventType = command.cast().toDartString(); - final Map decodedMuksEvent = data.toJson(); - - switch (muksEventType) { - case "client_state": - final clientState = ClientState.fromJson(decodedMuksEvent); - debugPrint("Received event: $clientState"); - break; - case "sync_status": - final syncStatus = SyncStatus.fromJson(decodedMuksEvent); - debugPrint("Received event: $syncStatus"); - break; - default: - debugPrint("Unhandled event: $muksEventType: $decodedMuksEvent"); - } - } catch (error, stackTrace) { - debugPrintStack(stackTrace: stackTrace, label: error.toString()); - } -} - -class ClientController extends Notifier { +class ClientController extends AsyncNotifier { @override - int build() { - final handle = GomuksInit(); + Future build() async { + final handle = await Isolate.run(GomuksInit); ref.onDispose(() => GomuksDestroy(handle)); GomuksStart( handle, NativeCallable< Void Function(Pointer, Int64, GomuksBorrowedBuffer) - >.listener(gomuksCallback) + >.listener(( + Pointer command, + int requestId, + GomuksBorrowedBuffer data, + ) { + try { + final muksEventType = command.cast().toDartString(); + final Map decodedMuksEvent = data.toJson(); + + switch (muksEventType) { + case "client_state": + final clientState = ClientState.fromJson(decodedMuksEvent); + debugPrint("Received event: $clientState"); + break; + case "sync_status": + ref + .watch(SyncStatusController.provider.notifier) + .set(SyncStatus.fromJson(decodedMuksEvent)); + break; + default: + debugPrint( + "Unhandled event: $muksEventType: $decodedMuksEvent", + ); + } + } catch (error, stackTrace) { + debugPrintStack(stackTrace: stackTrace, label: error.toString()); + } + }) .nativeFunction, ); return handle; } - Map sendCommand(String command, Map data) { + Future> sendCommand( + String command, + Map data, + ) async { final bufferPointer = data.toGomuksBufferPtr(); - final response = GomuksSubmitCommand( - state, - command.toNativeUtf8().cast(), - bufferPointer.ref, + final handle = await future; + final response = await Isolate.run( + () => GomuksSubmitCommand( + handle, + command.toNativeUtf8().cast(), + bufferPointer.ref, + ), ); calloc.free(bufferPointer); @@ -63,7 +73,27 @@ class ClientController extends Notifier { return response.buf.toJson(); } - static final provider = NotifierProvider( + Future login(Login login) async { + try { + await sendCommand("login", login.toJson()); + return true; + } catch (_) { + return false; + } + } + + Future discoverHomeserver(Uri homeserver) async { + try { + final response = await sendCommand("discover_homeserver", { + "user_id": "@fakeuser:${homeserver.host}", + }); + return (response["m.homeserver"] as Map)["base_url"]; + } catch (_) { + return null; + } + } + + static final provider = AsyncNotifierProvider( ClientController.new, ); } diff --git a/lib/controllers/sync_status_controller.dart b/lib/controllers/sync_status_controller.dart new file mode 100644 index 0000000..fe65732 --- /dev/null +++ b/lib/controllers/sync_status_controller.dart @@ -0,0 +1,13 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/sync_status.dart"; + +class SyncStatusController extends Notifier { + @override + Null build() => null; + + void set(SyncStatus newStatus) => state = newStatus; + + static final provider = NotifierProvider( + SyncStatusController.new, + ); +} diff --git a/lib/main.dart b/lib/main.dart index eaccbfb..44757fd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,8 +3,11 @@ import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/shared_prefs_controller.dart"; +import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; +import "package:nexus/models/sync_status.dart"; +import "package:nexus/pages/login_page.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:window_manager/window_manager.dart"; import "package:flutter/material.dart"; @@ -96,50 +99,7 @@ class App extends ConsumerWidget { home: Builder( builder: (context) => ref .watch(SharedPrefsController.provider) - .betterWhen( - data: (_) => ElevatedButton( - onPressed: () async { - final response = ref - .watch(ClientController.provider.notifier) - .sendCommand("login", { - "homeserver_url": "https://matrix.federated.nexus", - "username": "quadradical", - "password": "Quadfnrad1!", - }); - print(response); - }, - child: Text("foo"), - ), - // .betterWhen( - // data: (client) => - // client.accessToken == null ? LoginPage() : ChatPage(), - // loading: () => Scaffold( - // body: Center( - // child: Column( - // mainAxisSize: MainAxisSize.min, - // spacing: 16, - // children: [ - // Text( - // "Syncing...", - // style: Theme.of(context).textTheme.headlineMedium, - // ), - // Loading(), - // ], - // ), - // ), - // appBar: Appbar( - // actions: [ - // IconButton( - // onPressed: () => Navigator.of(context).push( - // MaterialPageRoute(builder: (_) => SettingsPage()), - // ), - // icon: Icon(Icons.settings), - // ), - // ], - // ), - // ), - // ), - ), + .betterWhen(data: (_) => LoginPage()), ), ), ); diff --git a/lib/models/homeserver.dart b/lib/models/homeserver.dart new file mode 100644 index 0000000..903e23d --- /dev/null +++ b/lib/models/homeserver.dart @@ -0,0 +1,12 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "homeserver.freezed.dart"; + +@freezed +abstract class Homeserver with _$Homeserver { + const factory Homeserver({ + required String name, + required String description, + required Uri url, + required String iconUrl, + }) = _Homeserver; +} diff --git a/lib/models/login.dart b/lib/models/login.dart new file mode 100644 index 0000000..64b3c55 --- /dev/null +++ b/lib/models/login.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "login.freezed.dart"; +part "login.g.dart"; + +@freezed +abstract class Login with _$Login { + const factory Login({ + required String username, + required String password, + required String homeserverUrl, + }) = _Login; + + factory Login.fromJson(Map json) => _$LoginFromJson(json); +} diff --git a/lib/models/sync_status.dart b/lib/models/sync_status.dart index 4ea08e5..fc70139 100644 --- a/lib/models/sync_status.dart +++ b/lib/models/sync_status.dart @@ -5,7 +5,7 @@ part "sync_status.g.dart"; @freezed abstract class SyncStatus with _$SyncStatus { const factory SyncStatus({ - required Type type, + required SyncStatusType type, required int errorCount, required int lastSync, }) = _SyncStatus; @@ -15,4 +15,4 @@ abstract class SyncStatus with _$SyncStatus { } @JsonEnum(fieldRename: FieldRename.snake) -enum Type { ok, waiting, erroring, permanentlyFailed } +enum SyncStatusType { ok, waiting, erroring, permanentlyFailed } diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index a31498c..371ad66 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -5,6 +5,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/models/homeserver.dart"; +import "package:nexus/models/login.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/loading.dart"; @@ -15,27 +16,25 @@ class LoginPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final theme = Theme.of(context); + final client = ref.watch(ClientController.provider.notifier); final isLoading = useState(false); - final allowLogin = useState(false); + final homeserver = useState(null); final launch = ref.watch(LaunchHelper.provider).launchUrl; - Future setHomeserver(Uri? homeserver) async { + Future setHomeserver(Uri? newHomeserver) async { isLoading.value = true; - final succeeded = homeserver == null - ? false - : await ref - .watch(ClientController.provider.notifier) - .setHomeserver( - homeserver.hasScheme - ? homeserver - : Uri.https(homeserver.path), - ); - if (succeeded) { - allowLogin.value = true; - } else if (context.mounted) { + homeserver.value = newHomeserver == null + ? null + : await client.discoverHomeserver( + newHomeserver.hasScheme + ? newHomeserver + : Uri.https(newHomeserver.path), + ); + + if (homeserver.value == null && context.mounted) { ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text( @@ -157,7 +156,7 @@ class LoginPage extends HookConsumerWidget { ), if (isLoading.value) Padding(padding: EdgeInsets.only(top: 32), child: Loading()) - else if (allowLogin.value) ...[ + else if (homeserver.value != null) ...[ DividerText("Then, sign in:"), SizedBox(height: 4), TextField( @@ -174,9 +173,13 @@ class LoginPage extends HookConsumerWidget { ElevatedButton( onPressed: () async { isLoading.value = true; - final succeeded = await ref - .watch(ClientController.provider.notifier) - .login(username.text, password.text); + final succeeded = await client.login( + Login( + username: username.text, + password: password.text, + homeserverUrl: homeserver.value!, + ), + ); if (!succeeded && context.mounted) { ScaffoldMessenger.of(context).showSnackBar( diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 1cac43c..8b658f4 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -13,7 +13,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - flutter_vodozemac ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/pubspec.lock b/pubspec.lock index 49a2fc3..222e779 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -73,14 +73,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.13.0" - base58check: - dependency: transitive - description: - name: base58check - sha256: "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5" - url: "https://pub.dev" - source: hosted - version: "2.0.0" blurhash_dart: dependency: transitive description: @@ -105,14 +97,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.3" - build_cli_annotations: - dependency: transitive - description: - name: build_cli_annotations - sha256: e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95 - url: "https://pub.dev" - source: hosted - version: "2.1.1" build_config: dependency: transitive description: @@ -153,14 +137,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.12.1" - canonical_json: - dependency: transitive - description: - name: canonical_json - sha256: d6be1dd66b420c6ac9f42e3693e09edf4ff6edfee26cb4c28c1c019fdb8c0c15 - url: "https://pub.dev" - source: hosted - version: "1.1.2" characters: dependency: transitive description: @@ -557,14 +533,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" - flutter_rust_bridge: - dependency: transitive - description: - name: flutter_rust_bridge - sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e" - url: "https://pub.dev" - source: hosted - version: "2.11.1" flutter_secure_storage: dependency: "direct main" description: @@ -626,14 +594,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_vodozemac: - dependency: "direct main" - description: - name: flutter_vodozemac - sha256: "16d4b44dd338689441fe42a80d0184e5c864e9563823de9e7e6371620d2c0590" - url: "https://pub.dev" - source: hosted - version: "0.4.1" flutter_web_plugins: dependency: transitive description: flutter @@ -768,14 +728,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.15.6" - html_unescape: - dependency: transitive - description: - name: html_unescape - sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" - url: "https://pub.dev" - source: hosted - version: "2.0.0" http: dependency: transitive description: @@ -960,14 +912,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" - markdown: - dependency: transitive - description: - name: markdown - sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1" - url: "https://pub.dev" - source: hosted - version: "7.3.0" matcher: dependency: transitive description: @@ -984,14 +928,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.11.1" - matrix: - dependency: "direct main" - description: - name: matrix - sha256: fb116ee89f6871441f22f76a988db15cfcfb6dfac97e3e2d654c240080015707 - url: "https://pub.dev" - source: hosted - version: "4.1.0" mention_tag_text_field: dependency: "direct main" description: @@ -1192,14 +1128,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.2" - random_string: - dependency: transitive - description: - name: random_string - sha256: "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02" - url: "https://pub.dev" - source: hosted - version: "2.3.1" riverpod: dependency: transitive description: @@ -1280,14 +1208,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.26.3" - sdp_transform: - dependency: transitive - description: - name: sdp_transform - sha256: "73e412a5279a5c2de74001535208e20fff88f225c9a4571af0f7146202755e45" - url: "https://pub.dev" - source: hosted - version: "0.3.2" sembast: dependency: transitive description: @@ -1389,14 +1309,6 @@ packages: description: flutter source: sdk version: "0.0.0" - slugify: - dependency: transitive - description: - name: slugify - sha256: b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3 - url: "https://pub.dev" - source: hosted - version: "2.0.0" source_gen: dependency: "direct overridden" description: @@ -1437,30 +1349,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.1" - sqflite_common: - dependency: transitive - description: - name: sqflite_common - sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6" - url: "https://pub.dev" - source: hosted - version: "2.5.6" - sqflite_common_ffi: - dependency: "direct main" - description: - name: sqflite_common_ffi - sha256: "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025" - url: "https://pub.dev" - source: hosted - version: "2.3.7+1" - sqlite3: - dependency: transitive - description: - name: sqlite3 - sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2" - url: "https://pub.dev" - source: hosted - version: "2.9.4" stack_trace: dependency: transitive description: @@ -1581,14 +1469,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" - unorm_dart: - dependency: transitive - description: - name: unorm_dart - sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b" - url: "https://pub.dev" - source: hosted - version: "0.2.0" url_launcher: dependency: "direct main" description: @@ -1701,14 +1581,6 @@ packages: url: "https://pub.dev" source: hosted version: "15.0.2" - vodozemac: - dependency: "direct main" - description: - name: vodozemac - sha256: "39144e20740807731871c9248d811ed5a037b21d0aa9ffcfa630954de74139d9" - url: "https://pub.dev" - source: hosted - version: "0.4.0" watcher: dependency: transitive description: @@ -1749,14 +1621,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - webrtc_interface: - dependency: transitive - description: - name: webrtc_interface - sha256: "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233" - url: "https://pub.dev" - source: hosted - version: "1.3.0" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0e9adce..7893653 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,14 +54,10 @@ dependencies: git: url: https://github.com/Henry-Hiles/flutter_chat_ui path: packages/flutter_link_previewer - matrix: ^4.1.0 - sqflite_common_ffi: ^2.3.6 color_hash: ^1.0.1 - flutter_vodozemac: ^0.4.1 flutter_widget_from_html_core: ^0.17.0 flutter_svg: ^2.2.2 json_annotation: ^4.9.0 - vodozemac: ^0.4.0 shared_preferences: ^2.5.3 mention_tag_text_field: ^0.0.9 fluttertagger: ^2.3.1 diff --git a/scripts/generate.dart b/scripts/generate.dart index c332b2e..9806603 100644 --- a/scripts/generate.dart +++ b/scripts/generate.dart @@ -12,8 +12,6 @@ void main(List args) async { print("Cloning Gomuks repository..."); final cloneResult = await Process.run("git", [ "clone", - "--branch", - "tulir/ffi", "--depth", "1", "https://mau.dev/gomuks/gomuks", @@ -32,7 +30,7 @@ void main(List args) async { dartFile: Platform.script.resolve("../lib/src/third_party/gomuks.g.dart"), ), headers: Headers( - entryPoints: [File(join(repoDir.path, "pkg", "ffi", "ffi.h")).uri], + entryPoints: [File(join(repoDir.path, "pkg", "ffi", "gomuksffi.h")).uri], compilerOptions: ["--no-warnings"], ), functions: Functions.includeAll, diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 3c6fdca..8967b80 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -13,7 +13,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - flutter_vodozemac ) set(PLUGIN_BUNDLED_LIBRARIES) From 3fff32f1708b55512cc20ef509d4e43784c7c886 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 25 Jan 2026 14:32:20 +0000 Subject: [PATCH 14/34] working login --- lib/controllers/client_controller.dart | 24 ++++++++-- lib/controllers/client_state_controller.dart | 15 ++++++ .../multi_provider_controller.dart | 20 ++++++++ lib/main.dart | 48 +++++++++++++++---- lib/pages/chat_page.dart | 38 +++++++-------- lib/pages/verify_page.dart | 46 ++++++++++++++++++ lib/widgets/form_text_input.dart | 3 ++ 7 files changed, 162 insertions(+), 32 deletions(-) create mode 100644 lib/controllers/client_state_controller.dart create mode 100644 lib/controllers/multi_provider_controller.dart create mode 100644 lib/pages/verify_page.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 479b2f0..571e9c0 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -2,6 +2,7 @@ import "dart:ffi"; import "dart:isolate"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; +import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; @@ -31,18 +32,22 @@ class ClientController extends AsyncNotifier { switch (muksEventType) { case "client_state": - final clientState = ClientState.fromJson(decodedMuksEvent); - debugPrint("Received event: $clientState"); + ref + .watch(ClientStateController.provider.notifier) + .set(ClientState.fromJson(decodedMuksEvent)); break; case "sync_status": ref .watch(SyncStatusController.provider.notifier) .set(SyncStatus.fromJson(decodedMuksEvent)); break; + case "sync_complete": + // ref + // .watch(SyncStatusController.provider.notifier) + // .set(SyncStatus.fromJson(decodedMuksEvent)); + break; default: - debugPrint( - "Unhandled event: $muksEventType: $decodedMuksEvent", - ); + debugPrint("Unhandled event: $muksEventType"); } } catch (error, stackTrace) { debugPrintStack(stackTrace: stackTrace, label: error.toString()); @@ -73,6 +78,15 @@ class ClientController extends AsyncNotifier { return response.buf.toJson(); } + Future verify(String recoveryKey) async { + try { + await sendCommand("verify", {"recovery_key": recoveryKey}); + return true; + } catch (_) { + return false; + } + } + Future login(Login login) async { try { await sendCommand("login", login.toJson()); diff --git a/lib/controllers/client_state_controller.dart b/lib/controllers/client_state_controller.dart new file mode 100644 index 0000000..998d4a1 --- /dev/null +++ b/lib/controllers/client_state_controller.dart @@ -0,0 +1,15 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/client_state.dart"; + +class ClientStateController extends Notifier { + @override + Null build() => null; + + void set(ClientState newState) { + state = newState; + } + + static final provider = NotifierProvider( + ClientStateController.new, + ); +} diff --git a/lib/controllers/multi_provider_controller.dart b/lib/controllers/multi_provider_controller.dart new file mode 100644 index 0000000..e23ecaa --- /dev/null +++ b/lib/controllers/multi_provider_controller.dart @@ -0,0 +1,20 @@ +import "dart:async"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class MultiProviderController extends AsyncNotifier { + MultiProviderController(this.providers); + final IList providers; + + @override + FutureOr build() async => await Future.wait( + providers.map((provider) => ref.watch(provider.future)), + ); + + static final provider = + AsyncNotifierProvider.family< + MultiProviderController, + void, + IList + >(MultiProviderController.new); +} diff --git a/lib/main.dart b/lib/main.dart index 44757fd..a84f3f7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,14 +1,18 @@ import "dart:io"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/multi_provider_controller.dart"; import "package:nexus/controllers/shared_prefs_controller.dart"; -import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; -import "package:nexus/models/sync_status.dart"; +import "package:nexus/pages/chat_page.dart"; import "package:nexus/pages/login_page.dart"; +import "package:nexus/pages/verify_page.dart"; import "package:nexus/widgets/error_dialog.dart"; +import "package:nexus/widgets/loading.dart"; import "package:window_manager/window_manager.dart"; import "package:flutter/material.dart"; import "package:dynamic_system_colors/dynamic_system_colors.dart"; @@ -78,11 +82,11 @@ void main() async { ); } -class App extends ConsumerWidget { +class App extends StatelessWidget { const App({super.key}); @override - Widget build(BuildContext context, WidgetRef ref) => DynamicColorBuilder( + Widget build(BuildContext context) => DynamicColorBuilder( builder: (lightDynamic, darkDynamic) => MaterialApp( navigatorKey: navigatorKey, debugShowCheckedModeBanner: false, @@ -96,10 +100,38 @@ class App extends ConsumerWidget { brightness: Brightness.dark, )) .theme, - home: Builder( - builder: (context) => ref - .watch(SharedPrefsController.provider) - .betterWhen(data: (_) => LoginPage()), + home: Scaffold( + body: Consumer( + builder: (_, ref, _) => ref + .watch( + MultiProviderController.provider( + IListConst([ + SharedPrefsController.provider, + ClientController.provider, + ]), + ), + ) + .betterWhen( + data: (_) => Consumer( + builder: (_, ref, _) { + final clientState = ref.watch( + ClientStateController.provider, + ); + if (clientState == null || !clientState.isInitialized) { + return Loading(); + } + + if (!clientState.isLoggedIn) { + return LoginPage(); + } else if (!clientState.isVerified) { + return VerifyPage(); + } else { + return ChatPage(); + } + }, + ), + ), + ), ), ), ); diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index c60cc45..23f6a09 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; -import "package:nexus/widgets/chat_page/room_chat.dart"; -import "package:nexus/widgets/chat_page/sidebar.dart"; +// import "package:nexus/widgets/chat_page/room_chat.dart"; +// import "package:nexus/widgets/chat_page/sidebar.dart"; class ChatPage extends StatelessWidget { const ChatPage({super.key}); @@ -10,23 +10,23 @@ class ChatPage extends StatelessWidget { builder: (context, constraints) { final isDesktop = constraints.maxWidth > 650; final showMembersByDefault = constraints.maxWidth > 1000; - - return Scaffold( - body: Builder( - builder: (context) => Row( - children: [ - if (isDesktop) Sidebar(), - Expanded( - child: RoomChat( - isDesktop: isDesktop, - showMembersByDefault: showMembersByDefault, - ), - ), - ], - ), - ), - drawer: isDesktop ? null : Sidebar(), - ); + return Placeholder(); + // return Scaffold( + // body: Builder( + // builder: (context) => Row( + // children: [ + // if (isDesktop) Sidebar(), + // Expanded( + // child: RoomChat( + // isDesktop: isDesktop, + // showMembersByDefault: showMembersByDefault, + // ), + // ), + // ], + // ), + // ), + // drawer: isDesktop ? null : Sidebar(), + // ); }, ); } diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart new file mode 100644 index 0000000..bc33151 --- /dev/null +++ b/lib/pages/verify_page.dart @@ -0,0 +1,46 @@ +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/widgets/form_text_input.dart"; + +class VerifyPage extends HookConsumerWidget { + const VerifyPage({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final passphraseController = useTextEditingController(); + return AlertDialog( + title: Text("Verify"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Enter your recovery key or passphrase below to unlock encrypted messages.\nYour passphrase is usually not the same as your password.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + autofocus: true, + capitalize: true, + controller: passphraseController, + obscure: true, + title: "Recovery Key or Passphrase", + ), + ], + ), + actions: [ + TextButton( + onPressed: () async { + ref + .watch(ClientController.provider.notifier) + .verify(passphraseController.text); + Navigator.of(context).pop(); + }, + child: Text("Verify"), + ), + ], + ); + } +} diff --git a/lib/widgets/form_text_input.dart b/lib/widgets/form_text_input.dart index 492439b..21b2e5c 100644 --- a/lib/widgets/form_text_input.dart +++ b/lib/widgets/form_text_input.dart @@ -20,11 +20,13 @@ class FormTextInput extends StatelessWidget { final Widget? trailing; final InputBorder? border; final List? formatters; + final bool autofocus; const FormTextInput({ super.key, this.border, this.controller, + this.autofocus = false, this.title, this.obscure = false, this.readOnly = false, @@ -45,6 +47,7 @@ class FormTextInput extends StatelessWidget { @override Widget build(BuildContext context) => TextFormField( + autofocus: autofocus, controller: controller, keyboardType: keyboardType, readOnly: readOnly, From 095c72f983385596ea9d874195e6d02e2f3f6109 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 25 Jan 2026 15:00:33 +0000 Subject: [PATCH 15/34] Nicer verification error --- lib/controllers/client_controller.dart | 6 ++-- lib/pages/verify_page.dart | 48 ++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 571e9c0..59bb0b9 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -82,7 +82,7 @@ class ClientController extends AsyncNotifier { try { await sendCommand("verify", {"recovery_key": recoveryKey}); return true; - } catch (_) { + } catch (error) { return false; } } @@ -91,7 +91,7 @@ class ClientController extends AsyncNotifier { try { await sendCommand("login", login.toJson()); return true; - } catch (_) { + } catch (error) { return false; } } @@ -102,7 +102,7 @@ class ClientController extends AsyncNotifier { "user_id": "@fakeuser:${homeserver.host}", }); return (response["m.homeserver"] as Map)["base_url"]; - } catch (_) { + } catch (error) { return null; } } diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart index bc33151..1011f80 100644 --- a/lib/pages/verify_page.dart +++ b/lib/pages/verify_page.dart @@ -10,6 +10,7 @@ class VerifyPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final passphraseController = useTextEditingController(); + final isVerifying = useState(false); return AlertDialog( title: Text("Verify"), content: Column( @@ -32,12 +33,47 @@ class VerifyPage extends HookConsumerWidget { ), actions: [ TextButton( - onPressed: () async { - ref - .watch(ClientController.provider.notifier) - .verify(passphraseController.text); - Navigator.of(context).pop(); - }, + onPressed: isVerifying.value + ? null + : () async { + final scaffoldMessenger = ScaffoldMessenger.of(context); + final snackbar = scaffoldMessenger.showSnackBar( + SnackBar( + content: Text( + "Attempting to verify with recovery key...", + ), + duration: Duration(days: 999), + ), + ); + + isVerifying.value = true; + + final success = await ref + .watch(ClientController.provider.notifier) + .verify(passphraseController.text); + + snackbar.close(); + if (!success) { + isVerifying.value = false; + if (context.mounted) { + scaffoldMessenger.showSnackBar( + SnackBar( + backgroundColor: Theme.of( + context, + ).colorScheme.errorContainer, + content: Text( + "Verification failed. Is your passphrase correct?", + style: TextStyle( + color: Theme.of( + context, + ).colorScheme.onErrorContainer, + ), + ), + ), + ); + } + } + }, child: Text("Verify"), ), ], From 4862bf47c78a7083e516eca51b342f336902529f Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 26 Jan 2026 11:35:45 +0000 Subject: [PATCH 16/34] wip --- lib/controllers/client_controller.dart | 9 +++ lib/controllers/database_controller.dart | 18 ------ lib/models/content_uri.dart | 14 ++++ lib/models/epoch_date_time_converter.dart | 11 ++++ lib/models/event.dart | 79 +++++++++++++++++++++++ lib/models/lazy_load_summary.dart | 15 +++++ lib/models/read_receipt.dart | 18 ++++++ lib/models/room.dart | 34 ++++++++++ lib/models/room_metadata.dart | 27 ++++++++ lib/models/sync_complete.dart | 20 ++++++ lib/models/sync_status.dart | 2 +- 11 files changed, 228 insertions(+), 19 deletions(-) delete mode 100644 lib/controllers/database_controller.dart create mode 100644 lib/models/content_uri.dart create mode 100644 lib/models/epoch_date_time_converter.dart create mode 100644 lib/models/event.dart create mode 100644 lib/models/lazy_load_summary.dart create mode 100644 lib/models/read_receipt.dart create mode 100644 lib/models/room.dart create mode 100644 lib/models/room_metadata.dart create mode 100644 lib/models/sync_complete.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 59bb0b9..d0e1633 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,3 +1,5 @@ +import "dart:convert"; +import "dart:developer"; import "dart:ffi"; import "dart:isolate"; import "package:ffi/ffi.dart"; @@ -7,6 +9,7 @@ import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; import "package:nexus/models/login.dart"; +import "package:nexus/models/sync_complete.dart"; import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; @@ -42,10 +45,16 @@ class ClientController extends AsyncNotifier { .set(SyncStatus.fromJson(decodedMuksEvent)); break; case "sync_complete": + debugger(message: jsonEncode(decodedMuksEvent)); + final thing = SyncComplete.fromJson(decodedMuksEvent); + debugger(message: jsonEncode(thing.toJson())); // ref // .watch(SyncStatusController.provider.notifier) // .set(SyncStatus.fromJson(decodedMuksEvent)); break; + case "typing": + //TODO: IMPL + break; default: debugPrint("Unhandled event: $muksEventType"); } diff --git a/lib/controllers/database_controller.dart b/lib/controllers/database_controller.dart deleted file mode 100644 index 706560b..0000000 --- a/lib/controllers/database_controller.dart +++ /dev/null @@ -1,18 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:path/path.dart"; -import "package:path_provider/path_provider.dart"; -import "package:sqflite_common_ffi/sqflite_ffi.dart"; - -class DatabaseController extends AsyncNotifier { - @override - Future build() async { - databaseFactory = databaseFactoryFfi; - return databaseFactoryFfi.openDatabase( - join((await getApplicationSupportDirectory()).path, "database.db"), - ); - } - - static final provider = AsyncNotifierProvider( - DatabaseController.new, - ); -} diff --git a/lib/models/content_uri.dart b/lib/models/content_uri.dart new file mode 100644 index 0000000..92d3a44 --- /dev/null +++ b/lib/models/content_uri.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "content_uri.freezed.dart"; +part "content_uri.g.dart"; + +@freezed +abstract class ContentUri with _$ContentUri { + const factory ContentUri({ + required String homeserver, + required String fileID, + }) = _ContentUri; + + factory ContentUri.fromJson(Map json) => + _$ContentUriFromJson(json); +} diff --git a/lib/models/epoch_date_time_converter.dart b/lib/models/epoch_date_time_converter.dart new file mode 100644 index 0000000..c26d020 --- /dev/null +++ b/lib/models/epoch_date_time_converter.dart @@ -0,0 +1,11 @@ +import "package:freezed_annotation/freezed_annotation.dart"; + +class EpochDateTimeConverter implements JsonConverter { + const EpochDateTimeConverter(); + + @override + DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json); + + @override + int toJson(DateTime object) => object.millisecondsSinceEpoch; +} diff --git a/lib/models/event.dart b/lib/models/event.dart new file mode 100644 index 0000000..3a3ecbd --- /dev/null +++ b/lib/models/event.dart @@ -0,0 +1,79 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +part "event.freezed.dart"; +part "event.g.dart"; + +@freezed +abstract class Event with _$Event { + const factory Event({ + @JsonKey(name: "rowid") required int rowId, + @JsonKey(name: "timeline_rowid") required int timelineRowId, + required String roomId, + required int eventId, + @JsonKey(name: "sender") required int authorId, + required String type, + required String stateKey, + @EpochDateTimeConverter() required DateTime timestamp, + required Map content, + required Map decrypted, + required Map decryptedType, + required Map unsigned, + required LocalContent localContent, + required String transactionId, + required String redactedBy, + required String relatesTo, + required String relatesType, + required String decryptionError, + required String sendError, + required Map reactions, + required int lastEditRowId, + @UnreadTypeConverter() UnreadType? unreadType, + }) = _Event; + + factory Event.fromJson(Map json) => _$EventFromJson(json); +} + +@freezed +abstract class LocalContent with _$LocalContent { + const factory LocalContent({ + required String sanitizedHtml, + required String htmlVersion, + required bool wasPlaintext, + required bool bigEmoji, + required bool hasMath, + required String editSource, + required String replyFallbackRemoved, + }) = _LocalContent; + + factory LocalContent.fromJson(Map json) => + _$LocalContentFromJson(json); +} + +class UnreadTypeConverter implements JsonConverter { + const UnreadTypeConverter(); + + @override + UnreadType? fromJson(int? json) => json == null ? null : UnreadType(json); + + @override + int? toJson(UnreadType? object) => object?.value; +} + +@immutable +class UnreadType { + final int value; + + const UnreadType(this.value); + + static const none = UnreadType(0); + static const normal = UnreadType(1); + static const notify = UnreadType(2); + static const highlight = UnreadType(4); + static const sound = UnreadType(8); + + bool get isNone => value == 0; + bool get isNormal => (value & 1) != 0; + bool get shouldNotify => (value & 2) != 0; + bool get isHighlighted => (value & 4) != 0; + bool get playsSound => (value & 8) != 0; +} diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart new file mode 100644 index 0000000..5d7db14 --- /dev/null +++ b/lib/models/lazy_load_summary.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "lazy_load_summary.freezed.dart"; +part "lazy_load_summary.g.dart"; + +@freezed +abstract class LazyLoadSummary with _$LazyLoadSummary { + const factory LazyLoadSummary({ + required List heroes, + required int? joinedMemberCount, + required int? invitedMemberCount, + }) = _LazyLoadSummary; + + factory LazyLoadSummary.fromJson(Map json) => + _$LazyLoadSummaryFromJson(json); +} diff --git a/lib/models/read_receipt.dart b/lib/models/read_receipt.dart new file mode 100644 index 0000000..d533e2d --- /dev/null +++ b/lib/models/read_receipt.dart @@ -0,0 +1,18 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +part "read_receipt.freezed.dart"; +part "read_receipt.g.dart"; + +@freezed +abstract class ReadReceipt with _$ReadReceipt { + const factory ReadReceipt({ + String? roomId, + required String userId, + String? threadId, + required String eventId, + @EpochDateTimeConverter() required DateTime timestamp, + }) = _ReadReceipt; + + factory ReadReceipt.fromJson(Map json) => + _$ReadReceiptFromJson(json); +} diff --git a/lib/models/room.dart b/lib/models/room.dart new file mode 100644 index 0000000..c186863 --- /dev/null +++ b/lib/models/room.dart @@ -0,0 +1,34 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/read_receipt.dart"; +import "package:nexus/models/room_metadata.dart"; +part "room.freezed.dart"; +part "room.g.dart"; + +@freezed +abstract class Room with _$Room { + const factory Room({ + @JsonKey(name: "meta") RoomMetadata? metadata, + required List timeline, + required bool reset, + required Map state, + // required Map accountData, + required List events, + required Map> receipts, + required bool dismissNotifications, + // required List notifications, + }) = _Room; + + factory Room.fromJson(Map json) => _$RoomFromJson(json); +} + +@freezed +abstract class TimelineRowTuple with _$TimelineRowTuple { + const factory TimelineRowTuple({ + @JsonKey(name: "timeline_rowid") required int timelineRowId, + @JsonKey(name: "timeline_eventid") required int eventRowId, + }) = _TimelineRowTuple; + + factory TimelineRowTuple.fromJson(Map json) => + _$TimelineRowTupleFromJson(json); +} diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart new file mode 100644 index 0000000..cfbc5d9 --- /dev/null +++ b/lib/models/room_metadata.dart @@ -0,0 +1,27 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/content_uri.dart"; +import "package:nexus/models/epoch_date_time_converter.dart"; +import "package:nexus/models/lazy_load_summary.dart"; +part "room_metadata.freezed.dart"; +part "room_metadata.g.dart"; + +@freezed +abstract class RoomMetadata with _$RoomMetadata { + const factory RoomMetadata({ + @JsonKey(name: "room_id") required String id, + // required CreateEventContent creationContent, + // required TombstoneEventContent tombstoneEventContent, + String? name, + ContentUri? avatar, + String? topic, + String? canonicalAlias, + LazyLoadSummary? lazyLoadSummary, + required bool hasMemberList, + @JsonKey(name: "preview_event_rowid") required String previewEventRowID, + @EpochDateTimeConverter() required DateTime sortingTimestamp, + @Default(false) bool markedUnread, + }) = _RoomMetadata; + + factory RoomMetadata.fromJson(Map json) => + _$RoomMetadataFromJson(json); +} diff --git a/lib/models/sync_complete.dart b/lib/models/sync_complete.dart new file mode 100644 index 0000000..f01f533 --- /dev/null +++ b/lib/models/sync_complete.dart @@ -0,0 +1,20 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/room.dart"; +part "sync_complete.freezed.dart"; +part "sync_complete.g.dart"; + +@freezed +abstract class SyncComplete with _$SyncComplete { + const factory SyncComplete({ + @Default(false) bool clearState, + // required Map accountData, + required Map rooms, + required List leftRooms, + // required List invitedRooms, + // required List spaceEdges, + required List topLevelSpaces, + }) = _SyncComplete; + + factory SyncComplete.fromJson(Map json) => + _$SyncCompleteFromJson(json); +} diff --git a/lib/models/sync_status.dart b/lib/models/sync_status.dart index fc70139..42c5f2a 100644 --- a/lib/models/sync_status.dart +++ b/lib/models/sync_status.dart @@ -6,8 +6,8 @@ part "sync_status.g.dart"; abstract class SyncStatus with _$SyncStatus { const factory SyncStatus({ required SyncStatusType type, + String? error, required int errorCount, - required int lastSync, }) = _SyncStatus; factory SyncStatus.fromJson(Map json) => From 97f2673b558f24e0e4469470361f73dd05e22404 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 26 Jan 2026 19:39:02 +0000 Subject: [PATCH 17/34] working sync complete --- hook/build.dart | 5 +-- lib/controllers/client_controller.dart | 20 ++++++----- lib/helpers/extensions/get_full_room.dart | 13 ------- lib/helpers/extensions/gomuks_buffer.dart | 14 -------- lib/models/content_uri.dart | 14 -------- lib/models/event.dart | 42 +++++++++++------------ lib/models/lazy_load_summary.dart | 2 +- lib/models/room.dart | 6 ++-- lib/models/room_metadata.dart | 5 ++- lib/models/sync_complete.dart | 20 ----------- lib/models/sync_data.dart | 20 +++++++++++ 11 files changed, 61 insertions(+), 100 deletions(-) delete mode 100644 lib/helpers/extensions/get_full_room.dart delete mode 100644 lib/models/content_uri.dart delete mode 100644 lib/models/sync_complete.dart create mode 100644 lib/models/sync_data.dart diff --git a/hook/build.dart b/hook/build.dart index 6ebc80e..4cb2f91 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -25,7 +25,7 @@ Future main(List args) => build(args, (input, output) async { final gomuksBuildDir = buildDir.resolve("gomuks/"); final libFile = gomuksBuildDir.resolve(libFileName); - print("Building Gomuks shared library $libFileName..."); + print("Building Gomuks shared library $libFileName from source..."); final result = await Process.run("go", [ "build", "-o", @@ -48,6 +48,7 @@ Future main(List args) => build(args, (input, output) async { file: libFile, ), ) - ..dependencies.add(libFile); + ..dependencies.add(libFile) + ..dependencies.add(gomuksBuildDir); print("Done!"); }); diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index d0e1633..cd4aff2 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -9,7 +9,7 @@ import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; import "package:nexus/models/login.dart"; -import "package:nexus/models/sync_complete.dart"; +import "package:nexus/models/sync_data.dart"; import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; @@ -20,17 +20,18 @@ class ClientController extends AsyncNotifier { final handle = await Isolate.run(GomuksInit); ref.onDispose(() => GomuksDestroy(handle)); - GomuksStart( + final errorCode = GomuksStart( handle, NativeCallable< - Void Function(Pointer, Int64, GomuksBorrowedBuffer) + Void Function(Pointer, Int64, GomuksOwnedBuffer) >.listener(( Pointer command, int requestId, - GomuksBorrowedBuffer data, + GomuksOwnedBuffer data, ) { try { final muksEventType = command.cast().toDartString(); + debugPrint("Handling $muksEventType..."); final Map decodedMuksEvent = data.toJson(); switch (muksEventType) { @@ -45,9 +46,9 @@ class ClientController extends AsyncNotifier { .set(SyncStatus.fromJson(decodedMuksEvent)); break; case "sync_complete": - debugger(message: jsonEncode(decodedMuksEvent)); - final thing = SyncComplete.fromJson(decodedMuksEvent); - debugger(message: jsonEncode(thing.toJson())); + final syncData = SyncData.fromJson(decodedMuksEvent); + debugPrint(jsonEncode(syncData.toJson())); + // ref // .watch(SyncStatusController.provider.notifier) // .set(SyncStatus.fromJson(decodedMuksEvent)); @@ -58,14 +59,17 @@ class ClientController extends AsyncNotifier { default: debugPrint("Unhandled event: $muksEventType"); } + debugPrint("Finished handling $muksEventType..."); } catch (error, stackTrace) { + debugger(); debugPrintStack(stackTrace: stackTrace, label: error.toString()); } }) .nativeFunction, ); - return handle; + if (errorCode == 0) return handle; + throw Exception("GomuksStart returned error code $errorCode"); } Future> sendCommand( diff --git a/lib/helpers/extensions/get_full_room.dart b/lib/helpers/extensions/get_full_room.dart deleted file mode 100644 index bbd0bc5..0000000 --- a/lib/helpers/extensions/get_full_room.dart +++ /dev/null @@ -1,13 +0,0 @@ -import "package:matrix/matrix.dart"; -import "package:nexus/models/full_room.dart"; - -extension GetFullRoom on Room { - Future get fullRoom async { - await loadHeroUsers(); - return FullRoom( - roomData: this, - title: getLocalizedDisplayname(), - avatar: await avatar?.getThumbnailUri(client, width: 24, height: 24), - ); - } -} diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index bfae939..aab1f1f 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -1,23 +1,9 @@ import "dart:convert"; import "dart:ffi"; import "dart:typed_data"; - import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; -extension GomuksBorrowedBufferToJson on GomuksBorrowedBuffer { - Uint8List toBytes() { - if (base == nullptr || length <= 0) return Uint8List(0); - return base.asTypedList(length); - } - - Map toJson() { - final bytes = toBytes(); - if (bytes.isEmpty) return {}; - return jsonDecode(utf8.decode(bytes)); - } -} - extension GomuksOwnedBufferToJson on GomuksOwnedBuffer { Uint8List toBytes() { try { diff --git a/lib/models/content_uri.dart b/lib/models/content_uri.dart deleted file mode 100644 index 92d3a44..0000000 --- a/lib/models/content_uri.dart +++ /dev/null @@ -1,14 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "content_uri.freezed.dart"; -part "content_uri.g.dart"; - -@freezed -abstract class ContentUri with _$ContentUri { - const factory ContentUri({ - required String homeserver, - required String fileID, - }) = _ContentUri; - - factory ContentUri.fromJson(Map json) => - _$ContentUriFromJson(json); -} diff --git a/lib/models/event.dart b/lib/models/event.dart index 3a3ecbd..ce621a3 100644 --- a/lib/models/event.dart +++ b/lib/models/event.dart @@ -9,24 +9,24 @@ abstract class Event with _$Event { @JsonKey(name: "rowid") required int rowId, @JsonKey(name: "timeline_rowid") required int timelineRowId, required String roomId, - required int eventId, - @JsonKey(name: "sender") required int authorId, + required String eventId, + @JsonKey(name: "sender") required String authorId, required String type, - required String stateKey, + String? stateKey, @EpochDateTimeConverter() required DateTime timestamp, required Map content, - required Map decrypted, - required Map decryptedType, - required Map unsigned, - required LocalContent localContent, - required String transactionId, - required String redactedBy, - required String relatesTo, - required String relatesType, - required String decryptionError, - required String sendError, - required Map reactions, - required int lastEditRowId, + Map? decrypted, + String? decryptedType, + @Default({}) Map unsigned, + LocalContent? localContent, + String? transactionId, + String? redactedBy, + String? relatesTo, + String? relatesType, + String? decryptionError, + String? sendError, + @Default({}) Map reactions, + int? lastEditRowId, @UnreadTypeConverter() UnreadType? unreadType, }) = _Event; @@ -36,13 +36,11 @@ abstract class Event with _$Event { @freezed abstract class LocalContent with _$LocalContent { const factory LocalContent({ - required String sanitizedHtml, - required String htmlVersion, - required bool wasPlaintext, - required bool bigEmoji, - required bool hasMath, - required String editSource, - required String replyFallbackRemoved, + String? sanitizedHtml, + bool? wasPlaintext, + bool? bigEmoji, + bool? hasMath, + bool? replyFallbackRemoved, }) = _LocalContent; factory LocalContent.fromJson(Map json) => diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart index 5d7db14..5314af8 100644 --- a/lib/models/lazy_load_summary.dart +++ b/lib/models/lazy_load_summary.dart @@ -5,7 +5,7 @@ part "lazy_load_summary.g.dart"; @freezed abstract class LazyLoadSummary with _$LazyLoadSummary { const factory LazyLoadSummary({ - required List heroes, + required List? heroes, required int? joinedMemberCount, required int? invitedMemberCount, }) = _LazyLoadSummary; diff --git a/lib/models/room.dart b/lib/models/room.dart index c186863..a83daef 100644 --- a/lib/models/room.dart +++ b/lib/models/room.dart @@ -9,12 +9,12 @@ part "room.g.dart"; abstract class Room with _$Room { const factory Room({ @JsonKey(name: "meta") RoomMetadata? metadata, - required List timeline, + @Default([]) List timeline, required bool reset, required Map state, // required Map accountData, required List events, - required Map> receipts, + @Default({}) Map> receipts, required bool dismissNotifications, // required List notifications, }) = _Room; @@ -26,7 +26,7 @@ abstract class Room with _$Room { abstract class TimelineRowTuple with _$TimelineRowTuple { const factory TimelineRowTuple({ @JsonKey(name: "timeline_rowid") required int timelineRowId, - @JsonKey(name: "timeline_eventid") required int eventRowId, + @JsonKey(name: "timeline_eventid") int? eventRowId, }) = _TimelineRowTuple; factory TimelineRowTuple.fromJson(Map json) => diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart index cfbc5d9..905f220 100644 --- a/lib/models/room_metadata.dart +++ b/lib/models/room_metadata.dart @@ -1,5 +1,4 @@ import "package:freezed_annotation/freezed_annotation.dart"; -import "package:nexus/models/content_uri.dart"; import "package:nexus/models/epoch_date_time_converter.dart"; import "package:nexus/models/lazy_load_summary.dart"; part "room_metadata.freezed.dart"; @@ -12,12 +11,12 @@ abstract class RoomMetadata with _$RoomMetadata { // required CreateEventContent creationContent, // required TombstoneEventContent tombstoneEventContent, String? name, - ContentUri? avatar, + Uri? avatar, String? topic, String? canonicalAlias, LazyLoadSummary? lazyLoadSummary, required bool hasMemberList, - @JsonKey(name: "preview_event_rowid") required String previewEventRowID, + @JsonKey(name: "preview_event_rowid") required int previewEventRowID, @EpochDateTimeConverter() required DateTime sortingTimestamp, @Default(false) bool markedUnread, }) = _RoomMetadata; diff --git a/lib/models/sync_complete.dart b/lib/models/sync_complete.dart deleted file mode 100644 index f01f533..0000000 --- a/lib/models/sync_complete.dart +++ /dev/null @@ -1,20 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -import "package:nexus/models/room.dart"; -part "sync_complete.freezed.dart"; -part "sync_complete.g.dart"; - -@freezed -abstract class SyncComplete with _$SyncComplete { - const factory SyncComplete({ - @Default(false) bool clearState, - // required Map accountData, - required Map rooms, - required List leftRooms, - // required List invitedRooms, - // required List spaceEdges, - required List topLevelSpaces, - }) = _SyncComplete; - - factory SyncComplete.fromJson(Map json) => - _$SyncCompleteFromJson(json); -} diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart new file mode 100644 index 0000000..4da57c2 --- /dev/null +++ b/lib/models/sync_data.dart @@ -0,0 +1,20 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/room.dart"; +part "sync_data.freezed.dart"; +part "sync_data.g.dart"; + +@freezed +abstract class SyncData with _$SyncData { + const factory SyncData({ + @Default(false) bool clearState, + // required Map accountData, + @Default({}) Map rooms, + @Default([]) List leftRooms, + // required List invitedRooms, + // required List spaceEdges, + @Default([]) List topLevelSpaces, + }) = _SyncData; + + factory SyncData.fromJson(Map json) => + _$SyncDataFromJson(json); +} From c084bc4caff030164058448a130bbe766ba08ead Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 27 Jan 2026 01:13:02 +0000 Subject: [PATCH 18/34] wip --- lib/controllers/client_controller.dart | 102 ++++++++++-------- lib/controllers/rooms_controller.dart | 62 ++++++++--- lib/controllers/spaces_controller.dart | 72 +++++-------- .../top_level_spaces_controller.dart | 14 +++ lib/helpers/extensions/get_headers.dart | 5 - lib/helpers/extensions/room_to_children.dart | 27 ----- lib/models/event.dart | 10 +- lib/models/lazy_load_summary.dart | 3 +- lib/models/room.dart | 13 +-- lib/models/room_metadata.dart | 2 + lib/models/space.dart | 15 +++ lib/models/sync_data.dart | 13 +-- 12 files changed, 182 insertions(+), 156 deletions(-) create mode 100644 lib/controllers/top_level_spaces_controller.dart delete mode 100644 lib/helpers/extensions/get_headers.dart delete mode 100644 lib/helpers/extensions/room_to_children.dart create mode 100644 lib/models/space.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index cd4aff2..2ebb772 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,11 +1,12 @@ -import "dart:convert"; import "dart:developer"; import "dart:ffi"; import "dart:isolate"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/sync_status_controller.dart"; +import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; import "package:nexus/models/login.dart"; @@ -18,55 +19,64 @@ class ClientController extends AsyncNotifier { @override Future build() async { final handle = await Isolate.run(GomuksInit); - ref.onDispose(() => GomuksDestroy(handle)); - final errorCode = GomuksStart( - handle, - NativeCallable< - Void Function(Pointer, Int64, GomuksOwnedBuffer) - >.listener(( - Pointer command, - int requestId, - GomuksOwnedBuffer data, - ) { - try { - final muksEventType = command.cast().toDartString(); - debugPrint("Handling $muksEventType..."); - final Map decodedMuksEvent = data.toJson(); + final callable = + NativeCallable< + Void Function(Pointer, Int64, GomuksOwnedBuffer) + >.listener(( + Pointer command, + int requestId, + GomuksOwnedBuffer data, + ) { + try { + final muksEventType = command.cast().toDartString(); + debugPrint("Handling $muksEventType..."); + final Map decodedMuksEvent = data.toJson(); - switch (muksEventType) { - case "client_state": - ref - .watch(ClientStateController.provider.notifier) - .set(ClientState.fromJson(decodedMuksEvent)); - break; - case "sync_status": - ref - .watch(SyncStatusController.provider.notifier) - .set(SyncStatus.fromJson(decodedMuksEvent)); - break; - case "sync_complete": - final syncData = SyncData.fromJson(decodedMuksEvent); - debugPrint(jsonEncode(syncData.toJson())); + switch (muksEventType) { + case "client_state": + ref + .watch(ClientStateController.provider.notifier) + .set(ClientState.fromJson(decodedMuksEvent)); + break; + case "sync_status": + ref + .watch(SyncStatusController.provider.notifier) + .set(SyncStatus.fromJson(decodedMuksEvent)); + break; + case "sync_complete": + final syncData = SyncData.fromJson(decodedMuksEvent); + final roomProvider = RoomsController.provider; - // ref - // .watch(SyncStatusController.provider.notifier) - // .set(SyncStatus.fromJson(decodedMuksEvent)); - break; - case "typing": - //TODO: IMPL - break; - default: - debugPrint("Unhandled event: $muksEventType"); - } - debugPrint("Finished handling $muksEventType..."); - } catch (error, stackTrace) { - debugger(); - debugPrintStack(stackTrace: stackTrace, label: error.toString()); + if (syncData.clearState) ref.invalidate(roomProvider); + ref + .watch(roomProvider.notifier) + .update(syncData.rooms, syncData.leftRooms); + ref + .watch(TopLevelSpacesController.provider.notifier) + .set(syncData.topLevelSpaces); + + // ref + // .watch(SyncStatusController.provider.notifier) + // .set(SyncStatus.fromJson(decodedMuksEvent)); + break; + case "typing": + //TODO: IMPL + break; + default: + debugPrint("Unhandled event: $muksEventType"); } - }) - .nativeFunction, - ); + debugPrint("Finished handling $muksEventType..."); + } catch (error, stackTrace) { + debugger(); + debugPrintStack(stackTrace: stackTrace, label: error.toString()); + } + }); + + ref.onDispose(() => GomuksDestroy(handle)); + ref.onDispose(callable.close); + + final errorCode = GomuksStart(handle, callable.nativeFunction); if (errorCode == 0) return handle; throw Exception("GomuksStart returned error code $errorCode"); diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart index 864d656..0a41f31 100644 --- a/lib/controllers/rooms_controller.dart +++ b/lib/controllers/rooms_controller.dart @@ -1,23 +1,57 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/read_receipt.dart"; +import "package:nexus/models/room.dart"; -class RoomsController extends AsyncNotifier> { +class RoomsController extends Notifier> { @override - Future> build() async { - final client = await ref.watch(ClientController.provider.future); + IMap build() => const IMap.empty(); - ref.onDispose( - client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel, + void update(IMap rooms, ISet leftRooms) { + final merged = rooms.entries.fold(state, (acc, entry) { + final roomId = entry.key; + final incoming = entry.value; + final existing = acc[roomId]; + + return acc.add( + roomId, + existing?.copyWith( + metadata: incoming.metadata ?? existing.metadata, + events: existing.events.addAll(incoming.events), + state: incoming.state.entries.fold( + existing.state, + (stateAcc, event) => stateAcc.add( + event.key, + (stateAcc[event.key] ?? IMap()).addAll( + event.value, + ), + ), + ), + timeline: incoming.reset + ? incoming.timeline + : existing.timeline.addAll(incoming.timeline), + receipts: incoming.receipts.entries.fold( + existing.receipts, + (receiptAcc, event) => receiptAcc.add( + event.key, + (receiptAcc[event.key] ?? IList()).addAll( + event.value, + ), + ), + ), + ) ?? + incoming, + ); + }); + + final prunedList = leftRooms.fold( + merged, + (acc, roomId) => acc.remove(roomId), ); - - return IList(await Future.wait(client.rooms.map((room) => room.fullRoom))); + state = prunedList; } - static final provider = - AsyncNotifierProvider>( - RoomsController.new, - ); + static final provider = NotifierProvider>( + RoomsController.new, + ); } diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index 408dc00..e269584 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -2,72 +2,50 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/helpers/extensions/room_to_children.dart"; +import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/models/space.dart"; class SpacesController extends AsyncNotifier> { @override Future> build() async { - final client = await ref.watch(ClientController.provider.future); + final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); + final rooms = ref.watch(RoomsController.provider); - ref.onDispose( - client.onSync.stream.listen((_) => ref.invalidateSelf()).cancel, - ); + final topLevelSpaces = topLevelSpaceIds + .map((id) => rooms[id]) + .nonNulls + .toIList(); - final topLevel = IList( - await Future.wait( - client.rooms - .where((room) => !room.isDirectChat) - .where( - (room) => client.rooms - .where((room) => room.isSpace) - .every( - (match) => match.spaceChildren.every( - (child) => child.roomId != room.id, - ), - ), - ) - .map((room) => room.fullRoom), - ), - ); + final dmRooms = rooms.values + .where((room) => room.metadata?.dmUserId != null) + .toIList(); - final topLevelSpaces = topLevel.where((r) => r.roomData.isSpace).toIList(); - final topLevelRooms = topLevel.where((r) => !r.roomData.isSpace).toIList(); + final topLevelRooms = rooms.values + .where((room) => room.metadata?.dmUserId == null) + .where( + (room) => spaceRooms.every( + (space) => + space.spaceChildren.every((child) => child.roomId != room.id), + ), + ) + .toIList(); + // 4️⃣ Combine all into a single IList return IList([ Space( - client: client, - title: "Home", id: "home", + title: "Home", children: topLevelRooms, icon: Icons.home, ), Space( - client: client, - title: "Direct Messages", id: "dms", - children: IList( - await Future.wait( - client.rooms - .where((room) => room.isDirectChat) - .map((room) => room.fullRoom), - ), - ), + title: "Direct Messages", + children: dmRooms, icon: Icons.person, ), - ...(await Future.wait( - topLevelSpaces.map( - (space) async => Space( - client: client, - title: space.title, - avatar: space.avatar, - id: space.roomData.id, - roomData: space.roomData, - children: IList(await space.roomData.getAllChildren()), - ), - ), - )), + ...topLevelSpaces, ]); } diff --git a/lib/controllers/top_level_spaces_controller.dart b/lib/controllers/top_level_spaces_controller.dart new file mode 100644 index 0000000..e1f9c88 --- /dev/null +++ b/lib/controllers/top_level_spaces_controller.dart @@ -0,0 +1,14 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class TopLevelSpacesController extends Notifier> { + @override + IList build() => const IList.empty(); + + void set(IList newSpaces) => state = newSpaces; + + static final provider = + NotifierProvider>( + TopLevelSpacesController.new, + ); +} diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart deleted file mode 100644 index b8b1fde..0000000 --- a/lib/helpers/extensions/get_headers.dart +++ /dev/null @@ -1,5 +0,0 @@ -import "package:matrix/matrix.dart"; - -extension GetHeaders on Client { - Map get headers => {"authorization": "Bearer $accessToken"}; -} diff --git a/lib/helpers/extensions/room_to_children.dart b/lib/helpers/extensions/room_to_children.dart deleted file mode 100644 index d115f9a..0000000 --- a/lib/helpers/extensions/room_to_children.dart +++ /dev/null @@ -1,27 +0,0 @@ -import "package:collection/collection.dart"; -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/helpers/extensions/get_full_room.dart"; -import "package:nexus/models/full_room.dart"; - -extension RoomToChildren on Room { - Future> getAllChildren() async { - final direct = await Future.wait( - spaceChildren - .map( - (child) => client.rooms - .firstWhereOrNull((r) => r.id == child.roomId) - ?.fullRoom, - ) - .nonNulls, - ); - - return (await Future.wait( - direct.map( - (child) async => child.roomData.isSpace - ? await child.roomData.getAllChildren() - : [child], - ), - )).expand((list) => list).toIList(); - } -} diff --git a/lib/models/event.dart b/lib/models/event.dart index ce621a3..397c325 100644 --- a/lib/models/event.dart +++ b/lib/models/event.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/epoch_date_time_converter.dart"; part "event.freezed.dart"; @@ -14,10 +15,10 @@ abstract class Event with _$Event { required String type, String? stateKey, @EpochDateTimeConverter() required DateTime timestamp, - required Map content, - Map? decrypted, + required IMap content, + IMap? decrypted, String? decryptedType, - @Default({}) Map unsigned, + @Default(IMap.empty()) IMap unsigned, LocalContent? localContent, String? transactionId, String? redactedBy, @@ -25,7 +26,7 @@ abstract class Event with _$Event { String? relatesType, String? decryptionError, String? sendError, - @Default({}) Map reactions, + @Default(IMap.empty()) IMap reactions, int? lastEditRowId, @UnreadTypeConverter() UnreadType? unreadType, }) = _Event; @@ -57,6 +58,7 @@ class UnreadTypeConverter implements JsonConverter { int? toJson(UnreadType? object) => object?.value; } +// I think this is correct but I'm not sure, its some type of bitmask. @immutable class UnreadType { final int value; diff --git a/lib/models/lazy_load_summary.dart b/lib/models/lazy_load_summary.dart index 5314af8..0cd250f 100644 --- a/lib/models/lazy_load_summary.dart +++ b/lib/models/lazy_load_summary.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; part "lazy_load_summary.freezed.dart"; part "lazy_load_summary.g.dart"; @@ -5,7 +6,7 @@ part "lazy_load_summary.g.dart"; @freezed abstract class LazyLoadSummary with _$LazyLoadSummary { const factory LazyLoadSummary({ - required List? heroes, + required IList? heroes, required int? joinedMemberCount, required int? invitedMemberCount, }) = _LazyLoadSummary; diff --git a/lib/models/room.dart b/lib/models/room.dart index a83daef..91ab952 100644 --- a/lib/models/room.dart +++ b/lib/models/room.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/read_receipt.dart"; @@ -9,14 +10,14 @@ part "room.g.dart"; abstract class Room with _$Room { const factory Room({ @JsonKey(name: "meta") RoomMetadata? metadata, - @Default([]) List timeline, + @Default(IList.empty()) IList timeline, required bool reset, - required Map state, - // required Map accountData, - required List events, - @Default({}) Map> receipts, + required IMap state, + // required IMap accountData, + required IList events, + @Default(IMap.empty()) IMap> receipts, required bool dismissNotifications, - // required List notifications, + // required IList notifications, }) = _Room; factory Room.fromJson(Map json) => _$RoomFromJson(json); diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart index 905f220..7636494 100644 --- a/lib/models/room_metadata.dart +++ b/lib/models/room_metadata.dart @@ -8,10 +8,12 @@ part "room_metadata.g.dart"; abstract class RoomMetadata with _$RoomMetadata { const factory RoomMetadata({ @JsonKey(name: "room_id") required String id, + // required CreateEventContent creationContent, // required TombstoneEventContent tombstoneEventContent, String? name, Uri? avatar, + String? dmUserId, String? topic, String? canonicalAlias, LazyLoadSummary? lazyLoadSummary, diff --git a/lib/models/space.dart b/lib/models/space.dart new file mode 100644 index 0000000..15b818c --- /dev/null +++ b/lib/models/space.dart @@ -0,0 +1,15 @@ +import "package:flutter/widgets.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/room.dart"; +part "space.freezed.dart"; + +@freezed +abstract class Space with _$Space { + const factory Space({ + required String id, + required String title, + IconData? icon, + Room? room, + required List children, + }) = _Space; +} diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart index 4da57c2..31f69e3 100644 --- a/lib/models/sync_data.dart +++ b/lib/models/sync_data.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/room.dart"; part "sync_data.freezed.dart"; @@ -7,12 +8,12 @@ part "sync_data.g.dart"; abstract class SyncData with _$SyncData { const factory SyncData({ @Default(false) bool clearState, - // required Map accountData, - @Default({}) Map rooms, - @Default([]) List leftRooms, - // required List invitedRooms, - // required List spaceEdges, - @Default([]) List topLevelSpaces, + // required IMap accountData, + @Default(IMap.empty()) IMap rooms, + @Default(ISet.empty()) ISet leftRooms, + // required IList invitedRooms, + // required IList spaceEdges, + @Default(IList.empty()) IList topLevelSpaces, }) = _SyncData; factory SyncData.fromJson(Map json) => From 85d96b80bcbb370bea534d6f10b68da03f3e51f6 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 27 Jan 2026 14:14:04 +0000 Subject: [PATCH 19/34] working sidebar --- lib/controllers/client_controller.dart | 14 +- lib/controllers/selected_room_controller.dart | 17 +- .../selected_space_controller.dart | 10 +- lib/controllers/space_edges_controller.dart | 15 + lib/controllers/spaces_controller.dart | 91 ++-- .../extensions/join_room_with_snackbars.dart | 134 +++--- lib/models/space.dart | 3 +- lib/models/space_edge.dart | 14 + lib/models/sync_data.dart | 5 +- lib/pages/chat_page.dart | 36 +- lib/widgets/appbar.dart | 5 +- lib/widgets/chat_page/room_menu.dart | 202 ++++----- lib/widgets/chat_page/sidebar.dart | 401 +++++++++--------- 13 files changed, 501 insertions(+), 446 deletions(-) create mode 100644 lib/controllers/space_edges_controller.dart create mode 100644 lib/models/space_edge.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 2ebb772..bc7a904 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -5,6 +5,7 @@ import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; +import "package:nexus/controllers/space_edges_controller.dart"; import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; @@ -52,9 +53,16 @@ class ClientController extends AsyncNotifier { ref .watch(roomProvider.notifier) .update(syncData.rooms, syncData.leftRooms); - ref - .watch(TopLevelSpacesController.provider.notifier) - .set(syncData.topLevelSpaces); + if (syncData.topLevelSpaces != null) { + ref + .watch(TopLevelSpacesController.provider.notifier) + .set(syncData.topLevelSpaces!); + } + if (syncData.spaceEdges != null) { + ref + .watch(SpaceEdgesController.provider.notifier) + .set(syncData.spaceEdges!); + } // ref // .watch(SyncStatusController.provider.notifier) diff --git a/lib/controllers/selected_room_controller.dart b/lib/controllers/selected_room_controller.dart index cfeead6..ffba78c 100644 --- a/lib/controllers/selected_room_controller.dart +++ b/lib/controllers/selected_room_controller.dart @@ -2,24 +2,23 @@ import "package:collection/collection.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/selected_space_controller.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/room.dart"; -class SelectedRoomController extends AsyncNotifier { +class SelectedRoomController extends Notifier { @override - Future build() async { - final space = await ref.watch(SelectedSpaceController.provider.future); + Room? build() { + final space = ref.watch(SelectedSpaceController.provider); final selectedRoomId = ref.watch( KeyController.provider(KeyController.roomKey), ); return space.children.firstWhereOrNull( - (room) => room.roomData.id == selectedRoomId, + (room) => room.metadata?.id == selectedRoomId, ) ?? space.children.firstOrNull; } - static final provider = - AsyncNotifierProvider( - SelectedRoomController.new, - ); + static final provider = NotifierProvider( + SelectedRoomController.new, + ); } diff --git a/lib/controllers/selected_space_controller.dart b/lib/controllers/selected_space_controller.dart index 75bf287..dbeb71f 100644 --- a/lib/controllers/selected_space_controller.dart +++ b/lib/controllers/selected_space_controller.dart @@ -4,12 +4,10 @@ import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; import "package:nexus/models/space.dart"; -class SelectedSpaceController extends AsyncNotifier { +class SelectedSpaceController extends Notifier { @override - Future build() async { - final spaces = await ref.watch( - SpacesController.provider.selectAsync((data) => data), - ); + Space build() { + final spaces = ref.watch(SpacesController.provider); final selectedSpaceId = ref.watch( KeyController.provider(KeyController.spaceKey), ); @@ -18,7 +16,7 @@ class SelectedSpaceController extends AsyncNotifier { spaces.first; } - static final provider = AsyncNotifierProvider( + static final provider = NotifierProvider( SelectedSpaceController.new, ); } diff --git a/lib/controllers/space_edges_controller.dart b/lib/controllers/space_edges_controller.dart new file mode 100644 index 0000000..0349f36 --- /dev/null +++ b/lib/controllers/space_edges_controller.dart @@ -0,0 +1,15 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/space_edge.dart"; + +class SpaceEdgesController extends Notifier>> { + @override + IMap> build() => const IMap.empty(); + + void set(IMap> newEdges) => state = newEdges; + + static final provider = + NotifierProvider>>( + SpaceEdgesController.new, + ); +} diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index e269584..a62c55c 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -1,55 +1,94 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/top_level_spaces_controller.dart"; +import "package:nexus/controllers/space_edges_controller.dart"; import "package:nexus/models/space.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/models/space_edge.dart"; -class SpacesController extends AsyncNotifier> { +class SpacesController extends Notifier> { @override - Future> build() async { - final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); + IList build() { final rooms = ref.watch(RoomsController.provider); + final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); + final spaceEdges = ref.watch(SpaceEdgesController.provider); - final topLevelSpaces = topLevelSpaceIds - .map((id) => rooms[id]) - .nonNulls - .toIList(); + ISet collectChildIds(String spaceId) { + ISet result = ISet(); + void walk(String currentId) { + final children = spaceEdges[currentId] ?? IList(); + for (final edge in children) { + final childId = edge.childId; + if (!result.contains(childId)) { + result = result.add(childId); + walk(childId); + } + } + } + + walk(spaceId); + return result; + } + + final spaceIdToChildren = IMap.fromEntries( + topLevelSpaceIds.map((spaceId) { + final children = collectChildIds( + spaceId, + ).map((id) => rooms[id]).nonNulls.toIList(); + return MapEntry(spaceId, children); + }), + ); + + final allNestedRoomIds = spaceIdToChildren.values + .expand((l) => l) + .map((r) => rooms.entries.firstWhere((e) => e.value == r).key) + .toISet(); final dmRooms = rooms.values .where((room) => room.metadata?.dmUserId != null) .toIList(); - final topLevelRooms = rooms.values - .where((room) => room.metadata?.dmUserId == null) + final homeRooms = rooms.entries .where( - (room) => spaceRooms.every( - (space) => - space.spaceChildren.every((child) => child.roomId != room.id), - ), + (e) => + e.value.metadata?.dmUserId == null && + !allNestedRoomIds.contains(e.key) && + !topLevelSpaceIds.contains(e.key), ) + .map((e) => e.value) .toIList(); - // 4️⃣ Combine all into a single IList - return IList([ - Space( - id: "home", - title: "Home", - children: topLevelRooms, - icon: Icons.home, - ), + final topLevelSpacesList = topLevelSpaceIds + .map((id) { + final room = rooms[id]; + if (room == null) return null; + + final children = spaceIdToChildren[id] ?? IList(); + return Space( + id: id, + title: room.metadata?.name ?? "Unnamed Room", + room: room, + children: children, + ); + }) + .nonNulls + .toIList(); + + return [ + Space(id: "home", title: "Home", icon: Icons.home, children: homeRooms), Space( id: "dms", title: "Direct Messages", + icon: Icons.people, children: dmRooms, - icon: Icons.person, ), - ...topLevelSpaces, - ]); + ...topLevelSpacesList, + ].toIList(); } - static final provider = AsyncNotifierProvider>( + static final provider = NotifierProvider>( SpacesController.new, ); } diff --git a/lib/helpers/extensions/join_room_with_snackbars.dart b/lib/helpers/extensions/join_room_with_snackbars.dart index 0c7b1b3..df89740 100644 --- a/lib/helpers/extensions/join_room_with_snackbars.dart +++ b/lib/helpers/extensions/join_room_with_snackbars.dart @@ -1,87 +1,87 @@ import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; -extension JoinRoomWithSnackbars on Client { +extension JoinRoomWithSnackbars on ClientController { Future joinRoomWithSnackBars( BuildContext context, String roomAlias, WidgetRef ref, ) async { - final parsed = roomAlias.parseIdentifierIntoParts(); - final alias = parsed?.primaryIdentifier ?? roomAlias; + // final parsed = roomAlias.parseIdentifierIntoParts(); + // final alias = parsed?.primaryIdentifier ?? roomAlias; - final scaffoldMessenger = ScaffoldMessenger.of(context); + // final scaffoldMessenger = ScaffoldMessenger.of(context); - final snackbar = scaffoldMessenger.showSnackBar( - SnackBar( - content: Text("Joining room $alias."), - duration: Duration(days: 999), - ), - ); + // final snackbar = scaffoldMessenger.showSnackBar( + // SnackBar( + // content: Text("Joining room $alias."), + // duration: Duration(days: 999), + // ), + // ); - try { - final id = await joinRoom(alias, via: parsed?.via.toList()); + // try { + // final id = await joinRoom(alias, via: parsed?.via.toList()); - snackbar.close(); + // snackbar.close(); - scaffoldMessenger.showSnackBar( - SnackBar( - content: Text("Room $alias successfully joined."), - action: SnackBarAction( - label: "Open", - onPressed: () async { - final spaces = await ref.refresh( - SpacesController.provider.future, - ); - final space = spaces.firstWhereOrNull((space) => space.id == id); + // scaffoldMessenger.showSnackBar( + // SnackBar( + // content: Text("Room $alias successfully joined."), + // action: SnackBarAction( + // label: "Open", + // onPressed: () async { + // final spaces = await ref.refresh( + // SpacesController.provider.future, + // ); + // final space = spaces.firstWhereOrNull((space) => space.id == id); - await ref - .watch( - KeyController.provider(KeyController.spaceKey).notifier, - ) - .set( - space?.id ?? - spaces - .firstWhere( - (space) => - space.children.firstWhereOrNull( - (child) => child.roomData.id == id, - ) != - null, - ) - .id, - ); + // await ref + // .watch( + // KeyController.provider(KeyController.spaceKey).notifier, + // ) + // .set( + // space?.id ?? + // spaces + // .firstWhere( + // (space) => + // space.children.firstWhereOrNull( + // (child) => child.roomData.id == id, + // ) != + // null, + // ) + // .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, - ), - ), - ), - ); - } - } + // 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, + // ), + // ), + // ), + // ); + // } + // } } } diff --git a/lib/models/space.dart b/lib/models/space.dart index 15b818c..631759a 100644 --- a/lib/models/space.dart +++ b/lib/models/space.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/widgets.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/room.dart"; @@ -10,6 +11,6 @@ abstract class Space with _$Space { required String title, IconData? icon, Room? room, - required List children, + required IList children, }) = _Space; } diff --git a/lib/models/space_edge.dart b/lib/models/space_edge.dart new file mode 100644 index 0000000..192af31 --- /dev/null +++ b/lib/models/space_edge.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "space_edge.freezed.dart"; +part "space_edge.g.dart"; + +@freezed +abstract class SpaceEdge with _$SpaceEdge { + const factory SpaceEdge({ + required String childId, + @Default(false) bool suggested, + }) = _SpaceEdge; + + factory SpaceEdge.fromJson(Map json) => + _$SpaceEdgeFromJson(json); +} diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart index 31f69e3..0fc18ac 100644 --- a/lib/models/sync_data.dart +++ b/lib/models/sync_data.dart @@ -1,6 +1,7 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/room.dart"; +import "package:nexus/models/space_edge.dart"; part "sync_data.freezed.dart"; part "sync_data.g.dart"; @@ -12,8 +13,8 @@ abstract class SyncData with _$SyncData { @Default(IMap.empty()) IMap rooms, @Default(ISet.empty()) ISet leftRooms, // required IList invitedRooms, - // required IList spaceEdges, - @Default(IList.empty()) IList topLevelSpaces, + IMap>? spaceEdges, + IList? topLevelSpaces, }) = _SyncData; factory SyncData.fromJson(Map json) => diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index 23f6a09..0899605 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; +import "package:nexus/widgets/chat_page/sidebar.dart"; // import "package:nexus/widgets/chat_page/room_chat.dart"; -// import "package:nexus/widgets/chat_page/sidebar.dart"; class ChatPage extends StatelessWidget { const ChatPage({super.key}); @@ -10,23 +10,23 @@ class ChatPage extends StatelessWidget { builder: (context, constraints) { final isDesktop = constraints.maxWidth > 650; final showMembersByDefault = constraints.maxWidth > 1000; - return Placeholder(); - // return Scaffold( - // body: Builder( - // builder: (context) => Row( - // children: [ - // if (isDesktop) Sidebar(), - // Expanded( - // child: RoomChat( - // isDesktop: isDesktop, - // showMembersByDefault: showMembersByDefault, - // ), - // ), - // ], - // ), - // ), - // drawer: isDesktop ? null : Sidebar(), - // ); + + return Scaffold( + body: Builder( + builder: (context) => Row( + children: [ + if (isDesktop) Sidebar(), + // Expanded( + // child: RoomChat( + // isDesktop: isDesktop, + // showMembersByDefault: showMembersByDefault, + // ), + // ), + ], + ), + ), + drawer: isDesktop ? null : Sidebar(), + ); }, ); } diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart index fa2088d..00b0e4c 100644 --- a/lib/widgets/appbar.dart +++ b/lib/widgets/appbar.dart @@ -1,4 +1,5 @@ import "dart:io"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:window_manager/window_manager.dart"; @@ -7,7 +8,7 @@ class Appbar extends StatelessWidget implements PreferredSizeWidget { final Widget? title; final Color? backgroundColor; final double? scrolledUnderElevation; - final List actions; + final IList actions; const Appbar({ super.key, @@ -15,7 +16,7 @@ class Appbar extends StatelessWidget implements PreferredSizeWidget { this.backgroundColor, this.scrolledUnderElevation, this.leading, - this.actions = const [], + this.actions = const IList.empty(), }); @override diff --git a/lib/widgets/chat_page/room_menu.dart b/lib/widgets/chat_page/room_menu.dart index ea123fd..2342a20 100644 --- a/lib/widgets/chat_page/room_menu.dart +++ b/lib/widgets/chat_page/room_menu.dart @@ -1,122 +1,124 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:flutter_hooks/flutter_hooks.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/helpers/extensions/room_to_children.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/form_text_input.dart"; class RoomMenu extends StatelessWidget { final Room room; - const RoomMenu(this.room, {super.key}); + final IList children; + const RoomMenu(this.room, {this.children = const IList.empty(), super.key}); @override Widget build(BuildContext context) { final danger = Theme.of(context).colorScheme.error; void markRead(String roomId) async { - for (final child in await room.getAllChildren()) { - await child.roomData.setReadMarker( - child.roomData.lastEvent?.eventId, - mRead: child.roomData.lastEvent?.eventId, - ); + // TODO: Set parent read + for (final child in children) { + // await child.setReadMarker( TODO: Set children read + // child.roomData.lastEvent?.eventId, + // mRead: child.roomData.lastEvent?.eventId, + // ); } } return PopupMenuButton( itemBuilder: (_) => [ - PopupMenuItem( - onTap: () async { - final link = await room.matrixToInviteLink(); - await Clipboard.setData(ClipboardData(text: link.toString())); - }, - child: ListTile(leading: Icon(Icons.link), title: Text("Copy Link")), - ), - PopupMenuItem( - onTap: () => markRead(room.id), - child: ListTile( - leading: Icon(Icons.check), - title: Text("Mark as Read"), - ), - ), - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text("Leave Room"), - content: Text( - "Are you sure you want to leave \"${room.getLocalizedDisplayname()}\"?", - ), - actions: [ - TextButton( - onPressed: Navigator.of(context).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () async { - Navigator.of(context).pop(); - final snackbar = ScaffoldMessenger.of( - context, - ).showSnackBar(SnackBar(content: Text("Leaving room..."))); - await room.leave(); - snackbar.close(); - }, - child: Text("Leave"), - ), - ], - ), - ), - child: ListTile( - leading: Icon(Icons.logout, color: danger), - title: Text("Leave", style: TextStyle(color: danger)), - ), - ), - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => HookBuilder( - builder: (_) { - final reasonController = useTextEditingController(); - return AlertDialog( - title: Text("Report"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Report this room to your server administrators, who can take action like banning this room.", - ), + // PopupMenuItem( + // onTap: () async { + // final link = await room.matrixToInviteLink(); + // await Clipboard.setData(ClipboardData(text: link.toString())); + // }, + // child: ListTile(leading: Icon(Icons.link), title: Text("Copy Link")), + // ), + // PopupMenuItem( + // onTap: () => markRead(room.id), + // child: ListTile( + // leading: Icon(Icons.check), + // title: Text("Mark as Read"), + // ), + // ), + // PopupMenuItem( + // onTap: () => showDialog( + // context: context, + // builder: (context) => AlertDialog( + // title: Text("Leave Room"), + // content: Text( + // "Are you sure you want to leave \"${room.getLocalizedDisplayname()}\"?", + // ), + // actions: [ + // TextButton( + // onPressed: Navigator.of(context).pop, + // child: Text("Cancel"), + // ), + // TextButton( + // onPressed: () async { + // Navigator.of(context).pop(); + // final snackbar = ScaffoldMessenger.of( + // context, + // ).showSnackBar(SnackBar(content: Text("Leaving room..."))); + // await room.leave(); + // snackbar.close(); + // }, + // child: Text("Leave"), + // ), + // ], + // ), + // ), + // child: ListTile( + // leading: Icon(Icons.logout, color: danger), + // title: Text("Leave", style: TextStyle(color: danger)), + // ), + // ), + // PopupMenuItem( + // onTap: () => showDialog( + // context: context, + // builder: (context) => HookBuilder( + // builder: (_) { + // final reasonController = useTextEditingController(); + // return AlertDialog( + // title: Text("Report"), + // content: Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // "Report this room to your server administrators, who can take action like banning this room.", + // ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: reasonController, - title: "Reason for report (optional)", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of(context).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () { - room.client.reportRoom(room.id, reasonController.text); - Navigator.of(context).pop(); - }, - child: Text("Report"), - ), - ], - ); - }, - ), - ), - child: ListTile( - leading: Icon(Icons.report, color: danger), - title: Text("Report", style: TextStyle(color: danger)), - ), - ), + // SizedBox(height: 12), + // FormTextInput( + // required: false, + // capitalize: true, + // controller: reasonController, + // title: "Reason for report (optional)", + // ), + // ], + // ), + // actions: [ + // TextButton( + // onPressed: Navigator.of(context).pop, + // child: Text("Cancel"), + // ), + // TextButton( + // onPressed: () { + // room.client.reportRoom(room.id, reasonController.text); + // Navigator.of(context).pop(); + // }, + // child: Text("Report"), + // ), + // ], + // ); + // }, + // ), + // ), + // child: ListTile( + // leading: Icon(Icons.report, color: danger), + // title: Text("Report", style: TextStyle(color: danger)), + // ), + // ), ], ); } diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index a5e1425..3a59b41 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -1,4 +1,3 @@ -import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -6,8 +5,6 @@ import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/selected_space_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; -import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/join_room_with_snackbars.dart"; import "package:nexus/pages/settings_page.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; @@ -22,228 +19,208 @@ class Sidebar extends HookConsumerWidget { final selectedSpaceProvider = KeyController.provider( KeyController.spaceKey, ); - final selectedSpace = ref.watch(selectedSpaceProvider); - final selectedSpaceNotifier = ref.watch(selectedSpaceProvider.notifier); + final selectedSpaceId = ref.watch(selectedSpaceProvider); + final selectedSpaceIdNotifier = ref.watch(selectedSpaceProvider.notifier); final selectedRoomController = KeyController.provider( KeyController.roomKey, ); - final selectedRoom = ref.watch(selectedRoomController); - final selectedRoomNotifier = ref.watch(selectedRoomController.notifier); + final selectedRoomId = ref.watch(selectedRoomController); + final selectedRoomIdNotifier = ref.watch(selectedRoomController.notifier); + + final spaces = ref.watch(SpacesController.provider); + final indexOfSelected = spaces.indexWhere( + (space) => space.id == selectedSpaceId, + ); + final selectedIndex = indexOfSelected == -1 ? 0 : indexOfSelected; + + final selectedSpace = ref.watch(SelectedSpaceController.provider); + + final indexOfSelectedRoom = selectedSpace.children.indexWhere( + (room) => room.metadata?.id == selectedRoomId, + ); + final selectedRoomIndex = indexOfSelected == -1 + ? selectedSpace.children.isEmpty + ? null + : 0 + : indexOfSelectedRoom; return Drawer( shape: Border(), child: Row( children: [ - ref - .watch(SpacesController.provider) - .when( - loading: SizedBox.shrink, - error: (error, stack) { - debugPrintStack(label: error.toString(), stackTrace: stack); - throw error; - }, - data: (spaces) { - final indexOfSelected = spaces.indexWhere( - (space) => space.id == selectedSpace, - ); - final selectedIndex = indexOfSelected == -1 - ? 0 - : indexOfSelected; - - return NavigationRail( - scrollable: true, - onDestinationSelected: (value) { - selectedSpaceNotifier.set(spaces[value].id); - selectedRoomNotifier.set( - spaces[value].children.firstOrNull?.roomData.id, - ); - }, - destinations: spaces - .map( - (space) => NavigationRailDestination( - icon: AvatarOrHash( - space.avatar, - fallback: space.icon == null - ? null - : Icon(space.icon), - space.title, - headers: space.client.headers, - hasBadge: - space.children.firstWhereOrNull( - (room) => room.roomData.hasNewMessages, - ) != - null, - ), - label: Text(space.title), - padding: EdgeInsets.only(top: 4), - ), - ) - .toList(), - selectedIndex: selectedIndex, - trailingAtBottom: true, - trailing: Padding( - padding: EdgeInsets.symmetric(vertical: 16), - child: Column( - spacing: 8, - children: [ - PopupMenuButton( - itemBuilder: (_) => [ - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (alertContext) => HookBuilder( - builder: (_) { - final roomAlias = - useTextEditingController(); - return AlertDialog( - title: Text("Join a Room"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - "Enter the room alias, ID, or a Matrix.to link.", - ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: roomAlias, - title: "#room:server", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of( - context, - ).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () async { - Navigator.of(alertContext).pop(); - - final client = await ref.watch( - ClientController - .provider - .future, - ); - if (context.mounted) { - client.joinRoomWithSnackBars( - context, - roomAlias.text, - ref, - ); - } - }, - child: Text("Join"), - ), - ], - ); - }, - ), - ), - child: ListTile( - title: Text( - "Join an existing room (or space)", - ), - leading: Icon(Icons.numbers), - ), - ), - PopupMenuItem( - onTap: () {}, - child: ListTile( - title: Text("Create a new room"), - leading: Icon(Icons.add), - ), - ), - ], - icon: Icon(Icons.add), - ), - IconButton( - onPressed: () => showDialog( - context: context, - builder: (context) => - AlertDialog(title: Text("To-do")), - ), - icon: Icon(Icons.explore), - ), - IconButton( - onPressed: () => Navigator.of(context).push( - MaterialPageRoute(builder: (_) => SettingsPage()), - ), - icon: Icon(Icons.settings), - ), - ], - ), + NavigationRail( + scrollable: true, + onDestinationSelected: (value) { + selectedSpaceIdNotifier.set(spaces[value].id); + selectedRoomIdNotifier.set( + spaces[value].children.firstOrNull?.metadata?.id, + ); + }, + destinations: spaces + .map( + (space) => NavigationRailDestination( + icon: AvatarOrHash( + null, // TODO: Url + fallback: space.icon == null ? null : Icon(space.icon), + space.title, + headers: {}, // TODO + hasBadge: false, + // space.children.firstWhereOrNull( TODO + // (room) => room.roomData.hasNewMessages, + // ) != + // null, ), - ); - }, - ), - Expanded( - child: ref - .watch(SelectedSpaceController.provider) - .betterWhen( - data: (space) { - final indexOfSelected = space.children.indexWhere( - (room) => room.roomData.id == selectedRoom, - ); - final selectedIndex = indexOfSelected == -1 - ? space.children.isEmpty - ? null - : 0 - : indexOfSelected; - - return Scaffold( - backgroundColor: Colors.transparent, - appBar: AppBar( - leading: AvatarOrHash( - space.avatar, - fallback: space.icon == null - ? null - : Icon(space.icon), - space.title, - headers: space.client.headers, - ), - title: Text( - space.title, - overflow: TextOverflow.ellipsis, - ), - backgroundColor: Colors.transparent, - actions: [ - if (space.roomData != null) RoomMenu(space.roomData!), - ], - ), - body: NavigationRail( - scrollable: true, - backgroundColor: Colors.transparent, - extended: true, - selectedIndex: selectedIndex, - destinations: space.children - .map( - (room) => NavigationRailDestination( - label: Text(room.title), - icon: AvatarOrHash( - hasBadge: room.roomData.hasNewMessages, - room.avatar, - room.title, - fallback: selectedSpace == "dms" - ? null - : Icon(Icons.numbers), - headers: space.client.headers, + label: Text(space.title), + padding: EdgeInsets.only(top: 4), + ), + ) + .toList(), + selectedIndex: selectedIndex, + trailingAtBottom: true, + trailing: Padding( + padding: EdgeInsets.symmetric(vertical: 16), + child: Column( + spacing: 8, + children: [ + PopupMenuButton( + itemBuilder: (_) => [ + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (alertContext) => HookBuilder( + builder: (_) { + final roomAlias = useTextEditingController(); + return AlertDialog( + title: Text("Join a Room"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Enter the room alias, ID, or a Matrix.to link.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: roomAlias, + title: "#room:server", + ), + ], ), - ), - ) - .toList(), - onDestinationSelected: (value) => selectedRoomNotifier - .set(space.children[value].roomData.id), + actions: [ + TextButton( + onPressed: Navigator.of(context).pop, + child: Text("Cancel"), + ), + TextButton( + onPressed: () async { + Navigator.of(alertContext).pop(); + + final client = ref.watch( + ClientController.provider.notifier, + ); + if (context.mounted) { + client.joinRoomWithSnackBars( + context, + roomAlias.text, + ref, + ); + } + }, + child: Text("Join"), + ), + ], + ); + }, + ), + ), + child: ListTile( + title: Text("Join an existing room (or space)"), + leading: Icon(Icons.numbers), + ), ), - ); - }, + PopupMenuItem( + onTap: () {}, + child: ListTile( + title: Text("Create a new room"), + leading: Icon(Icons.add), + ), + ), + ], + icon: Icon(Icons.add), + ), + IconButton( + onPressed: () => showDialog( + context: context, + builder: (context) => AlertDialog(title: Text("To-do")), + ), + icon: Icon(Icons.explore), + ), + IconButton( + onPressed: () => Navigator.of( + context, + ).push(MaterialPageRoute(builder: (_) => SettingsPage())), + icon: Icon(Icons.settings), + ), + ], + ), + ), + ), + Expanded( + child: Scaffold( + backgroundColor: Colors.transparent, + appBar: AppBar( + leading: AvatarOrHash( + null, + // space.avatar, TODO + fallback: selectedSpace.icon == null + ? null + : Icon(selectedSpace.icon), + + selectedSpace.title, // TODO RM + headers: {}, + // space.client.headers, TODO ), + title: Text( + selectedSpace.room?.metadata?.avatar.toString() ?? + selectedSpace.title, + overflow: TextOverflow.ellipsis, + ), + backgroundColor: Colors.transparent, + actions: [ + if (selectedSpace.room != null) RoomMenu(selectedSpace.room!), + ], + ), + body: NavigationRail( + scrollable: true, + backgroundColor: Colors.transparent, + extended: true, + selectedIndex: selectedRoomIndex, + destinations: selectedSpace.children + .map( + (room) => NavigationRailDestination( + label: Text(room.metadata?.name ?? "Unnamed Room"), + icon: AvatarOrHash( + // hasBadge: room.roomData.hasNewMessages, TODO + null, + // room.avatar, TODO + room.metadata?.name ?? "Unnamed Room", + fallback: selectedSpaceId == "dms" + ? null + : Icon(Icons.numbers), + headers: {}, + // space.client.headers, + ), + ), + ) + .toList(), + onDestinationSelected: (value) => selectedRoomIdNotifier.set( + selectedSpace.children[value].metadata?.id, + ), + ), + ), ), ], ), From a28bced44ded0fa6bdcab573798387922903a215 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 27 Jan 2026 19:09:43 +0000 Subject: [PATCH 20/34] shows room but not really --- lib/controllers/client_controller.dart | 19 + lib/controllers/header_controller.dart | 24 + lib/controllers/room_chat_controller.dart | 184 ++-- lib/controllers/spaces_controller.dart | 50 +- lib/helpers/extensions/get_headers.dart | 7 + lib/helpers/extensions/link_to_mention.dart | 40 + lib/main.dart | 2 + lib/models/client_state.dart | 1 + lib/models/event.dart | 2 +- lib/models/relation_type.dart | 1 + lib/models/report.dart | 14 + lib/models/room_metadata.dart | 4 +- lib/pages/chat_page.dart | 14 +- lib/widgets/avatar_or_hash.dart | 3 + lib/widgets/chat_page/chat_box.dart | 36 +- lib/widgets/chat_page/html/html.dart | 106 +- lib/widgets/chat_page/html/mention_chip.dart | 4 +- lib/widgets/chat_page/relation_preview.dart | 30 +- lib/widgets/chat_page/room_appbar.dart | 35 +- lib/widgets/chat_page/room_chat.dart | 984 +++++++++---------- lib/widgets/chat_page/room_menu.dart | 101 +- lib/widgets/chat_page/sidebar.dart | 31 +- lib/widgets/chat_page/top_widget.dart | 14 +- 23 files changed, 893 insertions(+), 813 deletions(-) create mode 100644 lib/controllers/header_controller.dart create mode 100644 lib/helpers/extensions/get_headers.dart create mode 100644 lib/helpers/extensions/link_to_mention.dart create mode 100644 lib/models/relation_type.dart create mode 100644 lib/models/report.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index bc7a904..f0ad4ea 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -11,6 +11,8 @@ import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; import "package:nexus/models/login.dart"; +import "package:nexus/models/report.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/models/sync_data.dart"; import "package:nexus/models/sync_status.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; @@ -118,6 +120,23 @@ class ClientController extends AsyncNotifier { } } + Future leaveRoom(Room room) async { + if (room.metadata == null) return; + await sendCommand("leave_room", {"room_id": room.metadata!.id}); + } + + Future reportEvent(Report report) => + sendCommand("report_event", report.toJson()); + + Future markRead(Room room) async { + if (room.events.isEmpty || room.metadata == null) return; + await sendCommand("mark_read", { + "room_id": room.metadata?.id, + "receipt_type": "m.read", + "event_id": room.events.last.eventId, + }); + } + Future login(Login login) async { try { await sendCommand("login", login.toJson()); diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header_controller.dart new file mode 100644 index 0000000..dcb73ea --- /dev/null +++ b/lib/controllers/header_controller.dart @@ -0,0 +1,24 @@ +import "package:ffi/ffi.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/src/third_party/gomuks.g.dart"; + +class HeaderController extends AsyncNotifier> { + @override + Future> build() async { + final handle = await ref.watch(ClientController.provider.future); + final info = GomuksGetAccountInfo(handle); + final headers = { + "authorization": + "Bearer ${info.access_token.cast().toDartString()}", + }; + + GomuksFreeAccountInfo(info); + return headers; + } + + static final provider = + AsyncNotifierProvider>( + HeaderController.new, + ); +} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 9175e36..ffc8ffc 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -2,13 +2,9 @@ import "package:collection/collection.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart" as chat; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; -import "package:nexus/controllers/events_controller.dart"; -import "package:nexus/helpers/extensions/event_to_message.dart"; -import "package:nexus/helpers/extensions/list_to_messages.dart"; import "package:fluttertagger/fluttertagger.dart" as tagger; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/room.dart"; class RoomChatController extends AsyncNotifier { final Room room; @@ -16,52 +12,54 @@ class RoomChatController extends AsyncNotifier { @override Future build() async { - final timeline = await ref.watch(EventsController.provider(room).future); + // final timeline = await ref.watch(EventsController.provider(room).future); - ref.onDispose( - room.client.onTimelineEvent.stream.listen((event) async { - if (event.roomId != room.id) return; + return InMemoryChatController(); - if (event.type == EventTypes.Redaction) { - final controller = await future; - final message = controller.messages.firstWhereOrNull( - (message) => message.id == event.redacts, - ); - if (message == null) return; + // ref.onDispose( + // room.client.onTimelineEvent.stream.listen((event) async { + // if (event.roomId != room.metadata.id) return; - await controller.removeMessage(message); - } else { - final message = await event.toMessage(includeEdits: true, timeline); - if (event.relationshipType == RelationshipTypes.edit) { - final controller = await future; - final oldMessage = controller.messages.firstWhereOrNull( - (element) => element.id == event.relationshipEventId, - ); - if (oldMessage == null || message == null) return; - return await updateMessage( - oldMessage, - message.copyWith( - id: oldMessage.id, - replyToMessageId: oldMessage.replyToMessageId, - metadata: { - ...(oldMessage.metadata ?? {}), - ...((message.metadata ?? {}).filterMap( - (key, value) => value == null ? null : MapEntry(key, value), - )), - }, - ), - ); - } - if (message != null) { - return await insertMessage(message); - } - } - }).cancel, - ); + // if (event.type == "m.room.redaction") { + // final controller = await future; + // final message = controller.messages.firstWhereOrNull( + // (message) => message.id == event.redacts, + // ); + // if (message == null) return; - return InMemoryChatController( - messages: await timeline.events.toMessages(room, timeline), - ); + // await controller.removeMessage(message); + // } else { + // final message = await event.toMessage(includeEdits: true, timeline); + // if (event.relationshipType == RelationshipTypes.edit) { + // final controller = await future; + // final oldMessage = controller.messages.firstWhereOrNull( + // (element) => element.id == event.relationshipEventId, + // ); + // if (oldMessage == null || message == null) return; + // return await updateMessage( + // oldMessage, + // message.copyWith( + // id: oldMessage.id, + // replyToMessageId: oldMessage.replyToMessageId, + // metadata: { + // ...(oldMessage.metadata ?? {}), + // ...((message.metadata ?? {}).filterMap( + // (key, value) => value == null ? null : MapEntry(key, value), + // )), + // }, + // ), + // ); + // } + // if (message != null) { + // return await insertMessage(message); + // } + // } + // }).cancel, + // ); + + // return InMemoryChatController( + // messages: await timeline.events.toMessages(room, timeline), + // ); } Future insertMessage(Message message) async { @@ -79,37 +77,29 @@ class RoomChatController extends AsyncNotifier { } Future deleteMessage(Message message, {String? reason}) async { - final controller = await future; - await controller.removeMessage(message); - await room.redactEvent(message.id, reason: reason); + // final controller = await future; + // await controller.removeMessage(message); + // await room.redactEvent(message.id, reason: reason); } Future loadOlder() async { - final currentEvents = await future; - await ref.watch(EventsController.provider(room).notifier).prev(); - final timeline = await ref.watch(EventsController.provider(room).future); + // final currentEvents = await future; + // await ref.watch(EventsController.provider(room).notifier).prev(); + // final timeline = await ref.watch(EventsController.provider(room).future); - final controller = await future; - await controller.insertAllMessages( - await timeline.events - .where( - (event) => !currentEvents.messages.any( - (existingEvent) => existingEvent.id == event.eventId, - ), - ) - .toList() - .toMessages(room, timeline), - index: 0, - ); - ref.notifyListeners(); - } - - Future markRead() async { - if (!room.hasNewMessages) return; - final controller = await future; - final id = controller.messages.last.id; - - await room.setReadMarker(id, mRead: id); + // final controller = await future; + // await controller.insertAllMessages( + // await timeline.events + // .where( + // (event) => !currentEvents.messages.any( + // (existingEvent) => existingEvent.id == event.eventId, + // ), + // ) + // .toList() + // .toMessages(room, timeline), + // index: 0, + // ); + // ref.notifyListeners(); } Future updateMessage(Message message, Message newMessage) async => @@ -121,37 +111,37 @@ class RoomChatController extends AsyncNotifier { required RelationType relationType, Message? relation, }) async { - var taggedMessage = message; + // var taggedMessage = message; - for (final tag in tags) { - final escaped = RegExp.escape(tag.id); - final pattern = RegExp(r"@+(" + escaped + r")(#[^#]*#)?"); + // for (final tag in tags) { + // final escaped = RegExp.escape(tag.id); + // final pattern = RegExp(r"@+(" + escaped + r")(#[^#]*#)?"); - taggedMessage = taggedMessage.replaceAllMapped( - pattern, - (match) => match.group(1)!, - ); - } + // taggedMessage = taggedMessage.replaceAllMapped( + // pattern, + // (match) => match.group(1)!, + // ); + // } - await room.sendTextEvent( - taggedMessage, - editEventId: relationType == RelationType.edit ? relation?.id : null, - inReplyTo: (relationType == RelationType.reply && relation != null) - ? await room.getEventById(relation.id) - : null, - ); + // await room.sendTextEvent( + // taggedMessage, + // editEventId: relationType == RelationType.edit ? relation?.id : null, + // inReplyTo: (relationType == RelationType.reply && relation != null) + // ? await room.getEventById(relation.id) + // : null, + // ); } Future resolveUser(String id) async { - final user = await room.client.getUserProfile(id); + // final user = await room.client.getUserProfile(id); return chat.User( id: id, - name: user.displayname, - imageSource: user.avatarUrl == null - ? null - : (await ref.watch( - AvatarController.provider(user.avatarUrl!.toString()).future, - )).toString(), + // name: user.displayname, + // imageSource: user.avatarUrl == null + // ? null + // : (await ref.watch( + // AvatarController.provider(user.avatarUrl!.toString()).future, + // )).toString(), ); } diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index a62c55c..f0d7a6b 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -15,35 +15,34 @@ class SpacesController extends Notifier> { final topLevelSpaceIds = ref.watch(TopLevelSpacesController.provider); final spaceEdges = ref.watch(SpaceEdgesController.provider); - ISet collectChildIds(String spaceId) { - ISet result = ISet(); - void walk(String currentId) { - final children = spaceEdges[currentId] ?? IList(); - for (final edge in children) { - final childId = edge.childId; - if (!result.contains(childId)) { - result = result.add(childId); - walk(childId); - } - } - } - - walk(spaceId); - return result; - } - - final spaceIdToChildren = IMap.fromEntries( + final childRoomsBySpaceId = IMap.fromEntries( topLevelSpaceIds.map((spaceId) { - final children = collectChildIds( + ISet walk(String currentId) { + final children = spaceEdges[currentId] ?? IList(); + + return children.fold>(const ISet.empty(), (acc, edge) { + final childId = edge.childId; + final isSpace = spaceEdges.containsKey(childId); + + return acc + .addAll(!isSpace ? ISet([childId]) : const ISet.empty()) + .addAll(isSpace ? walk(childId) : const ISet.empty()); + }); + } + + return MapEntry( spaceId, - ).map((id) => rooms[id]).nonNulls.toIList(); - return MapEntry(spaceId, children); + walk(spaceId).map((id) => rooms[id]).nonNulls.toIList(), + ); }), ); - final allNestedRoomIds = spaceIdToChildren.values + final allNestedRoomIds = childRoomsBySpaceId.values .expand((l) => l) - .map((r) => rooms.entries.firstWhere((e) => e.value == r).key) + .map( + (room) => + rooms.entries.firstWhere((entry) => entry.value == room).key, + ) .toISet(); final dmRooms = rooms.values @@ -55,7 +54,8 @@ class SpacesController extends Notifier> { (e) => e.value.metadata?.dmUserId == null && !allNestedRoomIds.contains(e.key) && - !topLevelSpaceIds.contains(e.key), + !topLevelSpaceIds.contains(e.key) && + !spaceEdges.containsKey(e.key), ) .map((e) => e.value) .toIList(); @@ -65,7 +65,7 @@ class SpacesController extends Notifier> { final room = rooms[id]; if (room == null) return null; - final children = spaceIdToChildren[id] ?? IList(); + final children = childRoomsBySpaceId[id] ?? IList(); return Space( id: id, title: room.metadata?.name ?? "Unnamed Room", diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart new file mode 100644 index 0000000..e1bb5f3 --- /dev/null +++ b/lib/helpers/extensions/get_headers.dart @@ -0,0 +1,7 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/header_controller.dart"; + +extension GetHeaders on WidgetRef { + Map get headers => + watch(HeaderController.provider).requireValue; +} diff --git a/lib/helpers/extensions/link_to_mention.dart b/lib/helpers/extensions/link_to_mention.dart new file mode 100644 index 0000000..33d2bd2 --- /dev/null +++ b/lib/helpers/extensions/link_to_mention.dart @@ -0,0 +1,40 @@ +extension LinkToMention on String { + /// Extracts a Matrix identifier from this string. + /// + /// Supports: + /// - https://matrix.to/#/... + /// - matrix:roomid/... + /// - matrix:r/... + /// - matrix:u/... + /// + /// Returns the decoded identifier (e.g. "#room:matrix.org") + /// or null if this is not a Matrix link. + String? get mention { + final trimmed = trim(); + + final matrixTo = RegExp( + r"^https?://matrix\.to/#/([^/?#]+)", + caseSensitive: false, + ); + + final matrixToMatch = matrixTo.firstMatch(trimmed); + if (matrixToMatch != null) { + return Uri.decodeComponent(matrixToMatch.group(1)!); + } + + if (trimmed.toLowerCase().startsWith("matrix:")) { + try { + final uri = Uri.parse(trimmed); + + if (uri.pathSegments.isNotEmpty) { + final identifier = uri.pathSegments.last; + if (identifier.isNotEmpty) { + return Uri.decodeComponent(identifier); + } + } + } catch (_) {} + } + + return null; + } +} diff --git a/lib/main.dart b/lib/main.dart index a84f3f7..8100343 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/header_controller.dart"; import "package:nexus/controllers/multi_provider_controller.dart"; import "package:nexus/controllers/shared_prefs_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; @@ -108,6 +109,7 @@ class App extends StatelessWidget { IListConst([ SharedPrefsController.provider, ClientController.provider, + HeaderController.provider, ]), ), ) diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart index 2c1bf05..a8781d0 100644 --- a/lib/models/client_state.dart +++ b/lib/models/client_state.dart @@ -8,6 +8,7 @@ abstract class ClientState with _$ClientState { required bool isInitialized, required bool isLoggedIn, required bool isVerified, + required String userId, }) = _ClientState; factory ClientState.fromJson(Map json) => diff --git a/lib/models/event.dart b/lib/models/event.dart index 397c325..e80dff9 100644 --- a/lib/models/event.dart +++ b/lib/models/event.dart @@ -23,7 +23,7 @@ abstract class Event with _$Event { String? transactionId, String? redactedBy, String? relatesTo, - String? relatesType, + @JsonKey(name: "relates_type") String? relationType, String? decryptionError, String? sendError, @Default(IMap.empty()) IMap reactions, diff --git a/lib/models/relation_type.dart b/lib/models/relation_type.dart new file mode 100644 index 0000000..80c5223 --- /dev/null +++ b/lib/models/relation_type.dart @@ -0,0 +1 @@ +enum RelationType { edit, reply } diff --git a/lib/models/report.dart b/lib/models/report.dart new file mode 100644 index 0000000..8b35e7a --- /dev/null +++ b/lib/models/report.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "report.freezed.dart"; +part "report.g.dart"; + +@freezed +abstract class Report with _$Report { + const factory Report({ + required String roomId, + required String eventId, + String? reason, + }) = _Report; + + factory Report.fromJson(Map json) => _$ReportFromJson(json); +} diff --git a/lib/models/room_metadata.dart b/lib/models/room_metadata.dart index 7636494..7c16cae 100644 --- a/lib/models/room_metadata.dart +++ b/lib/models/room_metadata.dart @@ -20,7 +20,9 @@ abstract class RoomMetadata with _$RoomMetadata { required bool hasMemberList, @JsonKey(name: "preview_event_rowid") required int previewEventRowID, @EpochDateTimeConverter() required DateTime sortingTimestamp, - @Default(false) bool markedUnread, + required int unreadHighlights, + required int unreadNotifications, + required int unreadMessages, }) = _RoomMetadata; factory RoomMetadata.fromJson(Map json) => diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index 0899605..e1f1074 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -1,6 +1,6 @@ import "package:flutter/material.dart"; import "package:nexus/widgets/chat_page/sidebar.dart"; -// import "package:nexus/widgets/chat_page/room_chat.dart"; +import "package:nexus/widgets/chat_page/room_chat.dart"; class ChatPage extends StatelessWidget { const ChatPage({super.key}); @@ -16,12 +16,12 @@ class ChatPage extends StatelessWidget { builder: (context) => Row( children: [ if (isDesktop) Sidebar(), - // Expanded( - // child: RoomChat( - // isDesktop: isDesktop, - // showMembersByDefault: showMembersByDefault, - // ), - // ), + Expanded( + child: RoomChat( + isDesktop: isDesktop, + showMembersByDefault: showMembersByDefault, + ), + ), ], ), ), diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index a077810..809d5d2 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -6,12 +6,14 @@ class AvatarOrHash extends StatelessWidget { final String title; final Widget? fallback; final bool hasBadge; + final int badgeNumber; final double height; final Map headers; const AvatarOrHash( this.avatar, this.title, { this.fallback, + this.badgeNumber = 0, this.hasBadge = false, this.height = 24, required this.headers, @@ -30,6 +32,7 @@ class AvatarOrHash extends StatelessWidget { child: Center( child: Badge( isLabelVisible: hasBadge, + label: badgeNumber != 0 ? Text(badgeNumber.toString()) : null, smallSize: 12, backgroundColor: Theme.of(context).colorScheme.primary, child: ClipRRect( diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/chat_box.dart index 8fd5acb..10b02fe 100644 --- a/lib/widgets/chat_page/chat_box.dart +++ b/lib/widgets/chat_page/chat_box.dart @@ -5,10 +5,9 @@ import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:fluttertagger/fluttertagger.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; import "package:nexus/controllers/room_chat_controller.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/widgets/chat_page/mention_overlay.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/chat_page/relation_preview.dart"; class ChatBox extends HookConsumerWidget { @@ -94,7 +93,6 @@ class ChatBox extends HookConsumerWidget { relatedMessage: relatedMessage, relationType: relationType, onDismiss: onDismiss, - room: room, ), Container( color: theme.colorScheme.surfaceContainerHighest, @@ -105,20 +103,21 @@ class ChatBox extends HookConsumerWidget { PopupMenuButton( itemBuilder: (context) => [], icon: Icon(Icons.add), - enabled: room.canSendDefaultMessages, + // enabled: room.canSendDefaultMessages, TODO: Permissions check ), Expanded( child: FlutterTagger( triggerStrategy: TriggerStrategy.eager, - overlay: MentionOverlay( - room, - query: query.value, - triggerCharacter: triggerCharacter.value, - addTag: ({required id, required name}) { - controller.value.addTag(id: id, name: name); - node.requestFocus(); - }, - ), + overlay: SizedBox.shrink(), + // MentionOverlay( TODO: Fix + // room, + // query: query.value, + // triggerCharacter: triggerCharacter.value, + // addTag: ({required id, required name}) { + // controller.value.addTag(id: id, name: name); + // node.requestFocus(); + // }, + // ), controller: controller.value, onSearch: (newQuery, newTriggerCharacter) { triggerCharacter.value = newTriggerCharacter; @@ -126,13 +125,13 @@ class ChatBox extends HookConsumerWidget { }, triggerCharacterAndStyles: {"@": style, "#": style}, builder: (context, key) => TextFormField( - enabled: room.canSendDefaultMessages, + // enabled: room.canSendDefaultMessages, maxLines: 12, minLines: 1, decoration: InputDecoration( - hintText: room.canSendDefaultMessages - ? "Your message here..." - : "You don't have permission to send messages in this room...", + // hintText: room.canSendDefaultMessages + // ? "Your message here..." + // : "You don't have permission to send messages in this room...", border: InputBorder.none, ), controller: controller.value, @@ -143,7 +142,8 @@ class ChatBox extends HookConsumerWidget { ), ), IconButton( - onPressed: room.canSendDefaultMessages ? send : null, + onPressed: send, + // onPressed: room.canSendDefaultMessages ? send : null, icon: Icon(Icons.send), ), ], diff --git a/lib/widgets/chat_page/html/html.dart b/lib/widgets/chat_page/html/html.dart index 04a5a1b..769da8f 100644 --- a/lib/widgets/chat_page/html/html.dart +++ b/lib/widgets/chat_page/html/html.dart @@ -2,21 +2,16 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/thumbnail_controller.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/helpers/extensions/link_to_mention.dart"; import "package:nexus/helpers/launch_helper.dart"; -import "package:nexus/models/image_data.dart"; import "package:nexus/widgets/chat_page/html/mention_chip.dart"; import "package:nexus/widgets/chat_page/html/spoiler_text.dart"; import "package:nexus/widgets/chat_page/html/code_block.dart"; import "package:nexus/widgets/chat_page/html/quoted.dart"; -import "package:nexus/widgets/error_dialog.dart"; class Html extends ConsumerWidget { final String html; - final Client client; - const Html(this.html, {required this.client, super.key}); + const Html(this.html, {super.key}); @override Widget build(BuildContext context, WidgetRef ref) => HtmlWidget( @@ -38,61 +33,60 @@ class Html extends ConsumerWidget { ) : null, - "blockquote" => Quoted(Html(element.innerHtml, client: client)), + "blockquote" => Quoted(Html(element.innerHtml)), "a" => - element.attributes["href"]?.parseIdentifierIntoParts() == null + element.attributes["href"]?.mention == null ? null : InlineCustomWidget(child: MentionChip(element.text)), - "img" => - element.attributes["src"] == null - ? null - : Consumer( - builder: (_, ref, _) => ref - .watch( - ThumbnailController.provider( - ImageData( - uri: element.attributes["src"]!, - height: height, - width: width, - ), - ), - ) - .when( - data: (uri) { - if (uri == null) return SizedBox.shrink(); - - return InlineCustomWidget( - child: Image.network( - uri, - headers: client.headers, - errorBuilder: (_, error, _) => Text( - "Image Failed to Load", - style: TextStyle( - color: Theme.of(context).colorScheme.error, - ), - ), - height: height.toDouble(), - width: width?.toDouble(), - loadingBuilder: (_, child, loadingProgress) => - loadingProgress == null - ? child - : CircularProgressIndicator(), - ), - ); - }, - error: ErrorDialog.new, - loading: () => InlineCustomWidget( - child: SizedBox( - width: width?.toDouble(), - height: height.toDouble(), - child: CircularProgressIndicator(), - ), - ), - ), - ), + // "img" => TODO: Img support + // element.attributes["src"] == null + // ? null + // : Consumer( + // builder: (_, ref, _) => ref + // .watch( + // ThumbnailController.provider( + // ImageData( + // uri: element.attributes["src"]!, + // height: height, + // width: width, + // ), + // ), + // ) + // .when( + // data: (uri) { + // if (uri == null) return SizedBox.shrink(); + // return InlineCustomWidget( + // child: Image.network( + // uri, + // headers: client.headers, + // errorBuilder: (_, error, _) => Text( + // "Image Failed to Load", + // style: TextStyle( + // color: Theme.of(context).colorScheme.error, + // ), + // ), + // height: height.toDouble(), + // width: width?.toDouble(), + // loadingBuilder: (_, child, loadingProgress) => + // loadingProgress == null + // ? child + // : CircularProgressIndicator(), + // ), + // ); + // }, + // error: ErrorDialog.new, + // loading: () => InlineCustomWidget( + // child: SizedBox( + // width: width?.toDouble(), + // height: height.toDouble(), + // child: CircularProgressIndicator(), + // ), + // ), + // ), + // ), ("del" || "h1" || "h2" || diff --git a/lib/widgets/chat_page/html/mention_chip.dart b/lib/widgets/chat_page/html/mention_chip.dart index e2c5003..67d2877 100644 --- a/lib/widgets/chat_page/html/mention_chip.dart +++ b/lib/widgets/chat_page/html/mention_chip.dart @@ -1,5 +1,5 @@ import "package:flutter/material.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/helpers/extensions/link_to_mention.dart"; class MentionChip extends StatelessWidget { final String label; @@ -8,7 +8,7 @@ class MentionChip extends StatelessWidget { @override Widget build(BuildContext context) => ActionChip( label: Text( - label.parseIdentifierIntoParts()?.primaryIdentifier ?? label, + label.mention ?? label, style: TextStyle( fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onPrimary, diff --git a/lib/widgets/chat_page/relation_preview.dart b/lib/widgets/chat_page/relation_preview.dart index 07bac4e..9918b35 100644 --- a/lib/widgets/chat_page/relation_preview.dart +++ b/lib/widgets/chat_page/relation_preview.dart @@ -1,22 +1,16 @@ import "package:flutter/material.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/widgets/avatar_or_hash.dart"; class RelationPreview extends ConsumerWidget { final Message? relatedMessage; final RelationType relationType; final VoidCallback onDismiss; - final Room room; const RelationPreview({ required this.relatedMessage, required this.relationType, required this.onDismiss, - required this.room, super.key, }); @@ -37,18 +31,18 @@ class RelationPreview extends ConsumerWidget { "Editing message:", style: TextStyle(fontWeight: FontWeight.bold), ), - AvatarOrHash( - ref - .watch( - AvatarController.provider( - relatedMessage!.metadata!["avatarUrl"], - ), - ) - .whenOrNull(data: (data) => data), - relatedMessage!.metadata!["displayName"].toString(), - headers: room.client.headers, - height: 16, - ), + // AvatarOrHash( + // ref + // .watch( + // AvatarController.provider( + // relatedMessage!.metadata!["avatarUrl"], + // ), + // ) + // .whenOrNull(data: (data) => data), + // relatedMessage!.metadata!["displayName"].toString(), + // headers: room.client.headers, + // height: 16, + // ), Text( relatedMessage!.metadata?["displayName"] ?? relatedMessage!.authorId, diff --git a/lib/widgets/chat_page/room_appbar.dart b/lib/widgets/chat_page/room_appbar.dart index b36a3ad..10090b6 100644 --- a/lib/widgets/chat_page/room_appbar.dart +++ b/lib/widgets/chat_page/room_appbar.dart @@ -1,13 +1,13 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; -import "package:nexus/models/full_room.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/chat_page/room_menu.dart"; class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { final bool isDesktop; - final FullRoom room; + final Room room; final void Function(BuildContext context) onOpenMemberList; final void Function(BuildContext context) onOpenDrawer; const RoomAppbar( @@ -24,22 +24,27 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { @override Widget build(BuildContext context) => Appbar( leading: isDesktop - ? AvatarOrHash( - room.avatar, - room.title, - height: 24, - fallback: Icon(Icons.numbers), - headers: room.roomData.client.headers, - ) + ? null + // AvatarOrHash( TODO: Images + // room.avatar, + // room.title, + // height: 24, + // fallback: Icon(Icons.numbers), + // headers: room.roomData.client.headers, + // ) : DrawerButton(onPressed: () => onOpenDrawer(context)), scrolledUnderElevation: 0, title: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(room.title, overflow: TextOverflow.ellipsis, maxLines: 1), - if (room.roomData.topic.isNotEmpty) + Text( + room.metadata?.name ?? "Unnamed Room", + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + if (room.metadata?.topic?.isNotEmpty == true) Text( - room.roomData.topic, + room.metadata!.topic!, maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.labelMedium?.copyWith( @@ -54,7 +59,7 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { onPressed: () => onOpenMemberList(context), icon: Icon(Icons.people), ), - RoomMenu(room.roomData), - ], + RoomMenu(room), + ].toIList(), ); } diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index 0d57663..18baf2a 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -9,6 +9,8 @@ import "package:flyer_chat_image_message/flyer_chat_image_message.dart"; import "package:flyer_chat_system_message/flyer_chat_system_message.dart"; import "package:flyer_chat_text_message/flyer_chat_text_message.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/cross_cache_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/controllers/room_chat_controller.dart"; @@ -16,9 +18,9 @@ import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/show_context_menu.dart"; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/report.dart"; import "package:nexus/widgets/chat_page/chat_box.dart"; import "package:nexus/widgets/chat_page/html/html.dart"; -import "package:nexus/widgets/chat_page/member_list.dart"; import "package:nexus/widgets/chat_page/room_appbar.dart"; import "package:nexus/widgets/chat_page/top_widget.dart"; import "package:nexus/widgets/form_text_input.dart"; @@ -37,112 +39,68 @@ class RoomChat extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { + final client = ref.watch(ClientController.provider.notifier); final replyToMessage = useState(null); final memberListOpened = useState(showMembersByDefault); final relationType = useState(RelationType.reply); final theme = Theme.of(context); final danger = theme.colorScheme.error; + final room = ref.watch(SelectedRoomController.provider); + final userId = ref.watch(ClientStateController.provider)?.userId; - return ref - .watch(SelectedRoomController.provider) - .betterWhen( - data: (room) { - if (room == null) { - return Center( - child: Text( - "Nothing to see here...", - style: theme.textTheme.headlineMedium, - ), - ); - } - final controllerProvider = RoomChatController.provider( - room.roomData, - ); - final notifier = ref.watch(controllerProvider.notifier); + if (room == null || userId == null) { + return Center( + child: Text( + "Nothing to see here...", + style: theme.textTheme.headlineMedium, + ), + ); + } + final controllerProvider = RoomChatController.provider(room); + final notifier = ref.watch(controllerProvider.notifier); - List getMessageOptions(Message message) => [ - PopupMenuItem( - onTap: () { - replyToMessage.value = message; - relationType.value = RelationType.reply; - }, - child: ListTile( - leading: Icon(Icons.reply), - title: Text("Reply"), - ), - ), - // Should check if is state event (has state_key), if so, don't show edit option - if (message is TextMessage && - message.authorId == room.roomData.client.userID) - PopupMenuItem( - onTap: () { - replyToMessage.value = message; - relationType.value = RelationType.edit; - }, - child: ListTile( - leading: Icon(Icons.edit), - title: Text("Edit"), - ), - ), - if (message.authorId == room.roomData.client.userID || - room.roomData.canRedact) - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => HookBuilder( - builder: (_) { - final deleteReasonController = - useTextEditingController(); - return AlertDialog( - title: Text("Delete Message"), - content: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Are you sure you want to delete this message? This can not be reversed.", - ), - SizedBox(height: 12), - FormTextInput( - required: false, - capitalize: true, - controller: deleteReasonController, - title: "Reason for deletion (optional)", - ), - ], - ), - actions: [ - TextButton( - onPressed: Navigator.of(context).pop, - child: Text("Cancel"), - ), - TextButton( - onPressed: () async { - notifier.deleteMessage( - message, - reason: deleteReasonController.text, - ); - Navigator.of(context).pop(); - }, - child: Text("Delete"), - ), - ], - ); - }, - ), - ), - child: ListTile( - leading: Icon(Icons.delete), - title: Text("Delete"), - ), - ), - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (context) => AlertDialog( - title: Text("Report"), - content: Text( - "Report this message to your server administrators, who can take action like banning that user or blocking that server from federating.", + List getMessageOptions(Message message) { + final isSentByMe = message.authorId == userId; + return [ + PopupMenuItem( + onTap: () { + replyToMessage.value = message; + relationType.value = RelationType.reply; + }, + child: ListTile(leading: Icon(Icons.reply), title: Text("Reply")), + ), + if (message is TextMessage && isSentByMe) + PopupMenuItem( + onTap: () { + replyToMessage.value = message; + relationType.value = RelationType.edit; + }, + child: ListTile(leading: Icon(Icons.edit), title: Text("Edit")), + ), + if (isSentByMe) // TODO: Or if user has permission to redact others' messages + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (context) => HookBuilder( + builder: (_) { + final deleteReasonController = useTextEditingController(); + return AlertDialog( + title: Text("Delete Message"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Are you sure you want to delete this message? This can not be reversed.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: deleteReasonController, + title: "Reason for deletion (optional)", + ), + ], ), actions: [ TextButton( @@ -150,418 +108,436 @@ class RoomChat extends HookConsumerWidget { child: Text("Cancel"), ), TextButton( - onPressed: () { - room.roomData.client.reportEvent( - room.roomData.id, - message.id, + onPressed: () async { + notifier.deleteMessage( + message, + reason: deleteReasonController.text, ); Navigator.of(context).pop(); }, - child: Text("Report"), + child: Text("Delete"), + ), + ], + ); + }, + ), + ), + child: ListTile(leading: Icon(Icons.delete), title: Text("Delete")), + ), + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (context) => HookBuilder( + builder: (_) { + final reasonController = useTextEditingController(); + return AlertDialog( + title: Text("Report"), + content: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Report this event to your server administrators, who can take action like banning this server or room.", + ), + + SizedBox(height: 12), + FormTextInput( + required: false, + capitalize: true, + controller: reasonController, + title: "Reason for report (optional)", ), ], ), - ), - child: ListTile( - leading: Icon(Icons.report, color: danger), - title: Text("Report", style: TextStyle(color: danger)), - ), - ), - ]; - - return Scaffold( - appBar: RoomAppbar( - room, - isDesktop: isDesktop, - onOpenDrawer: (_) => Scaffold.of(context).openDrawer(), - onOpenMemberList: (thisContext) { - memberListOpened.value = !memberListOpened.value; - Scaffold.of(thisContext).openEndDrawer(); - }, - ), - body: Row( - children: [ - Expanded( - child: Column( - children: [ - Expanded( - child: ref - .watch(controllerProvider) - .betterWhen( - data: (controller) => Chat( - currentUserId: room.roomData.client.userID!, - theme: ChatTheme.fromThemeData(theme) - .copyWith( - colors: ChatColors.fromThemeData(theme) - .copyWith( - primary: theme - .colorScheme - .primaryContainer, - onPrimary: theme - .colorScheme - .onPrimaryContainer, - ), - ), - onMessageSecondaryTap: - ( - context, - message, { - required index, - TapUpDetails? details, - }) => details?.globalPosition == null - ? null - : context.showContextMenu( - globalPosition: - details!.globalPosition, - children: getMessageOptions(message), - ), - onMessageLongPress: - ( - context, - message, { - required details, - required index, - }) => context.showContextMenu( - globalPosition: details.globalPosition, - children: getMessageOptions(message), - ), - onMessageTap: - ( - context, - message, { - required details, - required index, - }) { - if (message is ImageMessage) { - showDialog( - context: context, - builder: (_) => Dialog( - backgroundColor: - Colors.transparent, - insetPadding: EdgeInsets.all(64), - child: InteractiveViewer( - child: Image( - image: CachedNetworkImage( - message.source, - ref.watch( - CrossCacheController - .provider, - ), - headers: room - .roomData - .client - .headers, - ), - ), - ), - ), - ); - } - }, - builders: Builders( - loadMoreBuilder: (_) => Loading(), - chatAnimatedListBuilder: (_, itemBuilder) => - ChatAnimatedList( - itemBuilder: itemBuilder, - onEndReached: notifier.loadOlder, - onStartReached: notifier.markRead, - bottomPadding: 72, - ), - composerBuilder: (_) => ChatBox( - relationType: relationType.value, - relatedMessage: replyToMessage.value, - onDismiss: () => - replyToMessage.value = null, - room: room.roomData, - ), - - // customMessageBuilder: - // ( - // context, - // message, - // index, { - // required bool isSentByMe, - // MessageGroupStatus? groupStatus, - // }) { - // final poll = - // message.metadata?["poll"] - // as PollStartContent; - // final responses = - // (message.metadata?["responses"] - // as Map< - // String, - // Set - // >) - // .values - // .expand((set) => set) - // .fold({}, ( - // acc, - // value, - // ) { - // acc[value] = - // (acc[value] ?? 0) + 1; - // return acc; - // }); - - // return Column( - // crossAxisAlignment: - // CrossAxisAlignment.start, - // spacing: 4, - // children: [ - // TopWidget( - // message, - // headers: room - // .roomData - // .client - // .headers, - // groupStatus: groupStatus, - // ), - - // // TODO: Make this actually work - // DynamicPolls( - // startDate: DateTime.now(), - // endDate: DateTime.now(), - // private: - // poll.kind == - // PollKind.undisclosed, - // allowReselection: true, - // backgroundDecoration: - // BoxDecoration( - // borderRadius: - // BorderRadius.all( - // Radius.circular(16), - // ), - // border: Border.all( - // color: theme - // .colorScheme - // .primaryContainer, - // width: 4, - // ), - // ), - // allStyle: Styles( - // titleStyle: TitleStyle( - // style: theme - // .textTheme - // .headlineSmall, - // ), - // optionStyle: OptionStyle( - // fillColor: theme - // .colorScheme - // .primaryContainer, - // selectedBorderColor: theme - // .colorScheme - // .primary, - // borderColor: theme - // .colorScheme - // .primary, - // unselectedBorderColor: - // Colors.transparent, - // textSelectColor: theme - // .colorScheme - // .primary, - // ), - // ), - // onOptionSelected: - // (int index) {}, - // title: poll.question.mText, - // options: poll.answers - // .map( - // (option) => option.mText, - // ) - // .toList(), - // ), - // ], - // ); - // }, - textMessageBuilder: - ( - context, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatTextMessage( - customWidget: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Html( - (message.metadata?["formatted"] - as String) - .replaceAllMapped( - RegExp( - "(]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)", - caseSensitive: false, - ), - (m) { - // If it's already an tag, leave it unchanged - if (m.group(1) != - null) { - return m.group(1)!; - } - - // Otherwise, wrap the bare URL - final url = m.group(2)!; - return "$url"; - }, - ) - .replaceAll("\n", "
"), - client: room.roomData.client, - ), - if (message.editedAt != null) - Text( - "(edited)", - style: theme - .textTheme - .labelSmall, - ), - ], - ), - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - ), - message: message, - showTime: true, - index: index, - ), - linkPreviewBuilder: - (_, message, isSentByMe) => LinkPreview( - text: message.text, - backgroundColor: isSentByMe - ? theme.colorScheme.inversePrimary - : theme - .colorScheme - .surfaceContainerLow, - insidePadding: EdgeInsets.symmetric( - vertical: 8, - horizontal: 16, - ), - linkPreviewData: - message.linkPreviewData, - onLinkPreviewDataFetched: - (linkPreviewData) => - notifier.updateMessage( - message, - message.copyWith( - linkPreviewData: - linkPreviewData, - ), - ), - ), - imageMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatImageMessage( - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - alwaysShow: true, - ), - customImageProvider: - CachedNetworkImage( - message.source, - ref.watch( - CrossCacheController.provider, - ), - headers: room - .roomData - .client - .headers, - ), - errorBuilder: - (context, error, stackTrace) => - Center( - child: Text( - "Image Failed to Load", - style: TextStyle( - color: Theme.of( - context, - ).colorScheme.error, - ), - ), - ), - message: message, - index: index, - ), - fileMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => InkWell( - onTap: () => showDialog( - context: context, - builder: (_) => Dialog( - child: Text( - "TODO: Download Attachments", // TODO - ), - ), - ), - child: FlyerChatFileMessage( - topWidget: TopWidget( - message, - headers: - room.roomData.client.headers, - groupStatus: groupStatus, - ), - message: message, - index: index, - ), - ), - systemMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => FlyerChatSystemMessage( - message: message, - index: index, - ), - unsupportedMessageBuilder: - ( - _, - message, - index, { - required bool isSentByMe, - MessageGroupStatus? groupStatus, - }) => Text( - "${message.authorId} sent ${message.metadata?["eventType"]}", - style: theme.textTheme.labelSmall - ?.copyWith(color: Colors.grey), - ), - ), - resolveUser: notifier.resolveUser, - chatController: controller, - ), - ), - ), - ], + actions: [ + TextButton( + onPressed: Navigator.of(context).pop, + child: Text("Cancel"), ), - ), + TextButton( + onPressed: () { + if (room.metadata == null) return; + client.reportEvent( + Report( + roomId: room.metadata!.id, + eventId: message.id, + reason: reasonController.text.isEmpty + ? null + : reasonController.text, + ), + ); + Navigator.of(context).pop(); + }, + child: Text("Report"), + ), + ], + ); + }, + ), + ), + child: ListTile( + leading: Icon(Icons.report, color: danger), + title: Text("Report", style: TextStyle(color: danger)), + ), + ), + ]; + } - if (memberListOpened.value == true && showMembersByDefault) - MemberList(room.roomData), - ], - ), + return Scaffold( + appBar: RoomAppbar( + room, + isDesktop: isDesktop, + onOpenDrawer: (_) => Scaffold.of(context).openDrawer(), + onOpenMemberList: (thisContext) { + memberListOpened.value = !memberListOpened.value; + Scaffold.of(thisContext).openEndDrawer(); + }, + ), + body: Row( + children: [ + Expanded( + child: Column( + children: [ + Expanded( + child: ref + .watch(controllerProvider) + .betterWhen( + data: (controller) => Chat( + currentUserId: userId, + theme: ChatTheme.fromThemeData(theme).copyWith( + colors: ChatColors.fromThemeData(theme).copyWith( + primary: theme.colorScheme.primaryContainer, + onPrimary: theme.colorScheme.onPrimaryContainer, + ), + ), + onMessageSecondaryTap: + ( + context, + message, { + required index, + TapUpDetails? details, + }) => details?.globalPosition == null + ? null + : context.showContextMenu( + globalPosition: details!.globalPosition, + children: getMessageOptions(message), + ), + onMessageLongPress: + ( + context, + message, { + required details, + required index, + }) => context.showContextMenu( + globalPosition: details.globalPosition, + children: getMessageOptions(message), + ), + onMessageTap: + ( + context, + message, { + required details, + required index, + }) { + if (message is ImageMessage) { + showDialog( + context: context, + builder: (_) => Dialog( + backgroundColor: Colors.transparent, + insetPadding: EdgeInsets.all(64), + child: InteractiveViewer( + child: Image( + image: CachedNetworkImage( + message.source, + ref.watch( + CrossCacheController.provider, + ), + headers: ref.headers, + ), + ), + ), + ), + ); + } + }, + builders: Builders( + loadMoreBuilder: (_) => Loading(), + chatAnimatedListBuilder: (_, itemBuilder) => + ChatAnimatedList( + itemBuilder: itemBuilder, + onEndReached: notifier.loadOlder, + onStartReached: () => client.markRead(room), + bottomPadding: 72, + ), + composerBuilder: (_) => ChatBox( + relationType: relationType.value, + relatedMessage: replyToMessage.value, + onDismiss: () => replyToMessage.value = null, + room: room, + ), - endDrawer: showMembersByDefault - ? null - : MemberList(room.roomData), - ); - }, - ); + // TODO: Polls + // customMessageBuilder: + // ( + // context, + // message, + // index, { + // required bool isSentByMe, + // MessageGroupStatus? groupStatus, + // }) { + // final poll = + // message.metadata?["poll"] + // as PollStartContent; + // final responses = + // (message.metadata?["responses"] + // as Map< + // String, + // Set + // >) + // .values + // .expand((set) => set) + // .fold({}, ( + // acc, + // value, + // ) { + // acc[value] = + // (acc[value] ?? 0) + 1; + // return acc; + // }); + + // return Column( + // crossAxisAlignment: + // CrossAxisAlignment.start, + // spacing: 4, + // children: [ + // TopWidget( + // message, + // headers: room + // .roomData + // .client + // .headers, + // groupStatus: groupStatus, + // ), + + // DynamicPolls( + // startDate: DateTime.now(), + // endDate: DateTime.now(), + // private: + // poll.kind == + // PollKind.undisclosed, + // allowReselection: true, + // backgroundDecoration: + // BoxDecoration( + // borderRadius: + // BorderRadius.all( + // Radius.circular(16), + // ), + // border: Border.all( + // color: theme + // .colorScheme + // .primaryContainer, + // width: 4, + // ), + // ), + // allStyle: Styles( + // titleStyle: TitleStyle( + // style: theme + // .textTheme + // .headlineSmall, + // ), + // optionStyle: OptionStyle( + // fillColor: theme + // .colorScheme + // .primaryContainer, + // selectedBorderColor: theme + // .colorScheme + // .primary, + // borderColor: theme + // .colorScheme + // .primary, + // unselectedBorderColor: + // Colors.transparent, + // textSelectColor: theme + // .colorScheme + // .primary, + // ), + // ), + // onOptionSelected: + // (int index) {}, + // title: poll.question.mText, + // options: poll.answers + // .map( + // (option) => option.mText, + // ) + // .toList(), + // ), + // ], + // ); + // }, + textMessageBuilder: + ( + context, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => FlyerChatTextMessage( + customWidget: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Html( + (message.metadata?["formatted"] + as String) + .replaceAllMapped( + RegExp( + "(]*>.*?<\\/a>)|(\\bhttps?:\\/\\/[^\\s<]+)", + caseSensitive: false, + ), + (m) { + // If it's already an tag, leave it unchanged + if (m.group(1) != null) { + return m.group(1)!; + } + + // Otherwise, wrap the bare URL + final url = m.group(2)!; + return "$url"; + }, + ) + .replaceAll("\n", "
"), + ), + if (message.editedAt != null) + Text( + "(edited)", + style: theme.textTheme.labelSmall, + ), + ], + ), + topWidget: TopWidget( + message, + groupStatus: groupStatus, + ), + message: message, + showTime: true, + index: index, + ), + linkPreviewBuilder: (_, message, isSentByMe) => + LinkPreview( + text: message.text, + backgroundColor: isSentByMe + ? theme.colorScheme.inversePrimary + : theme.colorScheme.surfaceContainerLow, + insidePadding: EdgeInsets.symmetric( + vertical: 8, + horizontal: 16, + ), + linkPreviewData: message.linkPreviewData, + onLinkPreviewDataFetched: (linkPreviewData) => + notifier.updateMessage( + message, + message.copyWith( + linkPreviewData: linkPreviewData, + ), + ), + ), + imageMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => FlyerChatImageMessage( + topWidget: TopWidget( + message, + groupStatus: groupStatus, + alwaysShow: true, + ), + customImageProvider: CachedNetworkImage( + message.source, + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), + errorBuilder: (context, error, stackTrace) => + Center( + child: Text( + "Image Failed to Load", + style: TextStyle( + color: Theme.of( + context, + ).colorScheme.error, + ), + ), + ), + message: message, + index: index, + ), + fileMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => InkWell( + onTap: () => showDialog( + context: context, + builder: (_) => Dialog( + child: Text( + "TODO: Download Attachments", // TODO + ), + ), + ), + child: FlyerChatFileMessage( + topWidget: TopWidget( + message, + groupStatus: groupStatus, + ), + message: message, + index: index, + ), + ), + systemMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => FlyerChatSystemMessage( + message: message, + index: index, + ), + unsupportedMessageBuilder: + ( + _, + message, + index, { + required bool isSentByMe, + MessageGroupStatus? groupStatus, + }) => Text( + "${message.authorId} sent ${message.metadata?["eventType"]}", + style: theme.textTheme.labelSmall?.copyWith( + color: Colors.grey, + ), + ), + ), + resolveUser: notifier.resolveUser, + chatController: controller, + ), + ), + ), + ], + ), + ), + + // if (memberListOpened.value == true && showMembersByDefault) TODO: Member list + // MemberList(room), + ], + ), + + // endDrawer: showMembersByDefault ? null : MemberList(room), + ); } } diff --git a/lib/widgets/chat_page/room_menu.dart b/lib/widgets/chat_page/room_menu.dart index 2342a20..f14b8ca 100644 --- a/lib/widgets/chat_page/room_menu.dart +++ b/lib/widgets/chat_page/room_menu.dart @@ -2,27 +2,20 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; import "package:flutter_hooks/flutter_hooks.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; import "package:nexus/models/room.dart"; import "package:nexus/widgets/form_text_input.dart"; -class RoomMenu extends StatelessWidget { +class RoomMenu extends ConsumerWidget { final Room room; final IList children; const RoomMenu(this.room, {this.children = const IList.empty(), super.key}); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final danger = Theme.of(context).colorScheme.error; - - void markRead(String roomId) async { - // TODO: Set parent read - for (final child in children) { - // await child.setReadMarker( TODO: Set children read - // child.roomData.lastEvent?.eventId, - // mRead: child.roomData.lastEvent?.eventId, - // ); - } - } + final client = ref.watch(ClientController.provider.notifier); return PopupMenuButton( itemBuilder: (_) => [ @@ -33,45 +26,51 @@ class RoomMenu extends StatelessWidget { // }, // child: ListTile(leading: Icon(Icons.link), title: Text("Copy Link")), // ), - // PopupMenuItem( - // onTap: () => markRead(room.id), - // child: ListTile( - // leading: Icon(Icons.check), - // title: Text("Mark as Read"), - // ), - // ), - // PopupMenuItem( - // onTap: () => showDialog( - // context: context, - // builder: (context) => AlertDialog( - // title: Text("Leave Room"), - // content: Text( - // "Are you sure you want to leave \"${room.getLocalizedDisplayname()}\"?", - // ), - // actions: [ - // TextButton( - // onPressed: Navigator.of(context).pop, - // child: Text("Cancel"), - // ), - // TextButton( - // onPressed: () async { - // Navigator.of(context).pop(); - // final snackbar = ScaffoldMessenger.of( - // context, - // ).showSnackBar(SnackBar(content: Text("Leaving room..."))); - // await room.leave(); - // snackbar.close(); - // }, - // child: Text("Leave"), - // ), - // ], - // ), - // ), - // child: ListTile( - // leading: Icon(Icons.logout, color: danger), - // title: Text("Leave", style: TextStyle(color: danger)), - // ), - // ), + PopupMenuItem( + onTap: () async { + await client.markRead(room); + await Future.wait(children.map((child) => client.markRead(child))); + }, + child: ListTile( + leading: Icon(Icons.check), + title: Text("Mark as Read"), + ), + ), + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text("Leave Room"), + content: Text( + "Are you sure you want to leave \"${room.metadata?.name ?? "Unnamed Room"}\"?", + ), + actions: [ + TextButton( + onPressed: Navigator.of(context).pop, + child: Text("Cancel"), + ), + TextButton( + onPressed: () async { + Navigator.of(context).pop(); + final snackbar = ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text("Leaving room..."), + duration: Duration(days: 1), + ), + ); + await client.leaveRoom(room); + snackbar.close(); + }, + child: Text("Leave"), + ), + ], + ), + ), + child: ListTile( + leading: Icon(Icons.logout, color: danger), + title: Text("Leave", style: TextStyle(color: danger)), + ), + ), // PopupMenuItem( // onTap: () => showDialog( // context: context, diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index 3a59b41..a8157cf 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -1,3 +1,4 @@ +import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -39,7 +40,7 @@ class Sidebar extends HookConsumerWidget { final indexOfSelectedRoom = selectedSpace.children.indexWhere( (room) => room.metadata?.id == selectedRoomId, ); - final selectedRoomIndex = indexOfSelected == -1 + final selectedRoomIndex = indexOfSelectedRoom == -1 ? selectedSpace.children.isEmpty ? null : 0 @@ -65,11 +66,17 @@ class Sidebar extends HookConsumerWidget { fallback: space.icon == null ? null : Icon(space.icon), space.title, headers: {}, // TODO - hasBadge: false, - // space.children.firstWhereOrNull( TODO - // (room) => room.roomData.hasNewMessages, - // ) != - // null, + hasBadge: + space.children.firstWhereOrNull( + (room) => room.metadata?.unreadMessages != 0, + ) != + null, + badgeNumber: space.children.fold( + 0, + (previousValue, room) => + previousValue + + (room.metadata?.unreadNotifications ?? 0), + ), ), label: Text(space.title), padding: EdgeInsets.only(top: 4), @@ -184,13 +191,16 @@ class Sidebar extends HookConsumerWidget { // space.client.headers, TODO ), title: Text( - selectedSpace.room?.metadata?.avatar.toString() ?? - selectedSpace.title, + selectedSpace.title, overflow: TextOverflow.ellipsis, ), backgroundColor: Colors.transparent, actions: [ - if (selectedSpace.room != null) RoomMenu(selectedSpace.room!), + if (selectedSpace.room != null) + RoomMenu( + selectedSpace.room!, + children: selectedSpace.children, + ), ], ), body: NavigationRail( @@ -203,8 +213,9 @@ class Sidebar extends HookConsumerWidget { (room) => NavigationRailDestination( label: Text(room.metadata?.name ?? "Unnamed Room"), icon: AvatarOrHash( - // hasBadge: room.roomData.hasNewMessages, TODO null, + hasBadge: room.metadata?.unreadMessages != 0, + badgeNumber: room.metadata?.unreadNotifications ?? 0, // room.avatar, TODO room.metadata?.name ?? "Unnamed Room", fallback: selectedSpaceId == "dms" diff --git a/lib/widgets/chat_page/top_widget.dart b/lib/widgets/chat_page/top_widget.dart index 7831cb9..0cef0fa 100644 --- a/lib/widgets/chat_page/top_widget.dart +++ b/lib/widgets/chat_page/top_widget.dart @@ -8,11 +8,9 @@ import "package:nexus/widgets/chat_page/html/quoted.dart"; class TopWidget extends ConsumerWidget { final Message message; final bool alwaysShow; - final Map headers; final MessageGroupStatus? groupStatus; const TopWidget( this.message, { - required this.headers, required this.groupStatus, this.alwaysShow = false, super.key, @@ -62,11 +60,11 @@ class TopWidget extends ConsumerWidget { mainAxisSize: MainAxisSize.min, spacing: 8, children: [ - Avatar( - userId: replyMessage.authorId, - headers: headers, - size: 16, - ), + // Avatar( TODO: images + // userId: replyMessage.authorId, + // headers: headers, + // size: 16, + // ), Flexible( child: Text( replyMessage.metadata?["displayName"] ?? @@ -104,7 +102,7 @@ class TopWidget extends ConsumerWidget { mainAxisSize: MainAxisSize.min, spacing: 8, children: [ - Avatar(userId: message.authorId, headers: headers), + // Avatar(userId: message.authorId, headers: headers), TODO: images Flexible( child: Text( message.metadata?["displayName"] ?? message.authorId, From 7c76bb6e669469d3458f8458f5d8f6b821f4588e Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 28 Jan 2026 14:17:18 +0000 Subject: [PATCH 21/34] working message rendering --- lib/controllers/client_controller.dart | 42 ++++-- lib/controllers/events_controller.dart | 18 --- lib/controllers/new_events_controller.dart | 18 +++ lib/controllers/room_chat_controller.dart | 105 ++++++++------- lib/controllers/rooms_controller.dart | 10 +- lib/helpers/extensions/event_to_message.dart | 134 ++++++++++--------- lib/helpers/extensions/gomuks_buffer.dart | 11 +- lib/helpers/extensions/list_to_messages.dart | 12 +- lib/models/event.dart | 2 +- lib/models/get_event_request.dart | 15 +++ lib/models/get_related_events_request.dart | 15 +++ lib/models/login.dart | 14 -- lib/models/login_request.dart | 15 +++ lib/models/profile.dart | 29 ++++ lib/models/report.dart | 14 -- lib/models/report_request.dart | 15 +++ lib/pages/chat_page.dart | 5 +- lib/pages/login_page.dart | 4 +- lib/widgets/chat_page/chat_box.dart | 4 +- lib/widgets/chat_page/room_chat.dart | 14 +- 20 files changed, 302 insertions(+), 194 deletions(-) delete mode 100644 lib/controllers/events_controller.dart create mode 100644 lib/controllers/new_events_controller.dart create mode 100644 lib/models/get_event_request.dart create mode 100644 lib/models/get_related_events_request.dart delete mode 100644 lib/models/login.dart create mode 100644 lib/models/login_request.dart create mode 100644 lib/models/profile.dart delete mode 100644 lib/models/report.dart create mode 100644 lib/models/report_request.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index f0ad4ea..abd7b1f 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -1,6 +1,7 @@ import "dart:developer"; import "dart:ffi"; import "dart:isolate"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; import "package:nexus/controllers/client_state_controller.dart"; @@ -10,8 +11,12 @@ import "package:nexus/controllers/sync_status_controller.dart"; import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; -import "package:nexus/models/login.dart"; -import "package:nexus/models/report.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/get_event_request.dart"; +import "package:nexus/models/get_related_events_request.dart"; +import "package:nexus/models/login_request.dart"; +import "package:nexus/models/profile.dart"; +import "package:nexus/models/report_request.dart"; import "package:nexus/models/room.dart"; import "package:nexus/models/sync_data.dart"; import "package:nexus/models/sync_status.dart"; @@ -34,7 +39,7 @@ class ClientController extends AsyncNotifier { try { final muksEventType = command.cast().toDartString(); debugPrint("Handling $muksEventType..."); - final Map decodedMuksEvent = data.toJson(); + final decodedMuksEvent = data.toJson(); switch (muksEventType) { case "client_state": @@ -92,10 +97,7 @@ class ClientController extends AsyncNotifier { throw Exception("GomuksStart returned error code $errorCode"); } - Future> sendCommand( - String command, - Map data, - ) async { + Future sendCommand(String command, Map data) async { final bufferPointer = data.toGomuksBufferPtr(); final handle = await future; final response = await Isolate.run( @@ -125,7 +127,27 @@ class ClientController extends AsyncNotifier { await sendCommand("leave_room", {"room_id": room.metadata!.id}); } - Future reportEvent(Report report) => + Future?> getRelatedEvents( + GetRelatedEventsRequest request, + ) async { + final response = + (await sendCommand("get_related_events", request.toJson())) as List?; + return response?.map((event) => Event.fromJson(event)).toIList(); + } + + Future getEvent(GetEventRequest request) async { + final json = await sendCommand("get_event", request.toJson()); + + return json == null ? null : Event.fromJson(json); + } + + Future getProfile(String userId) async { + final json = await sendCommand("get_profile", {"user_id": userId}); + + return json == null ? null : Profile.fromJson(json); + } + + Future reportEvent(ReportRequest report) => sendCommand("report_event", report.toJson()); Future markRead(Room room) async { @@ -137,7 +159,7 @@ class ClientController extends AsyncNotifier { }); } - Future login(Login login) async { + Future login(LoginRequest login) async { try { await sendCommand("login", login.toJson()); return true; @@ -151,7 +173,7 @@ class ClientController extends AsyncNotifier { final response = await sendCommand("discover_homeserver", { "user_id": "@fakeuser:${homeserver.host}", }); - return (response["m.homeserver"] as Map)["base_url"]; + return response["m.homeserver"]?["base_url"]; } catch (error) { return null; } diff --git a/lib/controllers/events_controller.dart b/lib/controllers/events_controller.dart deleted file mode 100644 index e7a192d..0000000 --- a/lib/controllers/events_controller.dart +++ /dev/null @@ -1,18 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; - -class EventsController extends AsyncNotifier { - EventsController(this.room); - final Room room; - - @override - Future build({String? from}) => room.getTimeline(); - - Future prev() async { - final timeline = await future; - await timeline.requestHistory(); - } - - static final provider = AsyncNotifierProvider.autoDispose - .family(EventsController.new); -} diff --git a/lib/controllers/new_events_controller.dart b/lib/controllers/new_events_controller.dart new file mode 100644 index 0000000..215ebd3 --- /dev/null +++ b/lib/controllers/new_events_controller.dart @@ -0,0 +1,18 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/models/event.dart"; + +class NewEventsController extends Notifier> { + final String roomId; + NewEventsController(this.roomId); + + @override + IList build() => const IList.empty(); + + void add(IList newEvents) => state = newEvents; + + static final provider = NotifierProvider.autoDispose + .family, String>( + NewEventsController.new, + ); +} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index ffc8ffc..0012418 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -1,65 +1,72 @@ import "package:collection/collection.dart"; +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart" as chat; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:fluttertagger/fluttertagger.dart" as tagger; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/new_events_controller.dart"; +import "package:nexus/controllers/selected_room_controller.dart"; +import "package:nexus/helpers/extensions/event_to_message.dart"; +import "package:nexus/helpers/extensions/list_to_messages.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/models/room.dart"; class RoomChatController extends AsyncNotifier { - final Room room; - RoomChatController(this.room); + final String roomId; + RoomChatController(this.roomId); @override Future build() async { - // final timeline = await ref.watch(EventsController.provider(room).future); + final client = ref.watch(ClientController.provider.notifier); + final events = + ref.read(SelectedRoomController.provider)?.events ?? + const IList.empty(); - return InMemoryChatController(); + ref.onDispose( + ref.listen(NewEventsController.provider(roomId), (_, next) async { + for (final event in next) { + if (event.type == "m.room.redaction") { + final controller = await future; + final message = controller.messages.firstWhereOrNull( + (message) => message.id == event.content["redacts"], + ); + if (message == null) return; - // ref.onDispose( - // room.client.onTimelineEvent.stream.listen((event) async { - // if (event.roomId != room.metadata.id) return; + await controller.removeMessage(message); + } else { + final message = await event.toMessage(client, includeEdits: true); + if (event.relationType == "m.replace") { + final controller = await future; + final oldMessage = controller.messages.firstWhereOrNull( + (element) => element.id == event.relatesTo, + ); + if (oldMessage == null || message == null) return; - // if (event.type == "m.room.redaction") { - // final controller = await future; - // final message = controller.messages.firstWhereOrNull( - // (message) => message.id == event.redacts, - // ); - // if (message == null) return; + return await updateMessage( + oldMessage, + message.copyWith( + id: oldMessage.id, + replyToMessageId: oldMessage.replyToMessageId, + metadata: { + ...(oldMessage.metadata ?? {}), + ...(message.metadata ?? {}) + .toIMap() + .where((key, value) => value != null) + .unlock, + }, + ), + ); + } + if (message != null) { + return await insertMessage(message); + } + } + } + }).close, + ); - // await controller.removeMessage(message); - // } else { - // final message = await event.toMessage(includeEdits: true, timeline); - // if (event.relationshipType == RelationshipTypes.edit) { - // final controller = await future; - // final oldMessage = controller.messages.firstWhereOrNull( - // (element) => element.id == event.relationshipEventId, - // ); - // if (oldMessage == null || message == null) return; - // return await updateMessage( - // oldMessage, - // message.copyWith( - // id: oldMessage.id, - // replyToMessageId: oldMessage.replyToMessageId, - // metadata: { - // ...(oldMessage.metadata ?? {}), - // ...((message.metadata ?? {}).filterMap( - // (key, value) => value == null ? null : MapEntry(key, value), - // )), - // }, - // ), - // ); - // } - // if (message != null) { - // return await insertMessage(message); - // } - // } - // }).cancel, - // ); - - // return InMemoryChatController( - // messages: await timeline.events.toMessages(room, timeline), - // ); + final messages = await events.toMessages(client); + return InMemoryChatController(messages: messages); } Future insertMessage(Message message) async { @@ -145,8 +152,8 @@ class RoomChatController extends AsyncNotifier { ); } - static final provider = AsyncNotifierProvider.family - .autoDispose( + static final provider = + AsyncNotifierProvider.family( RoomChatController.new, ); } diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart index 0a41f31..bbeb402 100644 --- a/lib/controllers/rooms_controller.dart +++ b/lib/controllers/rooms_controller.dart @@ -1,5 +1,6 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/new_events_controller.dart"; import "package:nexus/models/read_receipt.dart"; import "package:nexus/models/room.dart"; @@ -13,11 +14,18 @@ class RoomsController extends Notifier> { final incoming = entry.value; final existing = acc[roomId]; + ref + .watch(NewEventsController.provider(roomId).notifier) + .add(incoming.events); + return acc.add( roomId, existing?.copyWith( metadata: incoming.metadata ?? existing.metadata, - events: existing.events.addAll(incoming.events), + events: existing.events.updateById( + incoming.events, + (item) => item.eventId, + ), state: incoming.state.entries.fold( existing.state, (stateAcc, event) => stateAcc.add( diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart index 5591952..4f5d2db 100644 --- a/lib/helpers/extensions/event_to_message.dart +++ b/lib/helpers/extensions/event_to_message.dart @@ -1,23 +1,36 @@ -import "package:collection/collection.dart"; +import "dart:developer"; + import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/get_event_request.dart"; +import "package:nexus/models/get_related_events_request.dart"; extension EventToMessage on Event { Future toMessage( - Timeline timeline, { + ClientController client, { bool mustBeText = false, bool includeEdits = false, }) async { - final replyId = inReplyToEventId(); - final newEvent = (unsigned?["m.relations"] as Map?)?["m.replace"]; - final event = newEvent == null ? this : Event.fromJson(newEvent, room); + if (relationType == "m.replace" && !includeEdits) return null; + final newEvents = await client.getRelatedEvents( + GetRelatedEventsRequest( + roomId: roomId, + eventId: eventId, + relationType: "m.replace", + ), + ); + final event = newEvents?.lastOrNull ?? this; + + final replyId = this.content["m.relates_to"]?["m.in_reply_to"]?["event_id"]; final replyEvent = replyId == null ? null - : await room.getEventById(replyId); + : await client.getEvent( + GetEventRequest(roomId: roomId, eventId: replyId), + ); - final sender = - await event.fetchSenderUser() ?? event.senderFromMemoryOrFallback; + final author = await client.getProfile(event.authorId); final newContent = event.content["m.new_content"] as Map?; final metadata = { "formatted": @@ -26,109 +39,108 @@ extension EventToMessage on Event { event.content["formatted_body"] ?? event.content["body"] ?? "", - "reply": await replyEvent?.toMessage(mustBeText: true, timeline), + "reply": await replyEvent?.toMessage(client, mustBeText: true), "body": newContent?["body"] ?? event.content["body"], "eventType": event.type, - "avatarUrl": sender.avatarUrl.toString(), - "displayName": sender.displayName ?? sender.id, + "avatarUrl": author?.avatarUrl, + "displayName": author?.displayName ?? authorId, "txnId": transactionId, }; - final editedAt = event.relationshipType == RelationshipTypes.edit - ? event.originServerTs - : null; + final editedAt = event.relationType == "m.replace" ? event.timestamp : null; - if ((redacted && !mustBeText) || - (!includeEdits && (relationshipType == RelationshipTypes.edit))) { + if ((event.redactedBy != null && !mustBeText) || + (!includeEdits && (relationType == "m.replace"))) { return null; } - // TODO: Use server-generated preview if enabled when https://github.com/famedly/matrix-dart-sdk/issues/2195 is fixed. + // TODO: Use server-generated preview if enabled // final match = Uri.tryParse( // RegExp(regexLink, caseSensitive: false).firstMatch(body)?.group(0) ?? "", // ); - // final preview = match == null - // ? null - // : await room.client.getUrlPreview(match); - final asText = Message.text( metadata: metadata, id: eventId, - authorId: senderId, - text: redacted ? "This message has been deleted..." : event.body, + authorId: authorId, + text: redactedBy == null + ? event.content["body"] ?? "" + : "This message has been deleted...", replyToMessageId: replyId, - deliveredAt: originServerTs, + deliveredAt: timestamp, editedAt: editedAt, ) as TextMessage; + final content = (decrypted ?? this.content); + if (mustBeText) return asText; return switch (type) { - EventTypes.Encrypted => asText.copyWith( + "m.room.encrypted" => asText.copyWith( text: "Unable to decrypt message.", metadata: {...metadata, "formatted": "Unable to decrypt message."}, ), - PollEventContent.startType => Message.custom( - metadata: { - ...metadata, - "poll": event.parsedPollEventContent.pollStartContent, - "responses": event.getPollResponses(timeline), - }, - id: eventId, - deliveredAt: originServerTs, - authorId: senderId, - ), - (EventTypes.Sticker || EventTypes.Message) => switch (messageType) { - (MessageTypes.Sticker || MessageTypes.Image) => Message.image( + // "org.matrix.msc3381.poll.start" => Message.custom( + // metadata: { + // ...metadata, + // "poll": event.parsedPollEventContent.pollStartContent, + // "responses": event.getPollResponses(timeline), + // }, + // id: eventId, + // deliveredAt: originServerTs, + // authorId: senderId, + // ), + ("m.sticker" || "m.room.message") => switch (content["msgtype"]) { + ("m.sticker" || "m.image") => Message.image( metadata: metadata, id: eventId, - authorId: senderId, - text: event.text, - source: (await getAttachmentUri()).toString(), + authorId: authorId, + text: event.localContent?.sanitizedHtml, + source: "(await getAttachmentUri()).toString()", // TODO replyToMessageId: replyId, - deliveredAt: originServerTs, + deliveredAt: timestamp, blurhash: (event.content["info"] as Map?)?["xyz.amorgan.blurhash"], ), - MessageTypes.Audio => Message.audio( + "m.audio" => Message.audio( metadata: metadata, id: eventId, - authorId: senderId, - text: event.text, + authorId: authorId, + text: event.content["body"], replyToMessageId: replyId, - source: (await event.getAttachmentUri()).toString(), - deliveredAt: originServerTs, + source: "(await event.getAttachmentUri()).toString()", // TODO + deliveredAt: timestamp, // TODO: See if we can figure out duration duration: Duration(hours: 1), ), - MessageTypes.File => Message.file( + "m.file" => Message.file( name: event.content["filename"].toString(), metadata: metadata, id: eventId, - authorId: senderId, - source: (await event.getAttachmentUri()).toString(), + authorId: authorId, + source: "(await event.getAttachmentUri()).toString()", // TODO replyToMessageId: replyId, - deliveredAt: originServerTs, + deliveredAt: timestamp, ), _ => asText, }, - EventTypes.RoomMember => Message.system( + "m.room.member" => Message.system( metadata: metadata, id: eventId, - authorId: senderId, + authorId: authorId, + deliveredAt: timestamp, text: - "${event.asUser.displayName ?? event.asUser.id} ${switch (Membership.values.firstWhereOrNull((membership) => membership.name == event.content["membership"])) { - Membership.invite => "was invited to", - Membership.join => "joined", - Membership.leave => "left", - Membership.knock => "asked to join", - Membership.ban => "was banned from", + "${content["displayname"] ?? event.stateKey} ${switch (event.content["membership"]) { + "invite" => "was invited to", + "join" => "joined", + "leave" => "left", + "knock" => "asked to join", + "ban" => "was banned from", _ => "did something relating to", }} the room.", ), - EventTypes.Redaction => null, + "m.room.redaction" => null, _ => // Turn this on for debugging purposes false @@ -136,7 +148,7 @@ extension EventToMessage on Event { ? Message.unsupported( metadata: metadata, id: eventId, - authorId: senderId, + authorId: authorId, replyToMessageId: replyId, ) : null, diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index aab1f1f..88cfd5a 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -4,7 +4,7 @@ import "dart:typed_data"; import "package:ffi/ffi.dart"; import "package:nexus/src/third_party/gomuks.g.dart"; -extension GomuksOwnedBufferToJson on GomuksOwnedBuffer { +extension GomuksOwnedBufferToX on GomuksOwnedBuffer { Uint8List toBytes() { try { if (base == nullptr || length <= 0) return Uint8List(0); @@ -14,14 +14,7 @@ extension GomuksOwnedBufferToJson on GomuksOwnedBuffer { } } - Map toJson() { - final bytes = toBytes(); - if (bytes.isEmpty) return {}; - final json = jsonDecode(utf8.decode(bytes)); - - if (json is Map?) return json ?? {}; - throw json; - } + dynamic toJson() => jsonDecode(utf8.decode(toBytes())); } extension JsonToGomuksBuffer on Map { diff --git a/lib/helpers/extensions/list_to_messages.dart b/lib/helpers/extensions/list_to_messages.dart index edddb25..725f9c3 100644 --- a/lib/helpers/extensions/list_to_messages.dart +++ b/lib/helpers/extensions/list_to_messages.dart @@ -1,10 +1,12 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/controllers/client_controller.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; +import "package:nexus/models/event.dart"; -extension ListToMessages on List { - Future> toMessages(Room room, Timeline timeline) async => +extension ListToMessages on IList { + Future> toMessages(ClientController client) async => (await Future.wait( - map((event) => Event.fromMatrixEvent(event, room).toMessage(timeline)), - )).nonNulls.toList().reversed.toList(); + map((event) => event.toMessage(client)), + )).nonNulls.toList(); } diff --git a/lib/models/event.dart b/lib/models/event.dart index e80dff9..623116b 100644 --- a/lib/models/event.dart +++ b/lib/models/event.dart @@ -23,7 +23,7 @@ abstract class Event with _$Event { String? transactionId, String? redactedBy, String? relatesTo, - @JsonKey(name: "relates_type") String? relationType, + String? relationType, String? decryptionError, String? sendError, @Default(IMap.empty()) IMap reactions, diff --git a/lib/models/get_event_request.dart b/lib/models/get_event_request.dart new file mode 100644 index 0000000..3812d50 --- /dev/null +++ b/lib/models/get_event_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "get_event_request.freezed.dart"; +part "get_event_request.g.dart"; + +@freezed +abstract class GetEventRequest with _$GetEventRequest { + const factory GetEventRequest({ + required String roomId, + required String eventId, + @Default(false) bool unredact, + }) = _GetEventRequest; + + factory GetEventRequest.fromJson(Map json) => + _$GetEventRequestFromJson(json); +} diff --git a/lib/models/get_related_events_request.dart b/lib/models/get_related_events_request.dart new file mode 100644 index 0000000..7e2244f --- /dev/null +++ b/lib/models/get_related_events_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "get_related_events_request.freezed.dart"; +part "get_related_events_request.g.dart"; + +@freezed +abstract class GetRelatedEventsRequest with _$GetRelatedEventsRequest { + const factory GetRelatedEventsRequest({ + required String roomId, + required String eventId, + required String relationType, + }) = _GetRelatedEventsRequest; + + factory GetRelatedEventsRequest.fromJson(Map json) => + _$GetRelatedEventsRequestFromJson(json); +} diff --git a/lib/models/login.dart b/lib/models/login.dart deleted file mode 100644 index 64b3c55..0000000 --- a/lib/models/login.dart +++ /dev/null @@ -1,14 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "login.freezed.dart"; -part "login.g.dart"; - -@freezed -abstract class Login with _$Login { - const factory Login({ - required String username, - required String password, - required String homeserverUrl, - }) = _Login; - - factory Login.fromJson(Map json) => _$LoginFromJson(json); -} diff --git a/lib/models/login_request.dart b/lib/models/login_request.dart new file mode 100644 index 0000000..b3704fa --- /dev/null +++ b/lib/models/login_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "login_request.freezed.dart"; +part "login_request.g.dart"; + +@freezed +abstract class LoginRequest with _$LoginRequest { + const factory LoginRequest({ + required String username, + required String password, + required String homeserverUrl, + }) = _LoginRequest; + + factory LoginRequest.fromJson(Map json) => + _$LoginRequestFromJson(json); +} diff --git a/lib/models/profile.dart b/lib/models/profile.dart new file mode 100644 index 0000000..d92b4f6 --- /dev/null +++ b/lib/models/profile.dart @@ -0,0 +1,29 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +part "profile.freezed.dart"; +part "profile.g.dart"; + +@freezed +abstract class Profile with _$Profile { + const factory Profile({ + String? avatarUrl, + @JsonKey(name: "displayname") String? displayName, + @JsonKey(name: "us.cloke.msc4175.tz") String? timezone, + + @Default(IList.empty()) + @JsonKey(name: "io.fsky.nyx.pronouns") + IList pronouns, + }) = _Profile; + + factory Profile.fromJson(Map json) => + _$ProfileFromJson(json); +} + +@freezed +abstract class Pronoun with _$Pronoun { + const factory Pronoun({required String language, required String summary}) = + _Pronoun; + + factory Pronoun.fromJson(Map json) => + _$PronounFromJson(json); +} diff --git a/lib/models/report.dart b/lib/models/report.dart deleted file mode 100644 index 8b35e7a..0000000 --- a/lib/models/report.dart +++ /dev/null @@ -1,14 +0,0 @@ -import "package:freezed_annotation/freezed_annotation.dart"; -part "report.freezed.dart"; -part "report.g.dart"; - -@freezed -abstract class Report with _$Report { - const factory Report({ - required String roomId, - required String eventId, - String? reason, - }) = _Report; - - factory Report.fromJson(Map json) => _$ReportFromJson(json); -} diff --git a/lib/models/report_request.dart b/lib/models/report_request.dart new file mode 100644 index 0000000..749ad60 --- /dev/null +++ b/lib/models/report_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "report_request.freezed.dart"; +part "report_request.g.dart"; + +@freezed +abstract class ReportRequest with _$ReportRequest { + const factory ReportRequest({ + required String roomId, + required String eventId, + String? reason, + }) = _ReportRequest; + + factory ReportRequest.fromJson(Map json) => + _$ReportRequestFromJson(json); +} diff --git a/lib/pages/chat_page.dart b/lib/pages/chat_page.dart index e1f1074..ee2f4d0 100644 --- a/lib/pages/chat_page.dart +++ b/lib/pages/chat_page.dart @@ -1,12 +1,13 @@ import "package:flutter/material.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/widgets/chat_page/sidebar.dart"; import "package:nexus/widgets/chat_page/room_chat.dart"; -class ChatPage extends StatelessWidget { +class ChatPage extends ConsumerWidget { const ChatPage({super.key}); @override - Widget build(BuildContext context) => LayoutBuilder( + Widget build(BuildContext context, WidgetRef ref) => LayoutBuilder( builder: (context, constraints) { final isDesktop = constraints.maxWidth > 650; final showMembersByDefault = constraints.maxWidth > 1000; diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 371ad66..83d1298 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -5,7 +5,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/models/homeserver.dart"; -import "package:nexus/models/login.dart"; +import "package:nexus/models/login_request.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/loading.dart"; @@ -174,7 +174,7 @@ class LoginPage extends HookConsumerWidget { onPressed: () async { isLoading.value = true; final succeeded = await client.login( - Login( + LoginRequest( username: username.text, password: password.text, homeserverUrl: homeserver.value!, diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/chat_box.dart index 10b02fe..876f065 100644 --- a/lib/widgets/chat_page/chat_box.dart +++ b/lib/widgets/chat_page/chat_box.dart @@ -44,9 +44,9 @@ class ChatBox extends HookConsumerWidget { } void send() { - if (controller.value.text.trim().isEmpty) return; + if (controller.value.text.trim().isEmpty || room.metadata == null) return; ref - .watch(RoomChatController.provider(room).notifier) + .watch(RoomChatController.provider(room.metadata!.id).notifier) .send( controller.value.formattedText, relation: relatedMessage, diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index 18baf2a..c124c24 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -18,7 +18,7 @@ import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/show_context_menu.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/models/report.dart"; +import "package:nexus/models/report_request.dart"; import "package:nexus/widgets/chat_page/chat_box.dart"; import "package:nexus/widgets/chat_page/html/html.dart"; import "package:nexus/widgets/chat_page/room_appbar.dart"; @@ -43,12 +43,13 @@ class RoomChat extends HookConsumerWidget { final replyToMessage = useState(null); final memberListOpened = useState(showMembersByDefault); final relationType = useState(RelationType.reply); - final theme = Theme.of(context); - final danger = theme.colorScheme.error; final room = ref.watch(SelectedRoomController.provider); final userId = ref.watch(ClientStateController.provider)?.userId; - if (room == null || userId == null) { + final theme = Theme.of(context); + final danger = theme.colorScheme.error; + + if (room == null || userId == null || room.metadata?.id == null) { return Center( child: Text( "Nothing to see here...", @@ -56,7 +57,8 @@ class RoomChat extends HookConsumerWidget { ), ); } - final controllerProvider = RoomChatController.provider(room); + + final controllerProvider = RoomChatController.provider(room.metadata!.id); final notifier = ref.watch(controllerProvider.notifier); List getMessageOptions(Message message) { @@ -158,7 +160,7 @@ class RoomChat extends HookConsumerWidget { onPressed: () { if (room.metadata == null) return; client.reportEvent( - Report( + ReportRequest( roomId: room.metadata!.id, eventId: message.id, reason: reasonController.text.isEmpty From b55c990b24c4d1f55240e0aee079f411b7786ff0 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 28 Jan 2026 22:59:09 +0000 Subject: [PATCH 22/34] redact support --- lib/controllers/client_controller.dart | 4 ++++ lib/controllers/room_chat_controller.dart | 25 ++++++++++++++++------- lib/models/redact_event_request.dart | 3 +++ 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 lib/models/redact_event_request.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index abd7b1f..5c9ed8f 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -16,6 +16,7 @@ import "package:nexus/models/get_event_request.dart"; import "package:nexus/models/get_related_events_request.dart"; import "package:nexus/models/login_request.dart"; import "package:nexus/models/profile.dart"; +import "package:nexus/models/redact_event_request.dart"; import "package:nexus/models/report_request.dart"; import "package:nexus/models/room.dart"; import "package:nexus/models/sync_data.dart"; @@ -113,6 +114,9 @@ class ClientController extends AsyncNotifier { return response.buf.toJson(); } + Future redactEvent(RedactEventRequest report) => + sendCommand("redact_event", report.toJson()); + Future verify(String recoveryKey) async { try { await sendCommand("verify", {"recovery_key": recoveryKey}); diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 0012418..88ae53f 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -9,6 +9,7 @@ import "package:nexus/controllers/new_events_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; import "package:nexus/helpers/extensions/list_to_messages.dart"; +import "package:nexus/models/redact_event_request.dart"; import "package:nexus/models/relation_type.dart"; class RoomChatController extends AsyncNotifier { @@ -84,9 +85,17 @@ class RoomChatController extends AsyncNotifier { } Future deleteMessage(Message message, {String? reason}) async { - // final controller = await future; - // await controller.removeMessage(message); - // await room.redactEvent(message.id, reason: reason); + final controller = await future; + await controller.removeMessage(message); + await ref + .watch(ClientController.provider.notifier) + .redactEvent( + RedactEventRequest( + eventId: message.id, + roomId: roomId, + reason: reason, + ), + ); } Future loadOlder() async { @@ -140,10 +149,12 @@ class RoomChatController extends AsyncNotifier { } Future resolveUser(String id) async { - // final user = await room.client.getUserProfile(id); + final user = await ref + .watch(ClientController.provider.notifier) + .getProfile(id); return chat.User( id: id, - // name: user.displayname, + name: user?.displayName, // imageSource: user.avatarUrl == null // ? null // : (await ref.watch( @@ -152,8 +163,8 @@ class RoomChatController extends AsyncNotifier { ); } - static final provider = - AsyncNotifierProvider.family( + static final provider = AsyncNotifierProvider.family + .autoDispose( RoomChatController.new, ); } diff --git a/lib/models/redact_event_request.dart b/lib/models/redact_event_request.dart new file mode 100644 index 0000000..b742351 --- /dev/null +++ b/lib/models/redact_event_request.dart @@ -0,0 +1,3 @@ +import "package:nexus/models/report_request.dart"; + +typedef RedactEventRequest = ReportRequest; From 715bb15738b67fa8f4fb234564c89a544e278f3a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 28 Jan 2026 23:08:22 +0000 Subject: [PATCH 23/34] working decryption --- lib/helpers/extensions/event_to_message.dart | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart index 4f5d2db..b79901a 100644 --- a/lib/helpers/extensions/event_to_message.dart +++ b/lib/helpers/extensions/event_to_message.dart @@ -1,5 +1,3 @@ -import "dart:developer"; - import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/models/event.dart"; @@ -31,17 +29,19 @@ extension EventToMessage on Event { ); final author = await client.getProfile(event.authorId); - final newContent = event.content["m.new_content"] as Map?; + final content = (decrypted ?? this.content); + final type = (decryptedType ?? this.type); + final newContent = content["m.new_content"] as Map?; final metadata = { "formatted": newContent?["formatted_body"] ?? newContent?["body"] ?? - event.content["formatted_body"] ?? - event.content["body"] ?? + content["formatted_body"] ?? + content["body"] ?? "", "reply": await replyEvent?.toMessage(client, mustBeText: true), - "body": newContent?["body"] ?? event.content["body"], - "eventType": event.type, + "body": newContent?["body"] ?? content["body"], + "eventType": type, "avatarUrl": author?.avatarUrl, "displayName": author?.displayName ?? authorId, "txnId": transactionId, @@ -66,7 +66,7 @@ extension EventToMessage on Event { id: eventId, authorId: authorId, text: redactedBy == null - ? event.content["body"] ?? "" + ? content["body"] ?? "" : "This message has been deleted...", replyToMessageId: replyId, deliveredAt: timestamp, @@ -74,8 +74,6 @@ extension EventToMessage on Event { ) as TextMessage; - final content = (decrypted ?? this.content); - if (mustBeText) return asText; return switch (type) { "m.room.encrypted" => asText.copyWith( @@ -101,13 +99,13 @@ extension EventToMessage on Event { source: "(await getAttachmentUri()).toString()", // TODO replyToMessageId: replyId, deliveredAt: timestamp, - blurhash: (event.content["info"] as Map?)?["xyz.amorgan.blurhash"], + blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"], ), "m.audio" => Message.audio( metadata: metadata, id: eventId, authorId: authorId, - text: event.content["body"], + text: content["body"], replyToMessageId: replyId, source: "(await event.getAttachmentUri()).toString()", // TODO deliveredAt: timestamp, @@ -115,7 +113,7 @@ extension EventToMessage on Event { duration: Duration(hours: 1), ), "m.file" => Message.file( - name: event.content["filename"].toString(), + name: content["filename"].toString(), metadata: metadata, id: eventId, authorId: authorId, @@ -131,7 +129,7 @@ extension EventToMessage on Event { authorId: authorId, deliveredAt: timestamp, text: - "${content["displayname"] ?? event.stateKey} ${switch (event.content["membership"]) { + "${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) { "invite" => "was invited to", "join" => "joined", "leave" => "left", From 92eedc92ab0a839c2d1148f17a98544a1ebd35f2 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 29 Jan 2026 11:52:56 +0000 Subject: [PATCH 24/34] wip thing --- lib/controllers/client_controller.dart | 44 +++++++++------ lib/controllers/header_controller.dart | 11 ++-- lib/controllers/room_chat_controller.dart | 55 ++++++++++++------- lib/controllers/spaces_controller.dart | 16 +++--- lib/helpers/extensions/event_to_message.dart | 8 +-- lib/models/client_state.dart | 2 +- lib/models/paginate.dart | 16 ++++++ lib/models/redact_event_request.dart | 3 - .../{ => requests}/get_event_request.dart | 0 .../get_related_events_request.dart | 0 lib/models/{ => requests}/login_request.dart | 0 lib/models/requests/paginate_request.dart | 14 +++++ lib/models/requests/redact_event_request.dart | 3 + lib/models/{ => requests}/report_request.dart | 0 lib/models/requests/send_message_request.dart | 55 +++++++++++++++++++ lib/pages/login_page.dart | 2 +- lib/widgets/chat_page/room_chat.dart | 2 +- 17 files changed, 173 insertions(+), 58 deletions(-) create mode 100644 lib/models/paginate.dart delete mode 100644 lib/models/redact_event_request.dart rename lib/models/{ => requests}/get_event_request.dart (100%) rename lib/models/{ => requests}/get_related_events_request.dart (100%) rename lib/models/{ => requests}/login_request.dart (100%) create mode 100644 lib/models/requests/paginate_request.dart create mode 100644 lib/models/requests/redact_event_request.dart rename lib/models/{ => requests}/report_request.dart (100%) create mode 100644 lib/models/requests/send_message_request.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 5c9ed8f..15d06c9 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -12,12 +12,15 @@ import "package:nexus/controllers/top_level_spaces_controller.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/models/client_state.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/models/get_event_request.dart"; -import "package:nexus/models/get_related_events_request.dart"; -import "package:nexus/models/login_request.dart"; +import "package:nexus/models/paginate.dart"; +import "package:nexus/models/requests/get_event_request.dart"; +import "package:nexus/models/requests/get_related_events_request.dart"; +import "package:nexus/models/requests/login_request.dart"; import "package:nexus/models/profile.dart"; -import "package:nexus/models/redact_event_request.dart"; -import "package:nexus/models/report_request.dart"; +import "package:nexus/models/requests/paginate_request.dart"; +import "package:nexus/models/requests/redact_event_request.dart"; +import "package:nexus/models/requests/report_request.dart"; +import "package:nexus/models/requests/send_message_request.dart"; import "package:nexus/models/room.dart"; import "package:nexus/models/sync_data.dart"; import "package:nexus/models/sync_status.dart"; @@ -98,7 +101,10 @@ class ClientController extends AsyncNotifier { throw Exception("GomuksStart returned error code $errorCode"); } - Future sendCommand(String command, Map data) async { + Future _sendCommand( + String command, + Map data, + ) async { final bufferPointer = data.toGomuksBufferPtr(); final handle = await future; final response = await Isolate.run( @@ -115,11 +121,14 @@ class ClientController extends AsyncNotifier { } Future redactEvent(RedactEventRequest report) => - sendCommand("redact_event", report.toJson()); + _sendCommand("redact_event", report.toJson()); + + Future sendMessage(SendMessageRequest request) => + _sendCommand("send_message", request.toJson()); Future verify(String recoveryKey) async { try { - await sendCommand("verify", {"recovery_key": recoveryKey}); + await _sendCommand("verify", {"recovery_key": recoveryKey}); return true; } catch (error) { return false; @@ -128,35 +137,38 @@ class ClientController extends AsyncNotifier { Future leaveRoom(Room room) async { if (room.metadata == null) return; - await sendCommand("leave_room", {"room_id": room.metadata!.id}); + await _sendCommand("leave_room", {"room_id": room.metadata!.id}); } Future?> getRelatedEvents( GetRelatedEventsRequest request, ) async { final response = - (await sendCommand("get_related_events", request.toJson())) as List?; + (await _sendCommand("get_related_events", request.toJson())) as List?; return response?.map((event) => Event.fromJson(event)).toIList(); } Future getEvent(GetEventRequest request) async { - final json = await sendCommand("get_event", request.toJson()); + final json = await _sendCommand("get_event", request.toJson()); return json == null ? null : Event.fromJson(json); } + Future paginate(PaginateRequest request) async => + Paginate.fromJson(await _sendCommand("paginate", request.toJson())); + Future getProfile(String userId) async { - final json = await sendCommand("get_profile", {"user_id": userId}); + final json = await _sendCommand("get_profile", {"user_id": userId}); return json == null ? null : Profile.fromJson(json); } Future reportEvent(ReportRequest report) => - sendCommand("report_event", report.toJson()); + _sendCommand("report_event", report.toJson()); Future markRead(Room room) async { if (room.events.isEmpty || room.metadata == null) return; - await sendCommand("mark_read", { + await _sendCommand("mark_read", { "room_id": room.metadata?.id, "receipt_type": "m.read", "event_id": room.events.last.eventId, @@ -165,7 +177,7 @@ class ClientController extends AsyncNotifier { Future login(LoginRequest login) async { try { - await sendCommand("login", login.toJson()); + await _sendCommand("login", login.toJson()); return true; } catch (error) { return false; @@ -174,7 +186,7 @@ class ClientController extends AsyncNotifier { Future discoverHomeserver(Uri homeserver) async { try { - final response = await sendCommand("discover_homeserver", { + final response = await _sendCommand("discover_homeserver", { "user_id": "@fakeuser:${homeserver.host}", }); return response["m.homeserver"]?["base_url"]; diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header_controller.dart index dcb73ea..ead8f0d 100644 --- a/lib/controllers/header_controller.dart +++ b/lib/controllers/header_controller.dart @@ -1,3 +1,5 @@ +import "dart:ffi"; +import "dart:isolate"; import "package:ffi/ffi.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; @@ -7,13 +9,14 @@ class HeaderController extends AsyncNotifier> { @override Future> build() async { final handle = await ref.watch(ClientController.provider.future); - final info = GomuksGetAccountInfo(handle); + final info = await Isolate.run(() => GomuksGetAccountInfo(handle)); final headers = { - "authorization": - "Bearer ${info.access_token.cast().toDartString()}", + if (info.access_token != nullptr) + "authorization": + "Bearer ${info.access_token.cast().toDartString()}", }; - GomuksFreeAccountInfo(info); + await Isolate.run(() => GomuksFreeAccountInfo(info)); return headers; } diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 88ae53f..4490fdd 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -9,8 +9,11 @@ import "package:nexus/controllers/new_events_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; import "package:nexus/helpers/extensions/list_to_messages.dart"; -import "package:nexus/models/redact_event_request.dart"; +import "package:nexus/models/requests/redact_event_request.dart"; import "package:nexus/models/relation_type.dart"; +import "package:nexus/models/requests/send_message_request.dart"; +import "package:nexus/models/room.dart"; +import "package:nexus/models/sync_data.dart"; class RoomChatController extends AsyncNotifier { final String roomId; @@ -67,7 +70,11 @@ class RoomChatController extends AsyncNotifier { ); final messages = await events.toMessages(client); - return InMemoryChatController(messages: messages); + final controller = InMemoryChatController(messages: messages); + + if (messages.length < 20) await loadOlder(controller); + + return controller; } Future insertMessage(Message message) async { @@ -98,9 +105,12 @@ class RoomChatController extends AsyncNotifier { ); } - Future loadOlder() async { - // final currentEvents = await future; - // await ref.watch(EventsController.provider(room).notifier).prev(); + Future loadOlder([InMemoryChatController? chatController]) async { + final controller = chatController ?? await future; + final client = ref.watch(ClientController.provider.notifier); + + client. + // await ref.watchInMemoryChatController? chatController(EventsController.provider(room).notifier).prev(); // final timeline = await ref.watch(EventsController.provider(room).future); // final controller = await future; @@ -127,25 +137,28 @@ class RoomChatController extends AsyncNotifier { required RelationType relationType, Message? relation, }) async { - // var taggedMessage = message; + var taggedMessage = message; - // for (final tag in tags) { - // final escaped = RegExp.escape(tag.id); - // final pattern = RegExp(r"@+(" + escaped + r")(#[^#]*#)?"); + for (final tag in tags) { + final escaped = RegExp.escape(tag.id); // TODO: Fix + final pattern = RegExp(r"@+(" + escaped + r")(#[^#]*#)?"); - // taggedMessage = taggedMessage.replaceAllMapped( - // pattern, - // (match) => match.group(1)!, - // ); - // } + taggedMessage = taggedMessage.replaceAllMapped( + pattern, + (match) => match.group(1)!, + ); + } - // await room.sendTextEvent( - // taggedMessage, - // editEventId: relationType == RelationType.edit ? relation?.id : null, - // inReplyTo: (relationType == RelationType.reply && relation != null) - // ? await room.getEventById(relation.id) - // : null, - // ); + final client = ref.watch(ClientController.provider.notifier); + client.sendMessage( + SendMessageRequest( + roomId: roomId, + text: taggedMessage, + relation: relation == null + ? null + : Relation(eventId: relation.id, relationType: relationType), + ), + ); } Future resolveUser(String id) async { diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index f0d7a6b..292e323 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -45,19 +45,21 @@ class SpacesController extends Notifier> { ) .toISet(); - final dmRooms = rooms.values - .where((room) => room.metadata?.dmUserId != null) - .toIList(); - - final homeRooms = rooms.entries + final otherRooms = rooms.entries .where( (e) => - e.value.metadata?.dmUserId == null && !allNestedRoomIds.contains(e.key) && !topLevelSpaceIds.contains(e.key) && !spaceEdges.containsKey(e.key), ) - .map((e) => e.value) + .map((e) => e.value); + + final homeRooms = otherRooms + .where((room) => room.metadata?.dmUserId == null) + .toIList(); + + final dmRooms = otherRooms + .where((room) => room.metadata?.dmUserId != null) .toIList(); final topLevelSpacesList = topLevelSpaceIds diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart index b79901a..699b9f3 100644 --- a/lib/helpers/extensions/event_to_message.dart +++ b/lib/helpers/extensions/event_to_message.dart @@ -1,8 +1,8 @@ import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/models/event.dart"; -import "package:nexus/models/get_event_request.dart"; -import "package:nexus/models/get_related_events_request.dart"; +import "package:nexus/models/requests/get_event_request.dart"; +import "package:nexus/models/requests/get_related_events_request.dart"; extension EventToMessage on Event { Future toMessage( @@ -92,8 +92,8 @@ extension EventToMessage on Event { // ), ("m.sticker" || "m.room.message") => switch (content["msgtype"]) { ("m.sticker" || "m.image") => Message.image( - metadata: metadata, id: eventId, + metadata: metadata, authorId: authorId, text: event.localContent?.sanitizedHtml, source: "(await getAttachmentUri()).toString()", // TODO @@ -102,8 +102,8 @@ extension EventToMessage on Event { blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"], ), "m.audio" => Message.audio( - metadata: metadata, id: eventId, + metadata: metadata, authorId: authorId, text: content["body"], replyToMessageId: replyId, diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart index a8781d0..4063cc5 100644 --- a/lib/models/client_state.dart +++ b/lib/models/client_state.dart @@ -8,7 +8,7 @@ abstract class ClientState with _$ClientState { required bool isInitialized, required bool isLoggedIn, required bool isVerified, - required String userId, + required String? userId, }) = _ClientState; factory ClientState.fromJson(Map json) => diff --git a/lib/models/paginate.dart b/lib/models/paginate.dart new file mode 100644 index 0000000..4faf4e9 --- /dev/null +++ b/lib/models/paginate.dart @@ -0,0 +1,16 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +part "paginate.freezed.dart"; +part "paginate.g.dart"; + +@freezed +abstract class Paginate with _$Paginate { + const factory Paginate({ + required IList events, + required bool hasMore, + }) = _Paginate; + + factory Paginate.fromJson(Map json) => + _$PaginateFromJson(json); +} diff --git a/lib/models/redact_event_request.dart b/lib/models/redact_event_request.dart deleted file mode 100644 index b742351..0000000 --- a/lib/models/redact_event_request.dart +++ /dev/null @@ -1,3 +0,0 @@ -import "package:nexus/models/report_request.dart"; - -typedef RedactEventRequest = ReportRequest; diff --git a/lib/models/get_event_request.dart b/lib/models/requests/get_event_request.dart similarity index 100% rename from lib/models/get_event_request.dart rename to lib/models/requests/get_event_request.dart diff --git a/lib/models/get_related_events_request.dart b/lib/models/requests/get_related_events_request.dart similarity index 100% rename from lib/models/get_related_events_request.dart rename to lib/models/requests/get_related_events_request.dart diff --git a/lib/models/login_request.dart b/lib/models/requests/login_request.dart similarity index 100% rename from lib/models/login_request.dart rename to lib/models/requests/login_request.dart diff --git a/lib/models/requests/paginate_request.dart b/lib/models/requests/paginate_request.dart new file mode 100644 index 0000000..5941499 --- /dev/null +++ b/lib/models/requests/paginate_request.dart @@ -0,0 +1,14 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "paginate_request.freezed.dart"; +part "paginate_request.g.dart"; + +@freezed +abstract class PaginateRequest with _$PaginateRequest { + const factory PaginateRequest({ + required String roomId, + @Default(20) int limit, + }) = _PaginateRequest; + + factory PaginateRequest.fromJson(Map json) => + _$PaginateRequestFromJson(json); +} diff --git a/lib/models/requests/redact_event_request.dart b/lib/models/requests/redact_event_request.dart new file mode 100644 index 0000000..fed2255 --- /dev/null +++ b/lib/models/requests/redact_event_request.dart @@ -0,0 +1,3 @@ +import "package:nexus/models/requests/report_request.dart"; + +typedef RedactEventRequest = ReportRequest; diff --git a/lib/models/report_request.dart b/lib/models/requests/report_request.dart similarity index 100% rename from lib/models/report_request.dart rename to lib/models/requests/report_request.dart diff --git a/lib/models/requests/send_message_request.dart b/lib/models/requests/send_message_request.dart new file mode 100644 index 0000000..6825d85 --- /dev/null +++ b/lib/models/requests/send_message_request.dart @@ -0,0 +1,55 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/relation_type.dart"; +part "send_message_request.freezed.dart"; +part "send_message_request.g.dart"; + +@freezed +abstract class SendMessageRequest with _$SendMessageRequest { + const factory SendMessageRequest({ + required String roomId, + required String text, + @Default(Mentions()) @JsonKey(name: "m.mentions") Mentions mentions, + @JsonKey(name: "m.relates_to") Relation? relation, + }) = _SendMessageRequest; + + factory SendMessageRequest.fromJson(Map json) => + _$SendMessageRequestFromJson(json); +} + +@freezed +abstract class Mentions with _$Mentions { + const factory Mentions({ + @Default(false) bool room, + @Default(IList.empty()) IList userIds, + }) = _Mentions; + + factory Mentions.fromJson(Map json) => + _$MentionsFromJson(json); +} + +@freezed +abstract class Relation with _$Relation { + const Relation._(); // required for custom methods + + const factory Relation({ + required String eventId, + required RelationType relationType, + }) = _Relation; + + @override + Map toJson() { + switch (relationType) { + case RelationType.reply: + return { + "m.in_reply_to": {"event_id": eventId}, + }; + + case RelationType.edit: + return {"rel_type": "m.replace", "event_id": eventId}; + } + } + + factory Relation.fromJson(Map json) => + _$RelationFromJson(json); +} diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 83d1298..b15f6d4 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -5,7 +5,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/models/homeserver.dart"; -import "package:nexus/models/login_request.dart"; +import "package:nexus/models/requests/login_request.dart"; import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/loading.dart"; diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index c124c24..4214e89 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -18,7 +18,7 @@ import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/show_context_menu.dart"; import "package:nexus/models/relation_type.dart"; -import "package:nexus/models/report_request.dart"; +import "package:nexus/models/requests/report_request.dart"; import "package:nexus/widgets/chat_page/chat_box.dart"; import "package:nexus/widgets/chat_page/html/html.dart"; import "package:nexus/widgets/chat_page/room_appbar.dart"; From c2214fcc44892cc41e3fa76cf61698f2eb06c603 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 02:13:46 +0100 Subject: [PATCH 25/34] wip --- lib/controllers/client_controller.dart | 18 ++-- lib/controllers/members_controller.dart | 24 ++--- lib/controllers/profile_controller.dart | 17 ++++ lib/controllers/room_chat_controller.dart | 87 ++++++++++++++----- lib/controllers/rooms_controller.dart | 17 ++-- lib/helpers/extensions/event_to_message.dart | 16 ++-- lib/helpers/extensions/list_to_messages.dart | 12 ++- lib/models/paginate.dart | 1 + .../requests/get_room_state_request.dart | 15 ++++ lib/models/requests/paginate_request.dart | 1 + lib/models/requests/send_message_request.dart | 13 ++- lib/models/room.dart | 9 +- lib/widgets/chat_page/member_list.dart | 33 +++---- lib/widgets/chat_page/room_chat.dart | 8 +- lib/widgets/chat_page/sidebar.dart | 2 +- 15 files changed, 185 insertions(+), 88 deletions(-) create mode 100644 lib/controllers/profile_controller.dart create mode 100644 lib/models/requests/get_room_state_request.dart diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index 15d06c9..fd7600f 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -15,6 +15,7 @@ import "package:nexus/models/event.dart"; import "package:nexus/models/paginate.dart"; import "package:nexus/models/requests/get_event_request.dart"; import "package:nexus/models/requests/get_related_events_request.dart"; +import "package:nexus/models/requests/get_room_state_request.dart"; import "package:nexus/models/requests/login_request.dart"; import "package:nexus/models/profile.dart"; import "package:nexus/models/requests/paginate_request.dart"; @@ -117,7 +118,9 @@ class ClientController extends AsyncNotifier { calloc.free(bufferPointer); - return response.buf.toJson(); + final json = response.buf.toJson(); + if (json is String) throw json; + return json; } Future redactEvent(RedactEventRequest report) => @@ -140,6 +143,12 @@ class ClientController extends AsyncNotifier { await _sendCommand("leave_room", {"room_id": room.metadata!.id}); } + Future> getRoomState(GetRoomStateRequest request) async { + final response = + (await _sendCommand("get_room_state", request.toJson())) as List; + return response.map((event) => Event.fromJson(event)).toIList(); + } + Future?> getRelatedEvents( GetRelatedEventsRequest request, ) async { @@ -157,11 +166,8 @@ class ClientController extends AsyncNotifier { Future paginate(PaginateRequest request) async => Paginate.fromJson(await _sendCommand("paginate", request.toJson())); - Future getProfile(String userId) async { - final json = await _sendCommand("get_profile", {"user_id": userId}); - - return json == null ? null : Profile.fromJson(json); - } + Future getProfile(String userId) async => + Profile.fromJson(await _sendCommand("get_profile", {"user_id": userId})); Future reportEvent(ReportRequest report) => _sendCommand("report_event", report.toJson()); diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members_controller.dart index df15c1c..5f88f2b 100644 --- a/lib/controllers/members_controller.dart +++ b/lib/controllers/members_controller.dart @@ -1,22 +1,26 @@ +import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/room.dart"; -class MembersController extends AsyncNotifier> { +class MembersController extends AsyncNotifier> { final Room room; MembersController(this.room); @override - Future> build() async => IList( - (await room.client.getMembersByRoom( - room.id, - notMembership: Membership.leave, - )) ?? - [], - ); + Future> build() async => + (room.state["m.room.member"]?.values ?? []) + .map( + (eventRowId) => room.events.firstWhereOrNull( + (event) => event.rowId == eventRowId, + ), + ) + .nonNulls + .toIList(); static final provider = AsyncNotifierProvider.family - .autoDispose, Room>( + .autoDispose, Room>( MembersController.new, ); } diff --git a/lib/controllers/profile_controller.dart b/lib/controllers/profile_controller.dart new file mode 100644 index 0000000..e825593 --- /dev/null +++ b/lib/controllers/profile_controller.dart @@ -0,0 +1,17 @@ +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/models/profile.dart"; + +class ProfileController extends AsyncNotifier { + final String userId; + ProfileController(this.userId); + + @override + Future build() => + ref.watch(ClientController.provider.notifier).getProfile(userId); + + static final provider = + AsyncNotifierProvider.family( + ProfileController.new, + ); +} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 4490fdd..1428df1 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -6,14 +6,17 @@ import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:fluttertagger/fluttertagger.dart" as tagger; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/new_events_controller.dart"; +import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; import "package:nexus/helpers/extensions/list_to_messages.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/requests/get_room_state_request.dart"; +import "package:nexus/models/requests/paginate_request.dart"; import "package:nexus/models/requests/redact_event_request.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/models/requests/send_message_request.dart"; import "package:nexus/models/room.dart"; -import "package:nexus/models/sync_data.dart"; class RoomChatController extends AsyncNotifier { final String roomId; @@ -22,9 +25,8 @@ class RoomChatController extends AsyncNotifier { @override Future build() async { final client = ref.watch(ClientController.provider.notifier); - final events = - ref.read(SelectedRoomController.provider)?.events ?? - const IList.empty(); + final room = ref.read(SelectedRoomController.provider); + if (room == null) return InMemoryChatController(); ref.onDispose( ref.listen(NewEventsController.provider(roomId), (_, next) async { @@ -38,7 +40,7 @@ class RoomChatController extends AsyncNotifier { await controller.removeMessage(message); } else { - final message = await event.toMessage(client, includeEdits: true); + final message = await event.toMessage(ref, includeEdits: true); if (event.relationType == "m.replace") { final controller = await future; final oldMessage = controller.messages.firstWhereOrNull( @@ -69,11 +71,26 @@ class RoomChatController extends AsyncNotifier { }).close, ); - final messages = await events.toMessages(client); + final messages = await room.timeline + .map( + (timelineRowTuple) => room.events.firstWhereOrNull( + (event) => event.rowId == timelineRowTuple.eventRowId, + ), + ) + .nonNulls + .toMessages(ref); final controller = InMemoryChatController(messages: messages); + ref.onDispose(controller.dispose); if (messages.length < 20) await loadOlder(controller); + await client.getRoomState( + GetRoomStateRequest( + roomId: roomId, + fetchMembers: room.metadata?.hasMemberList == false, + ), + ); + return controller; } @@ -109,23 +126,47 @@ class RoomChatController extends AsyncNotifier { final controller = chatController ?? await future; final client = ref.watch(ClientController.provider.notifier); - client. - // await ref.watchInMemoryChatController? chatController(EventsController.provider(room).notifier).prev(); - // final timeline = await ref.watch(EventsController.provider(room).future); + final response = await client.paginate( + PaginateRequest( + roomId: roomId, + maxTimelineId: controller.messages.firstOrNull?.metadata?["timelineId"], + ), + ); - // final controller = await future; - // await controller.insertAllMessages( - // await timeline.events - // .where( - // (event) => !currentEvents.messages.any( - // (existingEvent) => existingEvent.id == event.eventId, - // ), - // ) - // .toList() - // .toMessages(room, timeline), - // index: 0, - // ); - // ref.notifyListeners(); + ref + .watch(RoomsController.provider.notifier) + .update( + IMap({ + roomId: Room( + events: response.events.addAll(response.relatedEvents), + hasMore: response.hasMore, + timeline: response.events + .map( + (event) => TimelineRowTuple( + timelineRowId: event.timelineRowId, + eventRowId: event.rowId, + ), + ) + .toIList(), + ), + }), + const ISet.empty(), + ); + + final existingIds = controller.messages.map((m) => m.id).toSet(); + + final messages = await response.events + .where((event) => !existingIds.contains(event.eventId)) + .fold({}, (acc, event) { + acc[event.eventId] = + event; // overwrites duplicates in response.events + return acc; + }) + .values + .toIList() + .reversed + .toMessages(ref); + await controller.insertAllMessages(messages, index: 0); } Future updateMessage(Message message, Message newMessage) async => @@ -167,7 +208,7 @@ class RoomChatController extends AsyncNotifier { .getProfile(id); return chat.User( id: id, - name: user?.displayName, + name: user.displayName, // imageSource: user.avatarUrl == null // ? null // : (await ref.watch( diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart index bbeb402..bc109c9 100644 --- a/lib/controllers/rooms_controller.dart +++ b/lib/controllers/rooms_controller.dart @@ -1,3 +1,4 @@ +import "package:collection/collection.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/new_events_controller.dart"; @@ -28,16 +29,22 @@ class RoomsController extends Notifier> { ), state: incoming.state.entries.fold( existing.state, - (stateAcc, event) => stateAcc.add( + (previousValue, event) => previousValue.add( event.key, - (stateAcc[event.key] ?? IMap()).addAll( + (previousValue[event.key] ?? const IMap.empty()).addAll( event.value, ), ), ), - timeline: incoming.reset - ? incoming.timeline - : existing.timeline.addAll(incoming.timeline), + timeline: + (incoming.reset + ? incoming.timeline + : existing.timeline.updateById( + incoming.timeline, + (item) => item.timelineRowId, + )) + .sortedBy((element) => element.timelineRowId) + .toIList(), receipts: incoming.receipts.entries.fold( existing.receipts, (receiptAcc, event) => receiptAcc.add( diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/helpers/extensions/event_to_message.dart index 699b9f3..231774b 100644 --- a/lib/helpers/extensions/event_to_message.dart +++ b/lib/helpers/extensions/event_to_message.dart @@ -1,16 +1,19 @@ import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/profile_controller.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/requests/get_event_request.dart"; import "package:nexus/models/requests/get_related_events_request.dart"; extension EventToMessage on Event { Future toMessage( - ClientController client, { + Ref ref, { bool mustBeText = false, bool includeEdits = false, }) async { if (relationType == "m.replace" && !includeEdits) return null; + final client = ref.watch(ClientController.provider.notifier); final newEvents = await client.getRelatedEvents( GetRelatedEventsRequest( @@ -28,22 +31,25 @@ extension EventToMessage on Event { GetEventRequest(roomId: roomId, eventId: replyId), ); - final author = await client.getProfile(event.authorId); + final author = await ref.watch( + ProfileController.provider(event.authorId).future, + ); final content = (decrypted ?? this.content); final type = (decryptedType ?? this.type); final newContent = content["m.new_content"] as Map?; final metadata = { + "timelineId": event.timelineRowId, "formatted": newContent?["formatted_body"] ?? newContent?["body"] ?? content["formatted_body"] ?? content["body"] ?? "", - "reply": await replyEvent?.toMessage(client, mustBeText: true), + "reply": await replyEvent?.toMessage(ref, mustBeText: true), "body": newContent?["body"] ?? content["body"], "eventType": type, - "avatarUrl": author?.avatarUrl, - "displayName": author?.displayName ?? authorId, + "avatarUrl": author.avatarUrl, + "displayName": author.displayName ?? authorId, "txnId": transactionId, }; diff --git a/lib/helpers/extensions/list_to_messages.dart b/lib/helpers/extensions/list_to_messages.dart index 725f9c3..78648ba 100644 --- a/lib/helpers/extensions/list_to_messages.dart +++ b/lib/helpers/extensions/list_to_messages.dart @@ -1,12 +1,10 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:nexus/controllers/client_controller.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; import "package:nexus/models/event.dart"; -extension ListToMessages on IList { - Future> toMessages(ClientController client) async => - (await Future.wait( - map((event) => event.toMessage(client)), - )).nonNulls.toList(); +extension ListToMessages on Iterable { + Future> toMessages(Ref ref) async => (await Future.wait( + map((event) => event.toMessage(ref)), + )).nonNulls.toList(); } diff --git a/lib/models/paginate.dart b/lib/models/paginate.dart index 4faf4e9..df0a0f6 100644 --- a/lib/models/paginate.dart +++ b/lib/models/paginate.dart @@ -8,6 +8,7 @@ part "paginate.g.dart"; abstract class Paginate with _$Paginate { const factory Paginate({ required IList events, + required IList relatedEvents, required bool hasMore, }) = _Paginate; diff --git a/lib/models/requests/get_room_state_request.dart b/lib/models/requests/get_room_state_request.dart new file mode 100644 index 0000000..a154d5f --- /dev/null +++ b/lib/models/requests/get_room_state_request.dart @@ -0,0 +1,15 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +part "get_room_state_request.freezed.dart"; +part "get_room_state_request.g.dart"; + +@freezed +abstract class GetRoomStateRequest with _$GetRoomStateRequest { + const factory GetRoomStateRequest({ + required String roomId, + required bool fetchMembers, + @Default(false) bool includeMembers, + }) = _GetRoomStateRequest; + + factory GetRoomStateRequest.fromJson(Map json) => + _$GetRoomStateRequestFromJson(json); +} diff --git a/lib/models/requests/paginate_request.dart b/lib/models/requests/paginate_request.dart index 5941499..44cf8ec 100644 --- a/lib/models/requests/paginate_request.dart +++ b/lib/models/requests/paginate_request.dart @@ -6,6 +6,7 @@ part "paginate_request.g.dart"; abstract class PaginateRequest with _$PaginateRequest { const factory PaginateRequest({ required String roomId, + required int? maxTimelineId, @Default(20) int limit, }) = _PaginateRequest; diff --git a/lib/models/requests/send_message_request.dart b/lib/models/requests/send_message_request.dart index 6825d85..883c585 100644 --- a/lib/models/requests/send_message_request.dart +++ b/lib/models/requests/send_message_request.dart @@ -9,8 +9,8 @@ abstract class SendMessageRequest with _$SendMessageRequest { const factory SendMessageRequest({ required String roomId, required String text, - @Default(Mentions()) @JsonKey(name: "m.mentions") Mentions mentions, - @JsonKey(name: "m.relates_to") Relation? relation, + @Default(Mentions()) @JsonKey(name: "mentions") Mentions mentions, + @JsonKey(name: "relates_to") Relation? relation, }) = _SendMessageRequest; factory SendMessageRequest.fromJson(Map json) => @@ -28,17 +28,16 @@ abstract class Mentions with _$Mentions { _$MentionsFromJson(json); } -@freezed +@Freezed(toJson: false) abstract class Relation with _$Relation { - const Relation._(); // required for custom methods + const Relation._(); const factory Relation({ required String eventId, required RelationType relationType, }) = _Relation; - @override - Map toJson() { + Map toJson() { switch (relationType) { case RelationType.reply: return { @@ -50,6 +49,6 @@ abstract class Relation with _$Relation { } } - factory Relation.fromJson(Map json) => + factory Relation.fromJson(Map json) => _$RelationFromJson(json); } diff --git a/lib/models/room.dart b/lib/models/room.dart index 91ab952..b7ff81d 100644 --- a/lib/models/room.dart +++ b/lib/models/room.dart @@ -11,12 +11,13 @@ abstract class Room with _$Room { const factory Room({ @JsonKey(name: "meta") RoomMetadata? metadata, @Default(IList.empty()) IList timeline, - required bool reset, - required IMap state, + @Default(false) bool reset, + @Default(IMap.empty()) IMap> state, // required IMap accountData, - required IList events, + @Default(IList.empty()) IList events, @Default(IMap.empty()) IMap> receipts, - required bool dismissNotifications, + @Default(false) bool dismissNotifications, + @Default(true) bool hasMore, // required IList notifications, }) = _Room; diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart index 8130de8..2d8f54f 100644 --- a/lib/widgets/chat_page/member_list.dart +++ b/lib/widgets/chat_page/member_list.dart @@ -1,11 +1,8 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; import "package:nexus/controllers/members_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; -import "package:nexus/widgets/avatar_or_hash.dart"; +import "package:nexus/models/room.dart"; class MemberList extends ConsumerWidget { final Room room; @@ -36,26 +33,30 @@ class MemberList extends ConsumerWidget { .where( (membership) => membership.content["membership"] == - Membership.join.name, + "join", // TODO: Show invites seperately ) .map( (member) => ListTile( onTap: () {}, - leading: AvatarOrHash( - ref - .watch( - AvatarController.provider( - member.content["avatar_url"].toString(), - ), - ) - .whenOrNull(data: (data) => data), - member.content["displayname"].toString(), - headers: room.client.headers, - ), + // leading: AvatarOrHash( TODO + // ref + // .watch( + // AvatarController.provider( + // member.content["avatar_url"].toString(), + // ), + // ) + // .whenOrNull(data: (data) => data), + // member.content["displayname"].toString(), + // headers: room.client.headers, + // ), title: Text( member.content["displayname"].toString(), overflow: TextOverflow.ellipsis, ), + subtitle: Text( + member.authorId, + overflow: TextOverflow.ellipsis, + ), ), ), ], diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index 4214e89..d8d99c4 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -21,12 +21,12 @@ import "package:nexus/models/relation_type.dart"; import "package:nexus/models/requests/report_request.dart"; import "package:nexus/widgets/chat_page/chat_box.dart"; import "package:nexus/widgets/chat_page/html/html.dart"; +import "package:nexus/widgets/chat_page/member_list.dart"; import "package:nexus/widgets/chat_page/room_appbar.dart"; import "package:nexus/widgets/chat_page/top_widget.dart"; import "package:nexus/widgets/form_text_input.dart"; import "package:nexus/widgets/loading.dart"; // import "package:dynamic_polls/dynamic_polls.dart"; -// import "package:matrix/matrix.dart"; class RoomChat extends HookConsumerWidget { final bool isDesktop; @@ -534,12 +534,12 @@ class RoomChat extends HookConsumerWidget { ), ), - // if (memberListOpened.value == true && showMembersByDefault) TODO: Member list - // MemberList(room), + if (memberListOpened.value == true && showMembersByDefault) + MemberList(room), ], ), - // endDrawer: showMembersByDefault ? null : MemberList(room), + endDrawer: showMembersByDefault ? null : MemberList(room), ); } } diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index a8157cf..a883228 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -186,7 +186,7 @@ class Sidebar extends HookConsumerWidget { ? null : Icon(selectedSpace.icon), - selectedSpace.title, // TODO RM + selectedSpace.title, headers: {}, // space.client.headers, TODO ), From 520fa0ccdb46bd0a8d399c631540f24cbfad07f5 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 09:15:55 +0100 Subject: [PATCH 26/34] working history loading --- lib/controllers/room_chat_controller.dart | 33 +++++++++++------------ lib/main.dart | 1 + lib/widgets/chat_page/sidebar.dart | 9 +++---- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 1428df1..8977953 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -10,7 +10,6 @@ import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/helpers/extensions/event_to_message.dart"; import "package:nexus/helpers/extensions/list_to_messages.dart"; -import "package:nexus/models/event.dart"; import "package:nexus/models/requests/get_room_state_request.dart"; import "package:nexus/models/requests/paginate_request.dart"; import "package:nexus/models/requests/redact_event_request.dart"; @@ -153,20 +152,17 @@ class RoomChatController extends AsyncNotifier { const ISet.empty(), ); - final existingIds = controller.messages.map((m) => m.id).toSet(); - - final messages = await response.events - .where((event) => !existingIds.contains(event.eventId)) - .fold({}, (acc, event) { - acc[event.eventId] = - event; // overwrites duplicates in response.events - return acc; - }) - .values - .toIList() - .reversed - .toMessages(ref); - await controller.insertAllMessages(messages, index: 0); + final messages = await response.events.reversed.toMessages(ref); + await controller.insertAllMessages( + messages + .where( + (newMessage) => !controller.messages.any( + (message) => message.id == newMessage.id, + ), + ) + .toList(), + index: 0, + ); } Future updateMessage(Message message, Message newMessage) async => @@ -181,12 +177,14 @@ class RoomChatController extends AsyncNotifier { var taggedMessage = message; for (final tag in tags) { - final escaped = RegExp.escape(tag.id); // TODO: Fix + final escaped = RegExp.escape(tag.id); final pattern = RegExp(r"@+(" + escaped + r")(#[^#]*#)?"); taggedMessage = taggedMessage.replaceAllMapped( pattern, - (match) => match.group(1)!, + (match) => match.group( + 1, + )!, // TODO: Return an HTML or Markdown link from here, not plaintext ); } @@ -194,6 +192,7 @@ class RoomChatController extends AsyncNotifier { client.sendMessage( SendMessageRequest( roomId: roomId, + mentions: Mentions(), // TODO: Add parsed mentions text: taggedMessage, relation: relation == null ? null diff --git a/lib/main.dart b/lib/main.dart index 8100343..e51d8af 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -37,6 +37,7 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue} void showError(Object error, [StackTrace? stackTrace]) { if (error.toString().contains("DioException")) return; + if (error.toString().contains("Invalid source")) return; if (error.toString().contains("UTF-16")) return; if (error.toString().contains("HTTP request failed")) return; if (error.toString().contains("Invalid image data")) return; diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index a883228..cd394e3 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -1,4 +1,3 @@ -import "package:collection/collection.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -66,11 +65,9 @@ class Sidebar extends HookConsumerWidget { fallback: space.icon == null ? null : Icon(space.icon), space.title, headers: {}, // TODO - hasBadge: - space.children.firstWhereOrNull( - (room) => room.metadata?.unreadMessages != 0, - ) != - null, + hasBadge: space.children.any( + (room) => room.metadata?.unreadMessages != 0, + ), badgeNumber: space.children.fold( 0, (previousValue, room) => From 36c6d6958ad4d17fbc9fdba18444bb8ed7301346 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 09:21:41 +0100 Subject: [PATCH 27/34] wip mention overlay --- lib/widgets/chat_page/chat_box.dart | 20 +- lib/widgets/chat_page/mention_overlay.dart | 207 ++++++++++----------- 2 files changed, 112 insertions(+), 115 deletions(-) diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/chat_box.dart index 876f065..885ddd9 100644 --- a/lib/widgets/chat_page/chat_box.dart +++ b/lib/widgets/chat_page/chat_box.dart @@ -8,6 +8,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/room_chat_controller.dart"; import "package:nexus/models/relation_type.dart"; import "package:nexus/models/room.dart"; +import "package:nexus/widgets/chat_page/mention_overlay.dart"; import "package:nexus/widgets/chat_page/relation_preview.dart"; class ChatBox extends HookConsumerWidget { @@ -108,16 +109,15 @@ class ChatBox extends HookConsumerWidget { Expanded( child: FlutterTagger( triggerStrategy: TriggerStrategy.eager, - overlay: SizedBox.shrink(), - // MentionOverlay( TODO: Fix - // room, - // query: query.value, - // triggerCharacter: triggerCharacter.value, - // addTag: ({required id, required name}) { - // controller.value.addTag(id: id, name: name); - // node.requestFocus(); - // }, - // ), + overlay: MentionOverlay( + room, + query: query.value, + triggerCharacter: triggerCharacter.value, + addTag: ({required id, required name}) { + controller.value.addTag(id: id, name: name); + node.requestFocus(); + }, + ), controller: controller.value, onSearch: (newQuery, newTriggerCharacter) { triggerCharacter.value = newTriggerCharacter; diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart index f6c7fe3..116bc54 100644 --- a/lib/widgets/chat_page/mention_overlay.dart +++ b/lib/widgets/chat_page/mention_overlay.dart @@ -1,12 +1,9 @@ import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/avatar_controller.dart"; import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; -import "package:nexus/helpers/extensions/get_headers.dart"; -import "package:nexus/widgets/avatar_or_hash.dart"; +import "package:nexus/models/room.dart"; import "package:nexus/widgets/loading.dart"; class MentionOverlay extends ConsumerWidget { @@ -23,108 +20,108 @@ class MentionOverlay extends ConsumerWidget { }); @override - Widget build(BuildContext context, WidgetRef ref) => Padding( - padding: EdgeInsets.all(8), - child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(12)), - child: Container( - color: Theme.of(context).colorScheme.surfaceContainerHigh, - padding: EdgeInsets.all(8), - child: switch (triggerCharacter) { - "@" => - ref - .watch(MembersController.provider(room)) - .betterWhen( - data: (members) => ListView( - children: - (query.isEmpty - ? members - : members.where( - (member) => - member.senderId.toLowerCase().contains( - query.toLowerCase(), - ) || - (member.content["displayname"] - as String?) - ?.toLowerCase() - .contains( - query.toLowerCase(), - ) == - true, - )) - .map( - (member) => ListTile( - leading: AvatarOrHash( - ref - .watch( - AvatarController.provider( - member.content["avatar_url"] - .toString(), - ), - ) - .whenOrNull(data: (data) => data), - member.content["displayname"].toString(), - headers: room.client.headers, + Widget build(BuildContext context, WidgetRef ref) { + final rooms = ref.watch(RoomsController.provider); + + return Padding( + padding: EdgeInsets.all(8), + child: ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(12)), + child: Container( + color: Theme.of(context).colorScheme.surfaceContainerHigh, + padding: EdgeInsets.all(8), + child: switch (triggerCharacter) { + "@" => + ref + .watch(MembersController.provider(room)) + .betterWhen( + data: (members) => ListView( + children: + (query.isEmpty + ? members + : members.where( + (member) => + member.authorId + .toLowerCase() + .contains(query.toLowerCase()) || + (member.content["displayname"] + as String?) + ?.toLowerCase() + .contains( + query.toLowerCase(), + ) == + true, + )) + .map( + (member) => ListTile( + // leading: AvatarOrHash( TODO: Images + // ref + // .watch( + // AvatarController.provider( + // member.content["avatar_url"] + // .toString(), + // ), + // ) + // .whenOrNull(data: (data) => data), + // member.content["displayname"].toString(), + // headers: room.client.headers, + // ), + title: Text( + member.content["displayname"] as String? ?? + member.authorId, + ), + onTap: () => addTag( + id: member.authorId, + name: member.authorId + .substring(1) + .split(":") + .first, + ), ), - title: Text( - member.content["displayname"] as String? ?? - member.senderId, - ), - onTap: () => addTag( - id: member.senderId, - name: member.senderId - .substring(1) - .split(":") - .first, - ), - ), - ) - .toList(), + ) + .toList(), + ), ), - ), - "#" => - ref - .watch(RoomsController.provider) - .betterWhen( - data: (rooms) => ListView( - children: - (query.isEmpty - ? rooms - : rooms.where( - (room) => room.title.toLowerCase().contains( - query.toLowerCase(), - ), - )) - .map( - (room) => ListTile( - leading: AvatarOrHash( - room.avatar, - room.title, - fallback: Icon(Icons.numbers), - headers: room.roomData.client.headers, - ), - title: Text(room.title), - subtitle: room.roomData.topic.isEmpty - ? null - : Text(room.roomData.topic, maxLines: 1), - onTap: () => addTag( - id: "[#${room.roomData.getLocalizedDisplayname()}](https://matrix.to/#/${room.roomData.id})", - name: - (room.roomData.canonicalAlias.isEmpty - ? room.roomData.id - : room.roomData.canonicalAlias) - .substring(1) - .split(":") - .first, - ), - ), - ) - .toList(), - ), - ), - _ => Loading(), - }, + "#" => ListView( + children: + (query.isEmpty + ? rooms.values + : rooms.values.where( + (room) => (room.metadata?.name ?? "Unnamed Room") + .toLowerCase() + .contains(query.toLowerCase()), + )) + .map( + (room) => ListTile( + // leading: AvatarOrHash( TODO: Images + // room.avatar, + // room.title, + // fallback: Icon(Icons.numbers), + // headers: room.roomData.client.headers, + // ), + title: Text(room.metadata?.name ?? "Unnamed Room"), + subtitle: room.metadata?.topic == null + ? null + : Text(room.metadata!.topic!, maxLines: 1), + onTap: () => addTag( + id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.id})", + name: + (room.metadata?.canonicalAlias ?? + room.metadata?.id) + ?.substring(1) + .split(":") + .first ?? + "", + ), + ), + ) + .toList(), + ), + + _ => Loading(), + }, + ), ), - ), - ); + ); + } } From ec5827dc30366fd1c66ca15e0c750e4158f046c6 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 10:01:40 +0100 Subject: [PATCH 28/34] show member count --- lib/widgets/chat_page/member_list.dart | 89 +++++++++++++------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart index 2d8f54f..2e358b2 100644 --- a/lib/widgets/chat_page/member_list.dart +++ b/lib/widgets/chat_page/member_list.dart @@ -14,53 +14,54 @@ class MemberList extends ConsumerWidget { child: ref .watch(MembersController.provider(room)) .betterWhen( - data: (members) => ListView( - children: [ - AppBar( - scrolledUnderElevation: 0, - leading: Icon(Icons.people), - title: Text("Members"), - actionsPadding: EdgeInsets.only(right: 4), - actions: [ - if (Scaffold.of(context).hasEndDrawer) - IconButton( - onPressed: Scaffold.of(context).closeEndDrawer, - icon: Icon(Icons.close), + data: (members) { + final joined = members.where( + (membership) => + membership.content["membership"] == + "join", // TODO: Show invites seperately + ); + return ListView( + children: [ + AppBar( + scrolledUnderElevation: 0, + leading: Icon(Icons.people), + title: Text("Members (${joined.length})"), + actionsPadding: EdgeInsets.only(right: 4), + actions: [ + if (Scaffold.of(context).hasEndDrawer) + IconButton( + onPressed: Scaffold.of(context).closeEndDrawer, + icon: Icon(Icons.close), + ), + ], + ), + ...joined.map( + (member) => ListTile( + onTap: () {}, + // leading: AvatarOrHash( TODO + // ref + // .watch( + // AvatarController.provider( + // member.content["avatar_url"].toString(), + // ), + // ) + // .whenOrNull(data: (data) => data), + // member.content["displayname"].toString(), + // headers: room.client.headers, + // ), + title: Text( + member.content["displayname"].toString(), + overflow: TextOverflow.ellipsis, ), - ], - ), - ...members - .where( - (membership) => - membership.content["membership"] == - "join", // TODO: Show invites seperately - ) - .map( - (member) => ListTile( - onTap: () {}, - // leading: AvatarOrHash( TODO - // ref - // .watch( - // AvatarController.provider( - // member.content["avatar_url"].toString(), - // ), - // ) - // .whenOrNull(data: (data) => data), - // member.content["displayname"].toString(), - // headers: room.client.headers, - // ), - title: Text( - member.content["displayname"].toString(), - overflow: TextOverflow.ellipsis, - ), - subtitle: Text( - member.authorId, - overflow: TextOverflow.ellipsis, - ), + subtitle: Text( + member.authorId, + overflow: TextOverflow.ellipsis, ), ), - ], - ), + ), + ], + ); + }, ), ); } From b79d96ee3171402ab33467e7fb95b4ad2afd7a1a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 10:02:46 +0100 Subject: [PATCH 29/34] add a todo --- lib/widgets/chat_page/member_list.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart index 2e358b2..a1f842d 100644 --- a/lib/widgets/chat_page/member_list.dart +++ b/lib/widgets/chat_page/member_list.dart @@ -37,7 +37,11 @@ class MemberList extends ConsumerWidget { ), ...joined.map( (member) => ListTile( - onTap: () {}, + onTap: () => showDialog( + context: context, + builder: (context) => + Dialog(child: Text("TODO: Open member popover")), + ), // leading: AvatarOrHash( TODO // ref // .watch( From 8946353228a7e4a3c43d5691d3874ac621152b76 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 11:25:02 +0100 Subject: [PATCH 30/34] Working mentions --- lib/controllers/room_chat_controller.dart | 15 ++++++++++----- lib/widgets/chat_page/mention_overlay.dart | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 8977953..cd0ffda 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -86,7 +86,8 @@ class RoomChatController extends AsyncNotifier { await client.getRoomState( GetRoomStateRequest( roomId: roomId, - fetchMembers: room.metadata?.hasMemberList == false, + fetchMembers: true, + includeMembers: false, ), ); @@ -182,9 +183,7 @@ class RoomChatController extends AsyncNotifier { taggedMessage = taggedMessage.replaceAllMapped( pattern, - (match) => match.group( - 1, - )!, // TODO: Return an HTML or Markdown link from here, not plaintext + (match) => match.group(1)!, ); } @@ -192,7 +191,13 @@ class RoomChatController extends AsyncNotifier { client.sendMessage( SendMessageRequest( roomId: roomId, - mentions: Mentions(), // TODO: Add parsed mentions + mentions: Mentions( + userIds: [ + if (relation != null && relationType == RelationType.reply) + relation.authorId, + ].toIList(), + room: taggedMessage.contains("@room"), + ), text: taggedMessage, relation: relation == null ? null diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart index 116bc54..7ea9109 100644 --- a/lib/widgets/chat_page/mention_overlay.dart +++ b/lib/widgets/chat_page/mention_overlay.dart @@ -71,7 +71,7 @@ class MentionOverlay extends ConsumerWidget { member.authorId, ), onTap: () => addTag( - id: member.authorId, + id: "[@${member.content["displayname"]}](https://matrix.to/#/${member.authorId})", name: member.authorId .substring(1) .split(":") From 79fe4ea440b8459232150f01f01cd8ea9a9c15fd Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 12:36:22 +0100 Subject: [PATCH 31/34] working member list --- lib/controllers/room_chat_controller.dart | 29 ++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index cd0ffda..fc32be3 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -83,14 +83,37 @@ class RoomChatController extends AsyncNotifier { if (messages.length < 20) await loadOlder(controller); - await client.getRoomState( + final state = await client.getRoomState( GetRoomStateRequest( roomId: roomId, - fetchMembers: true, - includeMembers: false, + fetchMembers: room.metadata?.hasMemberList == false, + includeMembers: true, ), ); + ref + .watch(RoomsController.provider.notifier) + .update( + { + roomId: Room( + events: state, + state: state.fold( + const IMap.empty(), + (previousValue, stateEvent) => previousValue.add( + stateEvent.type, + (previousValue[stateEvent.type] ?? const IMap.empty()).addAll( + IMap({ + if (stateEvent.stateKey != null) + stateEvent.stateKey!: stateEvent.rowId, + }), + ), + ), + ), + ), + }.toIMap(), + const ISet.empty(), + ); + return controller; } From 0e6b9a813376dc982bed24fbc1edff35e6f39194 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 14:26:59 +0100 Subject: [PATCH 32/34] fix bug in timeline --- lib/controllers/room_chat_controller.dart | 28 +++++++++++++---------- lib/controllers/rooms_controller.dart | 21 +++++++++++++---- lib/models/room.dart | 2 +- lib/widgets/chat_page/room_chat.dart | 4 +++- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index fc32be3..791a63c 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -27,6 +27,16 @@ class RoomChatController extends AsyncNotifier { final room = ref.read(SelectedRoomController.provider); if (room == null) return InMemoryChatController(); + final messages = await room.timeline + .map( + (timelineRowTuple) => room.events.firstWhereOrNull( + (event) => event.rowId == timelineRowTuple.eventRowId, + ), + ) + .nonNulls + .toMessages(ref); + final controller = InMemoryChatController(messages: messages); + ref.onDispose( ref.listen(NewEventsController.provider(roomId), (_, next) async { for (final event in next) { @@ -62,23 +72,17 @@ class RoomChatController extends AsyncNotifier { ), ); } - if (message != null) { - return await insertMessage(message); + if (message != null && + !controller.messages.any( + (oldMessage) => oldMessage.id == message.id, + )) { + await insertMessage(message); } } } - }).close, + }, weak: true).close, ); - final messages = await room.timeline - .map( - (timelineRowTuple) => room.events.firstWhereOrNull( - (event) => event.rowId == timelineRowTuple.eventRowId, - ), - ) - .nonNulls - .toMessages(ref); - final controller = InMemoryChatController(messages: messages); ref.onDispose(controller.dispose); if (messages.length < 20) await loadOlder(controller); diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart index bc109c9..0945644 100644 --- a/lib/controllers/rooms_controller.dart +++ b/lib/controllers/rooms_controller.dart @@ -15,18 +15,29 @@ class RoomsController extends Notifier> { final incoming = entry.value; final existing = acc[roomId]; + final events = existing?.events.updateById( + incoming.events, + (item) => item.eventId, + ); + ref .watch(NewEventsController.provider(roomId).notifier) - .add(incoming.events); + .add( + incoming.timeline + .map( + (timelineTuple) => events?.firstWhereOrNull( + (event) => timelineTuple.eventRowId == event.rowId, + ), + ) + .nonNulls + .toIList(), + ); return acc.add( roomId, existing?.copyWith( metadata: incoming.metadata ?? existing.metadata, - events: existing.events.updateById( - incoming.events, - (item) => item.eventId, - ), + events: events!, state: incoming.state.entries.fold( existing.state, (previousValue, event) => previousValue.add( diff --git a/lib/models/room.dart b/lib/models/room.dart index b7ff81d..3c3eec0 100644 --- a/lib/models/room.dart +++ b/lib/models/room.dart @@ -28,7 +28,7 @@ abstract class Room with _$Room { abstract class TimelineRowTuple with _$TimelineRowTuple { const factory TimelineRowTuple({ @JsonKey(name: "timeline_rowid") required int timelineRowId, - @JsonKey(name: "timeline_eventid") int? eventRowId, + @JsonKey(name: "event_rowid") int? eventRowId, }) = _TimelineRowTuple; factory TimelineRowTuple.fromJson(Map json) => diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index d8d99c4..f7e6bc4 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -267,7 +267,9 @@ class RoomChat extends HookConsumerWidget { chatAnimatedListBuilder: (_, itemBuilder) => ChatAnimatedList( itemBuilder: itemBuilder, - onEndReached: notifier.loadOlder, + onEndReached: room.hasMore + ? notifier.loadOlder + : null, onStartReached: () => client.markRead(room), bottomPadding: 72, ), From 099725063f1295904d55b41fa5b3ef67241b82dd Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 16:50:25 +0100 Subject: [PATCH 33/34] Working images --- lib/controllers/avatar_controller.dart | 17 --- lib/controllers/members_controller.dart | 1 + .../message_controller.dart} | 114 +++++++++++------- lib/controllers/messages_controller.dart | 25 ++++ lib/controllers/room_chat_controller.dart | 41 ++++--- lib/controllers/thumbnail_controller.dart | 22 ---- lib/helpers/extensions/list_to_messages.dart | 10 -- lib/helpers/extensions/mxc_to_https.dart | 4 + lib/models/client_state.dart | 1 + lib/models/message_config.dart | 16 +++ lib/widgets/avatar_or_hash.dart | 32 +++-- lib/widgets/chat_page/html/html.dart | 80 +++++------- lib/widgets/chat_page/html/mention_chip.dart | 2 +- lib/widgets/chat_page/member_list.dart | 85 ++++++------- lib/widgets/chat_page/mention_overlay.dart | 30 ++--- lib/widgets/chat_page/room_appbar.dart | 14 +-- lib/widgets/chat_page/room_chat.dart | 4 +- lib/widgets/chat_page/sidebar.dart | 12 +- lib/widgets/chat_page/top_widget.dart | 17 +-- 19 files changed, 270 insertions(+), 257 deletions(-) delete mode 100644 lib/controllers/avatar_controller.dart rename lib/{helpers/extensions/event_to_message.dart => controllers/message_controller.dart} (58%) create mode 100644 lib/controllers/messages_controller.dart delete mode 100644 lib/controllers/thumbnail_controller.dart delete mode 100644 lib/helpers/extensions/list_to_messages.dart create mode 100644 lib/helpers/extensions/mxc_to_https.dart create mode 100644 lib/models/message_config.dart diff --git a/lib/controllers/avatar_controller.dart b/lib/controllers/avatar_controller.dart deleted file mode 100644 index 1bb4c72..0000000 --- a/lib/controllers/avatar_controller.dart +++ /dev/null @@ -1,17 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/client_controller.dart"; - -class AvatarController extends AsyncNotifier { - final String mxc; - AvatarController(this.mxc); - @override - Future build() async => Uri.parse(mxc).getThumbnailUri( - await ref.watch(ClientController.provider.future), - width: 24, - height: 24, - ); - - static final provider = AsyncNotifierProvider.family - .autoDispose(AvatarController.new); -} diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members_controller.dart index 5f88f2b..2a250a2 100644 --- a/lib/controllers/members_controller.dart +++ b/lib/controllers/members_controller.dart @@ -17,6 +17,7 @@ class MembersController extends AsyncNotifier> { ), ) .nonNulls + .where((member) => member.content["membership"] == "join") .toIList(); static final provider = AsyncNotifierProvider.family diff --git a/lib/helpers/extensions/event_to_message.dart b/lib/controllers/message_controller.dart similarity index 58% rename from lib/helpers/extensions/event_to_message.dart rename to lib/controllers/message_controller.dart index 231774b..b695ec1 100644 --- a/lib/helpers/extensions/event_to_message.dart +++ b/lib/controllers/message_controller.dart @@ -1,41 +1,51 @@ import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/profile_controller.dart"; -import "package:nexus/models/event.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; +import "package:nexus/models/message_config.dart"; import "package:nexus/models/requests/get_event_request.dart"; import "package:nexus/models/requests/get_related_events_request.dart"; -extension EventToMessage on Event { - Future toMessage( - Ref ref, { - bool mustBeText = false, - bool includeEdits = false, - }) async { - if (relationType == "m.replace" && !includeEdits) return null; +class MessageController extends AsyncNotifier { + final MessageConfig config; + MessageController(this.config); + + @override + Future build() async { + if (config.event.relationType == "m.replace" && !config.includeEdits) { + return null; + } final client = ref.watch(ClientController.provider.notifier); final newEvents = await client.getRelatedEvents( GetRelatedEventsRequest( - roomId: roomId, - eventId: eventId, + roomId: config.event.roomId, + eventId: config.event.eventId, relationType: "m.replace", ), ); - final event = newEvents?.lastOrNull ?? this; + if (!ref.mounted) return null; + final event = newEvents?.lastOrNull ?? config.event; - final replyId = this.content["m.relates_to"]?["m.in_reply_to"]?["event_id"]; + final replyId = + config.event.content["m.relates_to"]?["m.in_reply_to"]?["event_id"]; final replyEvent = replyId == null ? null : await client.getEvent( - GetEventRequest(roomId: roomId, eventId: replyId), + GetEventRequest(roomId: config.event.roomId, eventId: replyId), ); - final author = await ref.watch( + if (!ref.mounted) return null; + + final author = await ref.read( ProfileController.provider(event.authorId).future, ); - final content = (decrypted ?? this.content); - final type = (decryptedType ?? this.type); + if (!ref.mounted) return null; + + final content = (event.decrypted ?? event.content); + final type = (config.event.decryptedType ?? config.event.type); final newContent = content["m.new_content"] as Map?; final metadata = { "timelineId": event.timelineRowId, @@ -45,18 +55,25 @@ extension EventToMessage on Event { content["formatted_body"] ?? content["body"] ?? "", - "reply": await replyEvent?.toMessage(ref, mustBeText: true), + if (replyEvent != null) + "reply": await ref.read( + MessageController.provider( + MessageConfig(event: replyEvent, mustBeText: true), + ).future, + ), "body": newContent?["body"] ?? content["body"], "eventType": type, "avatarUrl": author.avatarUrl, - "displayName": author.displayName ?? authorId, - "txnId": transactionId, + "displayName": author.displayName ?? event.authorId, + "txnId": config.event.transactionId, }; + if (!ref.mounted) return null; + final editedAt = event.relationType == "m.replace" ? event.timestamp : null; - if ((event.redactedBy != null && !mustBeText) || - (!includeEdits && (relationType == "m.replace"))) { + if ((event.redactedBy != null && !config.mustBeText) || + (!config.includeEdits && (config.event.relationType == "m.replace"))) { return null; } @@ -69,18 +86,24 @@ extension EventToMessage on Event { final asText = Message.text( metadata: metadata, - id: eventId, - authorId: authorId, - text: redactedBy == null + id: config.event.eventId, + authorId: event.authorId, + text: config.event.redactedBy == null ? content["body"] ?? "" : "This message has been deleted...", replyToMessageId: replyId, - deliveredAt: timestamp, + deliveredAt: config.event.timestamp, editedAt: editedAt, ) as TextMessage; - if (mustBeText) return asText; + if (config.mustBeText) return asText; + + final homeserver = ref.read(ClientStateController.provider)?.homeserverUrl; + final source = homeserver == null || content["url"] == null + ? "null" + : Uri.parse(content["url"]).mxcToHttps(homeserver).toString(); + return switch (type) { "m.room.encrypted" => asText.copyWith( text: "Unable to decrypt message.", @@ -98,42 +121,42 @@ extension EventToMessage on Event { // ), ("m.sticker" || "m.room.message") => switch (content["msgtype"]) { ("m.sticker" || "m.image") => Message.image( - id: eventId, + id: config.event.eventId, metadata: metadata, - authorId: authorId, + authorId: event.authorId, text: event.localContent?.sanitizedHtml, - source: "(await getAttachmentUri()).toString()", // TODO + source: source, replyToMessageId: replyId, - deliveredAt: timestamp, + deliveredAt: config.event.timestamp, blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"], ), "m.audio" => Message.audio( - id: eventId, + id: config.event.eventId, metadata: metadata, - authorId: authorId, + authorId: event.authorId, text: content["body"], replyToMessageId: replyId, - source: "(await event.getAttachmentUri()).toString()", // TODO - deliveredAt: timestamp, + source: source, + deliveredAt: config.event.timestamp, // TODO: See if we can figure out duration duration: Duration(hours: 1), ), "m.file" => Message.file( name: content["filename"].toString(), metadata: metadata, - id: eventId, - authorId: authorId, - source: "(await event.getAttachmentUri()).toString()", // TODO + id: config.event.eventId, + authorId: event.authorId, + source: source, replyToMessageId: replyId, - deliveredAt: timestamp, + deliveredAt: config.event.timestamp, ), _ => asText, }, "m.room.member" => Message.system( metadata: metadata, - id: eventId, - authorId: authorId, - deliveredAt: timestamp, + id: config.event.eventId, + authorId: event.authorId, + deliveredAt: config.event.timestamp, text: "${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) { "invite" => "was invited to", @@ -151,11 +174,16 @@ extension EventToMessage on Event { // ignore: dead_code ? Message.unsupported( metadata: metadata, - id: eventId, - authorId: authorId, + id: config.event.eventId, + authorId: event.authorId, replyToMessageId: replyId, ) : null, }; } + + static final provider = AsyncNotifierProvider.family + .autoDispose( + MessageController.new, + ); } diff --git a/lib/controllers/messages_controller.dart b/lib/controllers/messages_controller.dart new file mode 100644 index 0000000..3edc8ab --- /dev/null +++ b/lib/controllers/messages_controller.dart @@ -0,0 +1,25 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_chat_core/flutter_chat_core.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/message_controller.dart"; +import "package:nexus/models/event.dart"; +import "package:nexus/models/message_config.dart"; + +class MessagesController extends AsyncNotifier> { + final IList events; + MessagesController(this.events); + + @override + Future> build() async => (await Future.wait( + events.map( + (event) => ref.watch( + MessageController.provider(MessageConfig(event: event)).future, + ), + ), + )).nonNulls.toIList(); + + static final provider = AsyncNotifierProvider.family + .autoDispose, IList>( + MessagesController.new, + ); +} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 791a63c..3fa5c7f 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -3,13 +3,14 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart" as chat; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:fluttertagger/fluttertagger.dart" as tagger; +import "package:fluttertagger/fluttertagger.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/controllers/message_controller.dart"; +import "package:nexus/controllers/messages_controller.dart"; import "package:nexus/controllers/new_events_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart"; -import "package:nexus/helpers/extensions/event_to_message.dart"; -import "package:nexus/helpers/extensions/list_to_messages.dart"; +import "package:nexus/models/message_config.dart"; import "package:nexus/models/requests/get_room_state_request.dart"; import "package:nexus/models/requests/paginate_request.dart"; import "package:nexus/models/requests/redact_event_request.dart"; @@ -27,15 +28,19 @@ class RoomChatController extends AsyncNotifier { final room = ref.read(SelectedRoomController.provider); if (room == null) return InMemoryChatController(); - final messages = await room.timeline - .map( - (timelineRowTuple) => room.events.firstWhereOrNull( - (event) => event.rowId == timelineRowTuple.eventRowId, - ), - ) - .nonNulls - .toMessages(ref); - final controller = InMemoryChatController(messages: messages); + final messages = await ref.watch( + MessagesController.provider( + room.timeline + .map( + (timelineRowTuple) => room.events.firstWhereOrNull( + (event) => event.rowId == timelineRowTuple.eventRowId, + ), + ) + .nonNulls + .toIList(), + ).future, + ); + final controller = InMemoryChatController(messages: messages.toList()); ref.onDispose( ref.listen(NewEventsController.provider(roomId), (_, next) async { @@ -49,7 +54,11 @@ class RoomChatController extends AsyncNotifier { await controller.removeMessage(message); } else { - final message = await event.toMessage(ref, includeEdits: true); + final message = await ref.read( + MessageController.provider( + MessageConfig(event: event, includeEdits: true), + ).future, + ); if (event.relationType == "m.replace") { final controller = await future; final oldMessage = controller.messages.firstWhereOrNull( @@ -180,7 +189,9 @@ class RoomChatController extends AsyncNotifier { const ISet.empty(), ); - final messages = await response.events.reversed.toMessages(ref); + final messages = await ref.watch( + MessagesController.provider(response.events.reversed).future, + ); await controller.insertAllMessages( messages .where( @@ -198,7 +209,7 @@ class RoomChatController extends AsyncNotifier { Future send( String message, { - required Iterable tags, + required Iterable tags, required RelationType relationType, Message? relation, }) async { diff --git a/lib/controllers/thumbnail_controller.dart b/lib/controllers/thumbnail_controller.dart deleted file mode 100644 index 4500523..0000000 --- a/lib/controllers/thumbnail_controller.dart +++ /dev/null @@ -1,22 +0,0 @@ -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:matrix/matrix.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/models/image_data.dart"; - -class ThumbnailController extends AsyncNotifier { - ThumbnailController(this.data); - final ImageData data; - - @override - Future build({String? from}) async { - final client = await ref.watch(ClientController.provider.future); - final uri = await Uri.tryParse(data.uri)?.getDownloadUri(client); - - return uri.toString(); - } - - static final provider = AsyncNotifierProvider.family - .autoDispose( - ThumbnailController.new, - ); -} diff --git a/lib/helpers/extensions/list_to_messages.dart b/lib/helpers/extensions/list_to_messages.dart deleted file mode 100644 index 78648ba..0000000 --- a/lib/helpers/extensions/list_to_messages.dart +++ /dev/null @@ -1,10 +0,0 @@ -import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/helpers/extensions/event_to_message.dart"; -import "package:nexus/models/event.dart"; - -extension ListToMessages on Iterable { - Future> toMessages(Ref ref) async => (await Future.wait( - map((event) => event.toMessage(ref)), - )).nonNulls.toList(); -} diff --git a/lib/helpers/extensions/mxc_to_https.dart b/lib/helpers/extensions/mxc_to_https.dart new file mode 100644 index 0000000..468da12 --- /dev/null +++ b/lib/helpers/extensions/mxc_to_https.dart @@ -0,0 +1,4 @@ +extension MxcToHttps on Uri { + Uri mxcToHttps(String homeserver) => + Uri.parse("${homeserver}_matrix/client/v1/media/download/$host$path"); +} diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart index 4063cc5..1e15136 100644 --- a/lib/models/client_state.dart +++ b/lib/models/client_state.dart @@ -9,6 +9,7 @@ abstract class ClientState with _$ClientState { required bool isLoggedIn, required bool isVerified, required String? userId, + required String? homeserverUrl, }) = _ClientState; factory ClientState.fromJson(Map json) => diff --git a/lib/models/message_config.dart b/lib/models/message_config.dart new file mode 100644 index 0000000..4e5ff71 --- /dev/null +++ b/lib/models/message_config.dart @@ -0,0 +1,16 @@ +import "package:freezed_annotation/freezed_annotation.dart"; +import "package:nexus/models/event.dart"; +part "message_config.freezed.dart"; +part "message_config.g.dart"; + +@freezed +abstract class MessageConfig with _$MessageConfig { + const factory MessageConfig({ + @Default(false) bool mustBeText, + @Default(false) bool includeEdits, + required Event event, + }) = _MessageConfig; + + factory MessageConfig.fromJson(Map json) => + _$MessageConfigFromJson(json); +} diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index 809d5d2..a47bbb5 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -1,14 +1,19 @@ import "package:color_hash/color_hash.dart"; +import "package:cross_cache/cross_cache.dart"; import "package:flutter/material.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/controllers/cross_cache_controller.dart"; +import "package:nexus/helpers/extensions/get_headers.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; -class AvatarOrHash extends StatelessWidget { +class AvatarOrHash extends ConsumerWidget { final Uri? avatar; final String title; final Widget? fallback; final bool hasBadge; final int badgeNumber; final double height; - final Map headers; const AvatarOrHash( this.avatar, this.title, { @@ -16,15 +21,14 @@ class AvatarOrHash extends StatelessWidget { this.badgeNumber = 0, this.hasBadge = false, this.height = 24, - required this.headers, super.key, }); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { final box = ColoredBox( color: ColorHash(title).color, - child: Center(child: Text(title[0])), + child: Center(child: Text(title.isEmpty ? "" : title[0])), ); return SizedBox( width: height, @@ -42,9 +46,21 @@ class AvatarOrHash extends StatelessWidget { height: height, child: avatar == null ? fallback ?? box - : Image.network( - avatar.toString(), - headers: headers, + : Image( + image: CachedNetworkImage( + avatar! + .mxcToHttps( + ref.watch( + ClientStateController.provider.select( + (value) => value?.homeserverUrl, + ), + ) ?? + "", + ) + .toString(), + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), fit: BoxFit.contain, errorBuilder: (_, _, _) => box, ), diff --git a/lib/widgets/chat_page/html/html.dart b/lib/widgets/chat_page/html/html.dart index 769da8f..18edf4a 100644 --- a/lib/widgets/chat_page/html/html.dart +++ b/lib/widgets/chat_page/html/html.dart @@ -2,7 +2,10 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart"; +import "package:nexus/controllers/client_state_controller.dart"; +import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/helpers/extensions/link_to_mention.dart"; +import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/helpers/launch_helper.dart"; import "package:nexus/widgets/chat_page/html/mention_chip.dart"; import "package:nexus/widgets/chat_page/html/spoiler_text.dart"; @@ -40,53 +43,36 @@ class Html extends ConsumerWidget { ? null : InlineCustomWidget(child: MentionChip(element.text)), - // "img" => TODO: Img support - // element.attributes["src"] == null - // ? null - // : Consumer( - // builder: (_, ref, _) => ref - // .watch( - // ThumbnailController.provider( - // ImageData( - // uri: element.attributes["src"]!, - // height: height, - // width: width, - // ), - // ), - // ) - // .when( - // data: (uri) { - // if (uri == null) return SizedBox.shrink(); - - // return InlineCustomWidget( - // child: Image.network( - // uri, - // headers: client.headers, - // errorBuilder: (_, error, _) => Text( - // "Image Failed to Load", - // style: TextStyle( - // color: Theme.of(context).colorScheme.error, - // ), - // ), - // height: height.toDouble(), - // width: width?.toDouble(), - // loadingBuilder: (_, child, loadingProgress) => - // loadingProgress == null - // ? child - // : CircularProgressIndicator(), - // ), - // ); - // }, - // error: ErrorDialog.new, - // loading: () => InlineCustomWidget( - // child: SizedBox( - // width: width?.toDouble(), - // height: height.toDouble(), - // child: CircularProgressIndicator(), - // ), - // ), - // ), - // ), + "img" => + element.attributes["src"] == null + ? null + : InlineCustomWidget( + child: Image.network( + Uri.parse(element.attributes["src"]!) + .mxcToHttps( + ref.watch( + ClientStateController.provider.select( + (value) => value?.homeserverUrl, + ), + ) ?? + "", + ) + .toString(), + headers: ref.headers, + errorBuilder: (_, error, _) => Text( + "Image Failed to Load", + style: TextStyle( + color: Theme.of(context).colorScheme.error, + ), + ), + height: height.toDouble(), + width: width?.toDouble(), + loadingBuilder: (_, child, loadingProgress) => + loadingProgress == null + ? child + : CircularProgressIndicator(), + ), + ), ("del" || "h1" || "h2" || diff --git a/lib/widgets/chat_page/html/mention_chip.dart b/lib/widgets/chat_page/html/mention_chip.dart index 67d2877..c2b832d 100644 --- a/lib/widgets/chat_page/html/mention_chip.dart +++ b/lib/widgets/chat_page/html/mention_chip.dart @@ -19,7 +19,7 @@ class MentionChip extends StatelessWidget { context: context, builder: (_) => Dialog( child: Text("TODO: Open room or join room dialog, or user popover"), - ), // TODO + ), ), ); } diff --git a/lib/widgets/chat_page/member_list.dart b/lib/widgets/chat_page/member_list.dart index a1f842d..5e1f3bf 100644 --- a/lib/widgets/chat_page/member_list.dart +++ b/lib/widgets/chat_page/member_list.dart @@ -3,6 +3,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/members_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/models/room.dart"; +import "package:nexus/widgets/avatar_or_hash.dart"; class MemberList extends ConsumerWidget { final Room room; @@ -14,58 +15,44 @@ class MemberList extends ConsumerWidget { child: ref .watch(MembersController.provider(room)) .betterWhen( - data: (members) { - final joined = members.where( - (membership) => - membership.content["membership"] == - "join", // TODO: Show invites seperately - ); - return ListView( - children: [ - AppBar( - scrolledUnderElevation: 0, - leading: Icon(Icons.people), - title: Text("Members (${joined.length})"), - actionsPadding: EdgeInsets.only(right: 4), - actions: [ - if (Scaffold.of(context).hasEndDrawer) - IconButton( - onPressed: Scaffold.of(context).closeEndDrawer, - icon: Icon(Icons.close), - ), - ], - ), - ...joined.map( - (member) => ListTile( - onTap: () => showDialog( - context: context, - builder: (context) => - Dialog(child: Text("TODO: Open member popover")), - ), - // leading: AvatarOrHash( TODO - // ref - // .watch( - // AvatarController.provider( - // member.content["avatar_url"].toString(), - // ), - // ) - // .whenOrNull(data: (data) => data), - // member.content["displayname"].toString(), - // headers: room.client.headers, - // ), - title: Text( - member.content["displayname"].toString(), - overflow: TextOverflow.ellipsis, - ), - subtitle: Text( - member.authorId, - overflow: TextOverflow.ellipsis, + data: (members) => ListView( + children: [ + AppBar( + scrolledUnderElevation: 0, + leading: Icon(Icons.people), + title: Text("Members (${members.length})"), + actionsPadding: EdgeInsets.only(right: 4), + actions: [ + if (Scaffold.of(context).hasEndDrawer) + IconButton( + onPressed: Scaffold.of(context).closeEndDrawer, + icon: Icon(Icons.close), ), + ], + ), + ...members.map( + (member) => ListTile( + onTap: () => showDialog( + context: context, + builder: (context) => + Dialog(child: Text("TODO: Open member popover")), + ), + leading: AvatarOrHash( + Uri.tryParse(member.content["avatar_url"] ?? ""), + member.content["displayname"].toString(), + ), + title: Text( + member.content["displayname"].toString(), + overflow: TextOverflow.ellipsis, + ), + subtitle: Text( + member.authorId, + overflow: TextOverflow.ellipsis, ), ), - ], - ); - }, + ), + ], + ), ), ); } diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart index 7ea9109..b2f2d9d 100644 --- a/lib/widgets/chat_page/mention_overlay.dart +++ b/lib/widgets/chat_page/mention_overlay.dart @@ -4,6 +4,7 @@ import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/models/room.dart"; +import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/loading.dart"; class MentionOverlay extends ConsumerWidget { @@ -54,18 +55,12 @@ class MentionOverlay extends ConsumerWidget { )) .map( (member) => ListTile( - // leading: AvatarOrHash( TODO: Images - // ref - // .watch( - // AvatarController.provider( - // member.content["avatar_url"] - // .toString(), - // ), - // ) - // .whenOrNull(data: (data) => data), - // member.content["displayname"].toString(), - // headers: room.client.headers, - // ), + leading: AvatarOrHash( + Uri.tryParse( + member.content["avatar_url"] ?? "", + ), + member.content["displayname"] ?? "", + ), title: Text( member.content["displayname"] as String? ?? member.authorId, @@ -93,12 +88,11 @@ class MentionOverlay extends ConsumerWidget { )) .map( (room) => ListTile( - // leading: AvatarOrHash( TODO: Images - // room.avatar, - // room.title, - // fallback: Icon(Icons.numbers), - // headers: room.roomData.client.headers, - // ), + leading: AvatarOrHash( + room.metadata?.avatar, + room.metadata?.name ?? "Unnamed Room", + fallback: Icon(Icons.numbers), + ), title: Text(room.metadata?.name ?? "Unnamed Room"), subtitle: room.metadata?.topic == null ? null diff --git a/lib/widgets/chat_page/room_appbar.dart b/lib/widgets/chat_page/room_appbar.dart index 10090b6..21aa4ae 100644 --- a/lib/widgets/chat_page/room_appbar.dart +++ b/lib/widgets/chat_page/room_appbar.dart @@ -24,14 +24,12 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { @override Widget build(BuildContext context) => Appbar( leading: isDesktop - ? null - // AvatarOrHash( TODO: Images - // room.avatar, - // room.title, - // height: 24, - // fallback: Icon(Icons.numbers), - // headers: room.roomData.client.headers, - // ) + ? AvatarOrHash( + room.metadata?.avatar, + room.metadata?.name ?? "Unnamed Rooms", + height: 24, + fallback: Icon(Icons.numbers), + ) : DrawerButton(onPressed: () => onOpenDrawer(context)), scrolledUnderElevation: 0, title: Column( diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart index f7e6bc4..6adc013 100644 --- a/lib/widgets/chat_page/room_chat.dart +++ b/lib/widgets/chat_page/room_chat.dart @@ -488,9 +488,7 @@ class RoomChat extends HookConsumerWidget { onTap: () => showDialog( context: context, builder: (_) => Dialog( - child: Text( - "TODO: Download Attachments", // TODO - ), + child: Text("TODO: Download Attachments"), ), ), child: FlyerChatFileMessage( diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index cd394e3..341dd60 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -61,10 +61,9 @@ class Sidebar extends HookConsumerWidget { .map( (space) => NavigationRailDestination( icon: AvatarOrHash( - null, // TODO: Url + space.room?.metadata?.avatar, fallback: space.icon == null ? null : Icon(space.icon), space.title, - headers: {}, // TODO hasBadge: space.children.any( (room) => room.metadata?.unreadMessages != 0, ), @@ -177,15 +176,12 @@ class Sidebar extends HookConsumerWidget { backgroundColor: Colors.transparent, appBar: AppBar( leading: AvatarOrHash( - null, - // space.avatar, TODO + selectedSpace.room?.metadata?.avatar, fallback: selectedSpace.icon == null ? null : Icon(selectedSpace.icon), selectedSpace.title, - headers: {}, - // space.client.headers, TODO ), title: Text( selectedSpace.title, @@ -210,15 +206,13 @@ class Sidebar extends HookConsumerWidget { (room) => NavigationRailDestination( label: Text(room.metadata?.name ?? "Unnamed Room"), icon: AvatarOrHash( - null, + room.metadata?.avatar, hasBadge: room.metadata?.unreadMessages != 0, badgeNumber: room.metadata?.unreadNotifications ?? 0, - // room.avatar, TODO room.metadata?.name ?? "Unnamed Room", fallback: selectedSpaceId == "dms" ? null : Icon(Icons.numbers), - headers: {}, // space.client.headers, ), ), diff --git a/lib/widgets/chat_page/top_widget.dart b/lib/widgets/chat_page/top_widget.dart index 0cef0fa..cfba6fc 100644 --- a/lib/widgets/chat_page/top_widget.dart +++ b/lib/widgets/chat_page/top_widget.dart @@ -1,8 +1,8 @@ import "dart:math"; import "package:flutter/material.dart"; import "package:flutter_chat_core/flutter_chat_core.dart"; -import "package:flutter_chat_ui/flutter_chat_ui.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/chat_page/html/quoted.dart"; class TopWidget extends ConsumerWidget { @@ -60,11 +60,11 @@ class TopWidget extends ConsumerWidget { mainAxisSize: MainAxisSize.min, spacing: 8, children: [ - // Avatar( TODO: images - // userId: replyMessage.authorId, - // headers: headers, - // size: 16, - // ), + AvatarOrHash( + Uri.tryParse(replyMessage.metadata?["avatarUrl"] ?? ""), + replyMessage.metadata?["displayName"] ?? "", + height: 16, + ), Flexible( child: Text( replyMessage.metadata?["displayName"] ?? @@ -102,7 +102,10 @@ class TopWidget extends ConsumerWidget { mainAxisSize: MainAxisSize.min, spacing: 8, children: [ - // Avatar(userId: message.authorId, headers: headers), TODO: images + AvatarOrHash( + Uri.parse(message.metadata?["avatarUrl"] ?? ""), + message.metadata?["displayName"] ?? "", + ), Flexible( child: Text( message.metadata?["displayName"] ?? message.authorId, From 322acbd694c674e1573a20cb77db9a5cd0d8651d Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 30 Jan 2026 18:42:11 +0100 Subject: [PATCH 34/34] safety checks and message fix --- lib/controllers/room_chat_controller.dart | 12 +++++++----- lib/main.dart | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 3fa5c7f..091cdc9 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -44,17 +44,18 @@ class RoomChatController extends AsyncNotifier { ref.onDispose( ref.listen(NewEventsController.provider(roomId), (_, next) async { + final controller = await future; for (final event in next) { if (event.type == "m.room.redaction") { final controller = await future; final message = controller.messages.firstWhereOrNull( (message) => message.id == event.content["redacts"], ); - if (message == null) return; + if (message == null || !ref.mounted) return; await controller.removeMessage(message); } else { - final message = await ref.read( + final message = await ref.watch( MessageController.provider( MessageConfig(event: event, includeEdits: true), ).future, @@ -64,7 +65,7 @@ class RoomChatController extends AsyncNotifier { final oldMessage = controller.messages.firstWhereOrNull( (element) => element.id == event.relatesTo, ); - if (oldMessage == null || message == null) return; + if (oldMessage == null || message == null || !ref.mounted) return; return await updateMessage( oldMessage, @@ -84,8 +85,9 @@ class RoomChatController extends AsyncNotifier { if (message != null && !controller.messages.any( (oldMessage) => oldMessage.id == message.id, - )) { - await insertMessage(message); + ) && + ref.mounted) { + await controller.insertMessage(message); } } } diff --git a/lib/main.dart b/lib/main.dart index e51d8af..ab65e4b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,3 +1,4 @@ +import "dart:developer"; import "dart:io"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/foundation.dart"; @@ -43,6 +44,7 @@ void showError(Object error, [StackTrace? stackTrace]) { if (error.toString().contains("Invalid image data")) return; debugPrintStack(stackTrace: stackTrace, label: error.toString()); + debugger(); if (navigatorKey.currentContext != null) { Future.delayed( Duration.zero,