From fe871217b2ebed97b694431e2a8277e996237cf6 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 23 Aug 2026 13:55:07 -0400 Subject: [PATCH 01/14] support for registering pushers --- .vscode/settings.json | 4 +- android/app/build.gradle.kts | 4 + gomuks | 2 +- lib/controllers/client.dart | 10 ++ lib/controllers/settings_sections.dart | 43 +++++++ lib/controllers/unified_push.dart | 106 ++++++++++++++++++ lib/main.dart | 34 +++--- lib/models/capabilities.dart | 25 +++++ lib/models/client_state.dart | 1 + lib/models/join_rule.dart | 2 +- lib/models/membership_action.dart | 3 - lib/models/membership_status.dart | 3 - lib/models/requests/register_pusher.dart | 56 +++++++++ linux/flutter/generated_plugin_registrant.cc | 4 + linux/flutter/generated_plugins.cmake | 1 + linux/runner/my_application.cc | 2 + macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 64 +++++++++++ pubspec.yaml | 2 + .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 1 + 21 files changed, 350 insertions(+), 22 deletions(-) create mode 100644 lib/controllers/unified_push.dart create mode 100644 lib/models/capabilities.dart create mode 100644 lib/models/requests/register_pusher.dart diff --git a/.vscode/settings.json b/.vscode/settings.json index 2ff533e..fac2ed8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,6 +11,8 @@ "muks", "prefs", "unban", - "unredact" + "unifiedpush", + "unredact", + "webpush" ] } diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 8a23bb6..9f9a087 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -63,6 +63,10 @@ android { } } +dependencies { + implementation("org.unifiedpush.android:embedded-fcm-distributor:3.1.0") +} + kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 diff --git a/gomuks b/gomuks index 9444dd2..6c8b278 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 9444dd293664c300c6e710bb6cddcd9c6cab365d +Subproject commit 6c8b2781e02f27b64f37735cba6634784f117b88 diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart index b7d1eb4..782e4a7 100644 --- a/lib/controllers/client.dart +++ b/lib/controllers/client.dart @@ -2,6 +2,7 @@ import "dart:ffi"; import "dart:io"; import "dart:isolate"; import "dart:math"; + import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; @@ -14,6 +15,7 @@ import "package:nexus/controllers/sync_status.dart"; import "package:nexus/controllers/top_level_spaces.dart"; import "package:nexus/helpers/extensions/gomuks_buffer.dart"; import "package:nexus/main.dart"; +import "package:nexus/models/capabilities.dart"; import "package:nexus/models/content/message.dart"; import "package:nexus/models/event.dart"; import "package:nexus/models/oauth_auth_code_response.dart"; @@ -30,6 +32,7 @@ import "package:nexus/models/requests/oauth/get_auth_url.dart"; import "package:nexus/models/requests/oauth/register_client.dart"; import "package:nexus/models/requests/paginate.dart"; import "package:nexus/models/requests/redact_event.dart"; +import "package:nexus/models/requests/register_pusher.dart"; import "package:nexus/models/requests/report.dart"; import "package:nexus/models/requests/send_event.dart"; import "package:nexus/models/requests/send_message.dart"; @@ -273,6 +276,9 @@ class ClientController extends AsyncNotifier { Future setAccountData(SetAccountDataRequest request) => _sendCommand("set_account_data", request.toJson()); + Future registerPusher(RegisterPusherRequest request) => + _sendCommand("register_homeserver_push", request.toJson()); + Future uploadMedia(UploadMediaRequest request) async => .fromJson(await _sendCommand("upload_media", request.toJson())); @@ -310,6 +316,10 @@ class ClientController extends AsyncNotifier { Future getSpecVersions() async => .fromJson(await _sendCommand("get_versions")); + Future getCapabilities() async => Capabilities.fromJson( + (await _sendCommand("get_capabilities"))["capabilities"], + ); + Future discoverHomeserver(Uri homeserver) async { try { final response = await _sendCommand("discover_homeserver", { diff --git a/lib/controllers/settings_sections.dart b/lib/controllers/settings_sections.dart index 042b42b..fea0d26 100644 --- a/lib/controllers/settings_sections.dart +++ b/lib/controllers/settings_sections.dart @@ -9,6 +9,7 @@ import "package:nexus/controllers/account_data.dart"; import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; import "package:nexus/controllers/settings.dart"; +import "package:nexus/controllers/unified_push.dart"; import "package:nexus/controllers/spec_versions.dart"; import "package:nexus/models/account_data.dart"; import "package:nexus/models/settings_category.dart"; @@ -95,6 +96,46 @@ class SettingsSectionsController if (ref.watch(ClientStateController.provider)?.isLoggedIn == true) "Account": .new([ .new(title: "Profile", icon: Icons.person, settings: .new([])), + .new( + title: "Notifications", + icon: Icons.notifications, + settings: .new([ + // TODO: Disable if not supported + .new( + title: "Push notifications", + description: "Enable push notifications using Web Push", + builder: (title, description, icon) => Consumer( + builder: (context, ref, _) { + final pusherRegistered = ref.watch( + UnifiedPushController.provider, + ); + return SwitchListTile( + title: Text(title), + subtitle: Text(description), + secondary: Icon(icon), + value: pusherRegistered.maybeWhen( + data: (value) => value, + orElse: () => false, + ), + onChanged: pusherRegistered.maybeWhen( + data: (_) => + (value) => value + ? ref + .watch( + UnifiedPushController.provider.notifier, + ) + .register() + .onError(showError) + : /*deregeister*/ null, + orElse: () => null, + ), + ); + }, + ), + icon: Icons.notification_add, + ), + ]), + ), .new( title: "Safety", icon: Icons.gpp_good, @@ -166,6 +207,8 @@ class SettingsSectionsController onPressed: () async { Navigator.of(context) .popUntil((route) => route.isFirst); + Navigator.of(context) + .popUntil((route) => route.isFirst); await WidgetsBinding.instance.endOfFrame; diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart new file mode 100644 index 0000000..c7a6cde --- /dev/null +++ b/lib/controllers/unified_push.dart @@ -0,0 +1,106 @@ +import "dart:io"; + +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:intl/intl.dart"; +import "package:nexus/main.dart"; +import "package:nexus/controllers/client.dart"; +import "package:nexus/controllers/client_state.dart"; +import "package:nexus/models/requests/register_pusher.dart"; +import "package:unifiedpush/unifiedpush.dart"; +import "package:unifiedpush_storage_shared_preferences/storage.dart"; + +class UnifiedPushController extends AsyncNotifier { + @override + Future build() async { + final registered = await UnifiedPush.initialize( + linuxOptions: .new( + dbusName: "nexus.federated.nexus", + storage: UnifiedPushStorageSharedPreferences(), + background: isInBackground, + ), + onNewEndpoint: (endpoint, instance) async { + final client = ref.watch(ClientController.provider.notifier); + await client.registerPusher( + .new( + appDisplayName: "Nexus", + appId: "nexus.federated.nexus", + data: PusherData.webPush( + url: Uri.parse(endpoint.url), + auth: endpoint.pubKeySet!.auth, + ), + deviceDisplayName: + "Nexus on ${toBeginningOfSentenceCase(Platform.operatingSystem)}", + kind: .webPush, + lang: "en", + pushKey: endpoint.pubKeySet!.pubKey, + ), + + // Pusher( + // appDisplayName: , + // data: { + // "url": endpoint.url, + // "auth": endpoint.pubKeySet.auth, + // "format": "event_id_only", + // }, + // deviceDisplayName: "Nexus", + // kind: "org.matrix.msc4174.webpush", + // lang: WidgetsBinding.instance.platformDispatcher.locale + // .toLanguageTag(), + // pushkey: endpoint.pubKeySet.publicKey, + // ), + ); + }, + onMessage: (message, instance) async { + print(message); + // TODO: Handle incoming message + }, + onRegistrationFailed: (e, r) { + throw "e"; + }, + onUnregistered: (_) { + throw "r"; + }, + onTempUnavailable: (_) { + throw "t"; + }, + ); + + if (registered) { + // Needs to be registered every startup + await register(true); + } + + return registered; + } + + Future register([bool early = false]) async { + final clientState = ref.watch(ClientStateController.provider); + if (clientState?.deviceId == null) ref.invalidateSelf(); + + final alreadyRegistered = early ? true : await future; + final client = ref.watch(ClientController.provider.notifier); + final capabilities = await client.getCapabilities(); + + if (capabilities.webpush?.vapid == null) { + throw UnsupportedError( + "Your homeserver does not support MSC4174 (Web Push), and therefore cannot send notifications to Nexus.", + ); + } + + if (!alreadyRegistered && + !await UnifiedPush.tryUseCurrentOrDefaultDistributor()) { + throw Exception("No UnifiedPush distributors found"); + } + + await UnifiedPush.register( + instance: clientState!.deviceId!, + vapid: capabilities.webpush?.vapid, + ); + + if (!alreadyRegistered) ref.invalidateSelf(); + } + + static final provider = AsyncNotifierProvider( + UnifiedPushController.new, + ); +} diff --git a/lib/main.dart b/lib/main.dart index a87d7f5..7b2aa63 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -10,6 +10,7 @@ import "package:nexus/controllers/client_state.dart"; import "package:nexus/controllers/multi_provider.dart"; import "package:nexus/controllers/settings.dart"; import "package:nexus/controllers/shared_prefs.dart"; +import "package:nexus/controllers/unified_push.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; import "package:nexus/helpers/font_licenses.dart"; @@ -22,6 +23,7 @@ import "package:window_manager/window_manager.dart"; import "package:material_ui/material_ui.dart"; final GlobalKey navigatorKey = GlobalKey(); +late final bool isInBackground; final class Logger extends ProviderObserver { @override @@ -62,7 +64,7 @@ void showError(Object error, [StackTrace? stackTrace]) { } } -void main() async { +void main(List args) async { WidgetsFlutterBinding.ensureInitialized(); MediaKit.ensureInitialized(); @@ -77,25 +79,30 @@ void main() async { await windowManager.setMinimumSize(Size.square(500)); } + isInBackground = args.contains("--unifiedpush-bg"); + LicenseRegistry.addLicense(() => Stream.fromIterable(fontLicenses)); FlutterError.onError = (FlutterErrorDetails details) => showError(details.exception.toString(), details.stack); - runApp( - ProviderScope( - retry: (_, _) => null, - observers: [ - // Change false to true if you want debug information on provider reloads - // ignore: dead_code - if (false && kDebugMode) Logger(), - ], - child: const App(), - ), - ); + if (!isInBackground) { + runApp( + ProviderScope( + retry: (_, _) => null, + observers: [ + // Change false to true if you want debug information on provider reloads + // ignore: dead_code + if (false && kDebugMode) Logger(), + ], + child: App(isInBackground), + ), + ); + } } -class const App({super.key}) extends StatelessWidget { +class const App(final bool isInBackground, {super.key}) + extends StatelessWidget { @override Widget build(BuildContext context) => DynamicColorBuilder( builder: (lightDynamic, darkDynamic) => Consumer( @@ -138,6 +145,7 @@ class const App({super.key}) extends StatelessWidget { IListConst([ SharedPrefsController.provider, ClientController.provider, + UnifiedPushController.provider, ]), ), ) diff --git a/lib/models/capabilities.dart b/lib/models/capabilities.dart new file mode 100644 index 0000000..6830170 --- /dev/null +++ b/lib/models/capabilities.dart @@ -0,0 +1,25 @@ +import "package:freezed_annotation/freezed_annotation.dart"; + +part "capabilities.freezed.dart"; +part "capabilities.g.dart"; + +@Freezed(toJson: false, fromJson: false) +@JsonSerializable() +class const Capabilities({ + @JsonKey(name: "org.matrix.msc4174.webpush") final WebPush? webpush, +}) with _$Capabilities { + Map toJson() => _$CapabilitiesToJson(this); + + factory Capabilities.fromJson(Map json) => + _$CapabilitiesFromJson(json); +} + +@Freezed(toJson: false, fromJson: false) +@JsonSerializable() +class const WebPush({required final bool enabled, final String? vapid}) + with _$WebPush { + Map toJson() => _$WebPushToJson(this); + + factory WebPush.fromJson(Map json) => + _$WebPushFromJson(json); +} diff --git a/lib/models/client_state.dart b/lib/models/client_state.dart index ff433ab..262203d 100644 --- a/lib/models/client_state.dart +++ b/lib/models/client_state.dart @@ -10,6 +10,7 @@ class const ClientState({ required final bool isLoggedIn, required final bool isVerified, required final String? userId, + required final String? deviceId, required final String? homeserverUrl, }) with _$ClientState { Map toJson() => _$ClientStateToJson(this); diff --git a/lib/models/join_rule.dart b/lib/models/join_rule.dart index 3fade23..44fb9bb 100644 --- a/lib/models/join_rule.dart +++ b/lib/models/join_rule.dart @@ -1,4 +1,4 @@ import "package:freezed_annotation/freezed_annotation.dart"; -@JsonEnum(fieldRename: FieldRename.snake) +@JsonEnum(fieldRename: .snake) enum JoinRule { public, knock, invite, private, restricted, knockRestricted } diff --git a/lib/models/membership_action.dart b/lib/models/membership_action.dart index d852164..f03ca99 100644 --- a/lib/models/membership_action.dart +++ b/lib/models/membership_action.dart @@ -1,4 +1 @@ -import "package:freezed_annotation/freezed_annotation.dart"; - -@JsonEnum() enum MembershipAction { ban, kick, unban, invite } diff --git a/lib/models/membership_status.dart b/lib/models/membership_status.dart index ba7a241..7eb5f72 100644 --- a/lib/models/membership_status.dart +++ b/lib/models/membership_status.dart @@ -1,4 +1 @@ -import "package:freezed_annotation/freezed_annotation.dart"; - -@JsonEnum() enum MembershipStatus { leave, invite, ban, join, knock } diff --git a/lib/models/requests/register_pusher.dart b/lib/models/requests/register_pusher.dart new file mode 100644 index 0000000..dd34e62 --- /dev/null +++ b/lib/models/requests/register_pusher.dart @@ -0,0 +1,56 @@ +import "package:freezed_annotation/freezed_annotation.dart"; + +part "register_pusher.freezed.dart"; +part "register_pusher.g.dart"; + +@Freezed(toJson: false, fromJson: false) +@JsonSerializable() +class const RegisterPusherRequest({ + required final String appDisplayName, + required final String appId, + final bool append = false, + required final PusherData data, + required final String deviceDisplayName, + required final PusherKind kind, + required final String lang, + + /// TODO: What does this do? + final String? profileTag, + + @JsonKey(name: "pushkey") required final String pushKey, +}) with _$RegisterPusherRequest { + Map toJson() => _$RegisterPusherRequestToJson(this); +} + +@freezed +sealed class PusherData with _$PusherData { + const factory PusherData.http({ + required Uri url, + @Default(PushFormat.eventIdOnly) PushFormat format, + }) = HttpPusherData; + + const factory PusherData.webPush({ + required Uri url, + @Default(PushFormat.eventIdOnly) PushFormat format, + + /// `data.auth`: RFC8291 authentication secret. + required String auth, + }) = WebPushPusherData; + + factory PusherData.fromJson(Map json) => + _$PusherDataFromJson(json); +} + +@JsonEnum(fieldRename: .snake) +enum PushFormat { + @JsonValue(null) + all, + eventIdOnly, +} + +enum PusherKind { + http, + email, + @JsonValue("org.matrix.msc4174.webpush") + webPush, +} diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 603ea6a..70d9ba2 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -37,6 +38,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); + g_autoptr(FlPluginRegistrar) webcrypto_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WebcryptoPlugin"); + webcrypto_plugin_register_with_registrar(webcrypto_registrar); g_autoptr(FlPluginRegistrar) window_manager_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); window_manager_plugin_register_with_registrar(window_manager_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 7d8f046..1d53ad7 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_linux url_launcher_linux + webcrypto window_manager ) diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc index 62e5450..739e6df 100644 --- a/linux/runner/my_application.cc +++ b/linux/runner/my_application.cc @@ -1,5 +1,6 @@ #include "my_application.h" +#include #include #ifdef GDK_WINDOWING_X11 #include @@ -72,6 +73,7 @@ static void my_application_activate(GApplication* application) { gdk_rgba_parse(&background_color, "#000000"); fl_view_set_background_color(view, &background_color); gtk_widget_show(GTK_WIDGET(view)); + if (std::getenv("FLUTTER_HEADLESS")) gtk_widget_hide(GTK_WIDGET(window)); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); // Show the window when Flutter renders. diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index f18d831..5d90835 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,6 +15,7 @@ import screen_retriever_macos import shared_preferences_foundation import url_launcher_macos import wakelock_plus +import webcrypto import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { @@ -28,5 +29,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) + WebcryptoPlugin.register(with: registry.registrar(forPlugin: "WebcryptoPlugin")) WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index d45c4d4..1625e8a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1509,6 +1509,54 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + unifiedpush: + dependency: "direct main" + description: + name: unifiedpush + sha256: "8ed9767f750a1dc6159a77e2171641d0cb825dc87682d1ce1b8618689b79f58e" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + unifiedpush_android: + dependency: transitive + description: + name: unifiedpush_android + sha256: "2e6684e0a1a39ad8d6c7bc0d197954d50686acb1b1a7614b18ab0e0126f5492a" + url: "https://pub.dev" + source: hosted + version: "3.4.1" + unifiedpush_linux: + dependency: transitive + description: + name: unifiedpush_linux + sha256: c062d5eedd1cec70bcd33270cc4e01ae0ff6501f33d471167c06b34a968adfeb + url: "https://pub.dev" + source: hosted + version: "1.0.0" + unifiedpush_platform_interface: + dependency: transitive + description: + name: unifiedpush_platform_interface + sha256: "83372bc8d794b8b12ef6993b518d7be907dcfc2191bdf6de0ece5c4445d89880" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + unifiedpush_storage_interface: + dependency: transitive + description: + name: unifiedpush_storage_interface + sha256: b8d423a4695efc616aa21d8ab48fb5ef99d6288c68b56282b8faac1579ceabd9 + url: "https://pub.dev" + source: hosted + version: "1.0.0" + unifiedpush_storage_shared_preferences: + dependency: "direct main" + description: + name: unifiedpush_storage_shared_preferences + sha256: eda9c52bac0058f81e0d9c65e33eedc12c5901d2e68ad47fdf68175ddf00a3b4 + url: "https://pub.dev" + source: hosted + version: "1.0.0" universal_platform: dependency: transitive description: @@ -1685,6 +1733,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" + webcrypto: + dependency: transitive + description: + name: webcrypto + sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1" + url: "https://pub.dev" + source: hosted + version: "0.6.0" webkit_inspection_protocol: dependency: transitive description: @@ -1693,6 +1749,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" + webpush_encryption: + dependency: transitive + description: + name: webpush_encryption + sha256: "5b83272b91acda6ae515fcd980c94f06bf413702282497c5a68f5dfc64fed27f" + url: "https://pub.dev" + source: hosted + version: "1.0.1" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a9b2e01..520cb91 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,6 +79,8 @@ dependencies: app_links: 7.2.1 file_selector: 1.1.0 material_ui: 1.0.1 + unifiedpush: ^6.2.0 + unifiedpush_storage_shared_preferences: ^1.0.0 dev_dependencies: build_runner: 2.16.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 0694802..5d2b53e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -30,6 +31,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); + WebcryptoPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WebcryptoPlugin")); WindowManagerPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 238ef93..51af01c 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_windows url_launcher_windows + webcrypto window_manager ) From 7218eb51953e9af4236338f299fb4c3bad35fe8f Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 23 Aug 2026 14:26:51 -0400 Subject: [PATCH 02/14] add UnifiedPushAllowedController --- lib/controllers/settings_sections.dart | 45 ++++++++++++++++------- lib/controllers/unified_push.dart | 5 ++- lib/controllers/unified_push_allowed.dart | 33 +++++++++++++++++ 3 files changed, 67 insertions(+), 16 deletions(-) create mode 100644 lib/controllers/unified_push_allowed.dart diff --git a/lib/controllers/settings_sections.dart b/lib/controllers/settings_sections.dart index fea0d26..8d67435 100644 --- a/lib/controllers/settings_sections.dart +++ b/lib/controllers/settings_sections.dart @@ -11,6 +11,7 @@ import "package:nexus/controllers/client_state.dart"; import "package:nexus/controllers/settings.dart"; import "package:nexus/controllers/unified_push.dart"; import "package:nexus/controllers/spec_versions.dart"; +import "package:nexus/controllers/unified_push_allowed.dart"; import "package:nexus/models/account_data.dart"; import "package:nexus/models/settings_category.dart"; import "package:nexus/main.dart"; @@ -100,7 +101,6 @@ class SettingsSectionsController title: "Notifications", icon: Icons.notifications, settings: .new([ - // TODO: Disable if not supported .new( title: "Push notifications", description: "Enable push notifications using Web Push", @@ -109,26 +109,43 @@ class SettingsSectionsController final pusherRegistered = ref.watch( UnifiedPushController.provider, ); + final unifiedPushAllowed = ref.watch( + UnifiedPushAllowedController.provider, + ); return SwitchListTile( title: Text(title), - subtitle: Text(description), + subtitle: Text( + unifiedPushAllowed.maybeWhen( + data: (data) => data, + orElse: () => null, + ) ?? + description, + ), secondary: Icon(icon), value: pusherRegistered.maybeWhen( data: (value) => value, orElse: () => false, ), - onChanged: pusherRegistered.maybeWhen( - data: (_) => - (value) => value - ? ref - .watch( - UnifiedPushController.provider.notifier, - ) - .register() - .onError(showError) - : /*deregeister*/ null, - orElse: () => null, - ), + onChanged: + unifiedPushAllowed.maybeWhen( + data: (data) => data == null, + orElse: () => false, + ) + ? pusherRegistered.maybeWhen( + data: (_) => + (value) => value + ? ref + .watch( + UnifiedPushController + .provider + .notifier, + ) + .register() + .onError(showError) + : /*deregeister*/ null, + orElse: () => null, + ) + : null, ); }, ), diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index c7a6cde..b4aa107 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -78,8 +78,9 @@ class UnifiedPushController extends AsyncNotifier { if (clientState?.deviceId == null) ref.invalidateSelf(); final alreadyRegistered = early ? true : await future; - final client = ref.watch(ClientController.provider.notifier); - final capabilities = await client.getCapabilities(); + final capabilities = await ref + .watch(ClientController.provider.notifier) + .getCapabilities(); if (capabilities.webpush?.vapid == null) { throw UnsupportedError( diff --git a/lib/controllers/unified_push_allowed.dart b/lib/controllers/unified_push_allowed.dart new file mode 100644 index 0000000..4f925cf --- /dev/null +++ b/lib/controllers/unified_push_allowed.dart @@ -0,0 +1,33 @@ +import "dart:io"; + +import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/client.dart"; +import "package:unifiedpush/unifiedpush.dart"; + +class UnifiedPushAllowedController extends AsyncNotifier { + @override + Future build() async { + if (!await UnifiedPush.tryUseCurrentOrDefaultDistributor()) { + return "No valid distributors found. Try installing ${Platform.isLinux + ? "KUnifiedPush" + : Platform.isAndroid + ? "FCM or NTFY" + : "NTFY"}."; + } + + final capabilities = await ref + .watch(ClientController.provider.notifier) + .getCapabilities(); + + if (capabilities.webpush?.vapid == null) { + return "Your homeserver does not support MSC4174 (Web Push), and therefore cannot send notifications to Nexus."; + } + + return null; + } + + static final provider = + AsyncNotifierProvider.autoDispose( + UnifiedPushAllowedController.new, + ); +} From 5ed6e5e0830c726ff3da4f1803415c03e115307a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 23 Aug 2026 22:13:38 -0400 Subject: [PATCH 03/14] slight cleanup `onNewEndpoint` is still not getting called for some reason (help appreciated) --- lib/controllers/unified_push.dart | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index b4aa107..3097e6d 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -34,20 +34,6 @@ class UnifiedPushController extends AsyncNotifier { lang: "en", pushKey: endpoint.pubKeySet!.pubKey, ), - - // Pusher( - // appDisplayName: , - // data: { - // "url": endpoint.url, - // "auth": endpoint.pubKeySet.auth, - // "format": "event_id_only", - // }, - // deviceDisplayName: "Nexus", - // kind: "org.matrix.msc4174.webpush", - // lang: WidgetsBinding.instance.platformDispatcher.locale - // .toLanguageTag(), - // pushkey: endpoint.pubKeySet.publicKey, - // ), ); }, onMessage: (message, instance) async { @@ -73,11 +59,10 @@ class UnifiedPushController extends AsyncNotifier { return registered; } - Future register([bool early = false]) async { + Future register([bool alreadyRegistered = false]) async { final clientState = ref.watch(ClientStateController.provider); if (clientState?.deviceId == null) ref.invalidateSelf(); - final alreadyRegistered = early ? true : await future; final capabilities = await ref .watch(ClientController.provider.notifier) .getCapabilities(); From adf3da8d77bd1955604c05b360596ccbb25a363c Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 25 Aug 2026 17:30:55 -0400 Subject: [PATCH 04/14] working registration --- lib/controllers/unified_push.dart | 2 +- linux/nix/devshell.nix | 1 - pubspec.lock | 22 +++++++++++----------- pubspec.yaml | 7 ++++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index 3097e6d..0e7d1aa 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -14,7 +14,7 @@ class UnifiedPushController extends AsyncNotifier { Future build() async { final registered = await UnifiedPush.initialize( linuxOptions: .new( - dbusName: "nexus.federated.nexus", + dbusName: "nexus.federated.nexus.UnifiedPush", storage: UnifiedPushStorageSharedPreferences(), background: isInBackground, ), diff --git a/linux/nix/devshell.nix b/linux/nix/devshell.nix index dd3c78e..8bc8641 100644 --- a/linux/nix/devshell.nix +++ b/linux/nix/devshell.nix @@ -45,7 +45,6 @@ pkgs.mkShell { GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/36.0.0/aapt2"; } // lib.optionalAttrs pkgs.stdenv.isLinux { - CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ]; LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}"; }; } diff --git a/pubspec.lock b/pubspec.lock index 1625e8a..2c6ba10 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: archive - sha256: be169cf6ac481e052c4538715d88841d567150dfe1df38aaec76461a4e7b39f2 + sha256: ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19 url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.2.0" args: dependency: transitive description: @@ -253,10 +253,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51" + sha256: f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6 url: "https://pub.dev" source: hosted - version: "0.3.5+4" + version: "0.3.5+5" crypto: dependency: transitive description: @@ -277,10 +277,10 @@ packages: dependency: transitive description: name: cupertino_ui - sha256: "7ed8ce4159d342eec4c65f4ea6eec57adaf9365404378541f38efc1da20a5b3d" + sha256: "2137c0d41f3b62cc4d3d2495e6c354bd6b6133cd21c6bb155736cc31dbd49a11" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" dart_style: dependency: transitive description: @@ -891,10 +891,10 @@ packages: dependency: "direct main" description: name: material_ui - sha256: "4f3f38b9953df0a87d6bf5f21880029f77c47048487d5339410c39936be4683b" + sha256: "7ba1ca315d50a004791dbab290417c52a61466d56db2822fe3c5c2994903110c" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" measure_size: dependency: "direct main" description: @@ -1521,10 +1521,10 @@ packages: dependency: transitive description: name: unifiedpush_android - sha256: "2e6684e0a1a39ad8d6c7bc0d197954d50686acb1b1a7614b18ab0e0126f5492a" + sha256: a902e505e91c8e28b54b379bb27f255f66df409274a97af24d6719f12f0d13dc url: "https://pub.dev" source: hosted - version: "3.4.1" + version: "3.5.0" unifiedpush_linux: dependency: transitive description: @@ -1734,7 +1734,7 @@ packages: source: hosted version: "3.0.3" webcrypto: - dependency: transitive + dependency: "direct main" description: name: webcrypto sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1" diff --git a/pubspec.yaml b/pubspec.yaml index 520cb91..9159199 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -78,13 +78,14 @@ dependencies: package_info_plus: 10.2.1 app_links: 7.2.1 file_selector: 1.1.0 - material_ui: 1.0.1 - unifiedpush: ^6.2.0 - unifiedpush_storage_shared_preferences: ^1.0.0 + material_ui: 1.1.0 + unifiedpush: 6.2.0 + unifiedpush_storage_shared_preferences: 1.0.0 dev_dependencies: build_runner: 2.16.0 flutter_lints: 6.0.0 + webcrypto: 0.6.0 freezed: 4.0.0 riverpod_lint: 3.1.8 flutter_launcher_icons: 0.14.4 From 02704e97efa3f110fff6a679cd1f41cb5036acbe Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 25 Aug 2026 19:51:43 -0400 Subject: [PATCH 05/14] pass pushes to gomuks --- lib/controllers/client.dart | 32 ++++++++++++++++++++++--------- lib/controllers/unified_push.dart | 15 ++++++++------- lib/main.dart | 1 + pubspec.lock | 2 +- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart index 782e4a7..20a3954 100644 --- a/lib/controllers/client.dart +++ b/lib/controllers/client.dart @@ -1,3 +1,4 @@ +import "dart:async"; import "dart:ffi"; import "dart:io"; import "dart:isolate"; @@ -156,18 +157,15 @@ class ClientController extends AsyncNotifier { throw Exception("GomuksStart returned error code $errorCode"); } - Future _sendCommand( - String command, [ - Map data = const {}, - ]) async { + Future callGomuksMethod( + Map data, + FutureOr Function(int handle, GomuksBorrowedBuffer data) + callback, + ) async { final bufferPointer = data.toGomuksBufferPtr(); final handle = await future; final response = await Isolate.run( - () => GomuksSubmitCommand( - handle, - command.toNativeUtf8().cast(), - bufferPointer.ref, - ), + () => callback(handle, bufferPointer.ref), ); calloc.free(bufferPointer); @@ -180,6 +178,22 @@ class ClientController extends AsyncNotifier { return json; } + Future handlePush(Map data) async => .fromJson( + await callGomuksMethod( + data, + (handle, data) async => GomuksHandlePush(handle, data), + ), + ); + + Future _sendCommand( + String command, [ + Map data = const {}, + ]) => callGomuksMethod( + data, + (handle, data) async => + GomuksSubmitCommand(handle, command.toNativeUtf8().cast(), data), + ); + Future redactEvent(RedactEventRequest report) => _sendCommand("redact_event", report.toJson()); diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index 0e7d1aa..bfa0ad1 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -1,3 +1,4 @@ +import "dart:convert"; import "dart:io"; import "package:flutter_riverpod/flutter_riverpod.dart"; @@ -12,6 +13,7 @@ import "package:unifiedpush_storage_shared_preferences/storage.dart"; class UnifiedPushController extends AsyncNotifier { @override Future build() async { + final client = ref.watch(ClientController.provider.notifier); final registered = await UnifiedPush.initialize( linuxOptions: .new( dbusName: "nexus.federated.nexus.UnifiedPush", @@ -19,7 +21,6 @@ class UnifiedPushController extends AsyncNotifier { background: isInBackground, ), onNewEndpoint: (endpoint, instance) async { - final client = ref.watch(ClientController.provider.notifier); await client.registerPusher( .new( appDisplayName: "Nexus", @@ -37,16 +38,16 @@ class UnifiedPushController extends AsyncNotifier { ); }, onMessage: (message, instance) async { - print(message); - // TODO: Handle incoming message + final e = await client.handlePush( + json.decode(String.fromCharCodes(message.content)), + ); + print(e); }, onRegistrationFailed: (e, r) { throw "e"; }, - onUnregistered: (_) { - throw "r"; - }, - onTempUnavailable: (_) { + onUnregistered: (instance) => ref.invalidateSelf(), + onTempUnavailable: (instance) { throw "t"; }, ); diff --git a/lib/main.dart b/lib/main.dart index 7b2aa63..2221151 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -47,6 +47,7 @@ void showError(Object error, [StackTrace? stackTrace]) { error.toString().contains("Invalid source") || error.toString().contains("UTF-16") || error.toString().contains("HTTP request failed") || + error.toString().contains("'_nextFrame != null': is not true.") || error.toString().contains("Invalid image data")) { return; } diff --git a/pubspec.lock b/pubspec.lock index 2c6ba10..ff25956 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1734,7 +1734,7 @@ packages: source: hosted version: "3.0.3" webcrypto: - dependency: "direct main" + dependency: "direct dev" description: name: webcrypto sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1" From 11d83ee067f1d6c924881ddec58e5bdf31198a28 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 25 Aug 2026 20:18:47 -0400 Subject: [PATCH 06/14] override webcrypto deps --- lib/controllers/unified_push.dart | 11 +++------- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- pubspec.lock | 22 ++++++++++++++++--- pubspec.yaml | 5 +++-- .../flutter/generated_plugin_registrant.cc | 3 --- windows/flutter/generated_plugins.cmake | 1 - 8 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index bfa0ad1..f72e8ec 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -38,18 +38,13 @@ class UnifiedPushController extends AsyncNotifier { ); }, onMessage: (message, instance) async { - final e = await client.handlePush( + final event = await client.handlePush( json.decode(String.fromCharCodes(message.content)), ); - print(e); - }, - onRegistrationFailed: (e, r) { - throw "e"; + print(event); }, + onRegistrationFailed: (error, instance) => throw error, onUnregistered: (instance) => ref.invalidateSelf(), - onTempUnavailable: (instance) { - throw "t"; - }, ); if (registered) { diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 70d9ba2..603ea6a 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -13,7 +13,6 @@ #include #include #include -#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -38,9 +37,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); - g_autoptr(FlPluginRegistrar) webcrypto_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "WebcryptoPlugin"); - webcrypto_plugin_register_with_registrar(webcrypto_registrar); g_autoptr(FlPluginRegistrar) window_manager_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); window_manager_plugin_register_with_registrar(window_manager_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 1d53ad7..7d8f046 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_linux url_launcher_linux - webcrypto window_manager ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 5d90835..f18d831 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,7 +15,6 @@ import screen_retriever_macos import shared_preferences_foundation import url_launcher_macos import wakelock_plus -import webcrypto import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { @@ -29,6 +28,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) - WebcryptoPlugin.register(with: registry.registrar(forPlugin: "WebcryptoPlugin")) WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index ff25956..6f957d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -169,6 +169,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.2" + change_case: + dependency: transitive + description: + name: change_case + sha256: e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003 + url: "https://pub.dev" + source: hosted + version: "2.2.0" characters: dependency: transitive description: @@ -999,6 +1007,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.3" + native_toolchain_cmake: + dependency: transitive + description: + name: native_toolchain_cmake + sha256: de90e8952bad0684bdcff4d674c53d961f5cd1fdcf3a0255a669a35986c4ac1d + url: "https://pub.dev" + source: hosted + version: "0.2.7" navigation_rail_m3e: dependency: "direct main" description: @@ -1734,13 +1750,13 @@ packages: source: hosted version: "3.0.3" webcrypto: - dependency: "direct dev" + dependency: "direct overridden" description: name: webcrypto - sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1" + sha256: "9885ed99a846191542dd6ca820c83a098117df56be57453832233a3fef68f3f2" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" webkit_inspection_protocol: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9159199..7f9a9d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,6 +19,8 @@ environment: sdk: 3.13.0 dependency_overrides: + webcrypto: 0.6.1 + hooks: 2.2.0 dynamic_color: 2.1.0 path_provider_android: 2.2.23 # Pinned to avoid JNI linkify: @@ -52,7 +54,7 @@ dependencies: dynamic_polls: 0.0.8 flutter_hooks: 0.21.3+1 ffi: 2.2.0 - hooks: ^2.2.0 + hooks: 2.2.0 code_assets: 1.2.1 ffigen: 21.0.0 timeago: 3.7.1 @@ -85,7 +87,6 @@ dependencies: dev_dependencies: build_runner: 2.16.0 flutter_lints: 6.0.0 - webcrypto: 0.6.0 freezed: 4.0.0 riverpod_lint: 3.1.8 flutter_launcher_icons: 0.14.4 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 5d2b53e..0694802 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -13,7 +13,6 @@ #include #include #include -#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -31,8 +30,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); - WebcryptoPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("WebcryptoPlugin")); WindowManagerPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 51af01c..238ef93 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_windows url_launcher_windows - webcrypto window_manager ) From 2beb6dcb9b6b1ccb88028efc36227432b95d25b4 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 26 Aug 2026 00:25:47 -0400 Subject: [PATCH 07/14] send notifications natively --- README.md | 6 ++ android/app/build.gradle.kts | 10 +- ios/Runner/AppDelegate.swift | 3 +- lib/controllers/notifications.dart | 97 +++++++++++++++++++ lib/controllers/settings_sections.dart | 24 ++++- lib/controllers/unified_push.dart | 24 ++++- lib/main.dart | 2 + linux/flutter/generated_plugin_registrant.cc | 4 + linux/flutter/generated_plugins.cmake | 1 + macos/Flutter/GeneratedPluginRegistrant.swift | 4 + pubspec.lock | 70 +++++++++---- pubspec.yaml | 5 +- .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 2 + 14 files changed, 225 insertions(+), 30 deletions(-) create mode 100644 lib/controllers/notifications.dart diff --git a/README.md b/README.md index 0c18acf..ee55903 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,12 @@ dart scripts/generate.dart > export CPATH="$(clang -v 2>&1 | grep "Selected GCC installation" | rev | cut -d' ' -f1 | rev)/include" > ``` +Build webcrypto: + +```sh +flutter pub run webcrypto:setup +``` + Build generated files, and watch for new changes: ```sh diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 9f9a087..9c0d96c 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -20,16 +20,21 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 } defaultConfig { applicationId = "nexus.federated.nexus" - minSdk = 29 + + minSdk = 29 targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode versionName = flutter.versionName + + multiDexEnabled = true } signingConfigs { @@ -65,6 +70,7 @@ android { dependencies { implementation("org.unifiedpush.android:embedded-fcm-distributor:3.1.0") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") } kotlin { diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index c30b367..c73d4ae 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -7,7 +7,8 @@ import UIKit _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - return super.application(application, didFinishLaunchingWithOptions: launchOptions) + UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate + return super.application(application, didFinishLaunchingWithOptions: launchOptions) } func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { diff --git a/lib/controllers/notifications.dart b/lib/controllers/notifications.dart new file mode 100644 index 0000000..faf5e8c --- /dev/null +++ b/lib/controllers/notifications.dart @@ -0,0 +1,97 @@ +import "dart:io"; + +import "package:flutter_local_notifications/flutter_local_notifications.dart"; +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class NotificationsController + extends AsyncNotifier { + @override + Future build() async { + final notifications = FlutterLocalNotificationsPlugin(); + + final darwin = DarwinInitializationSettings(); + + await notifications.initialize( + settings: .new( + windows: .new( + appName: "Nexus", + appUserModelId: "nexus.federated.nexus", + guid: "dde78daf-130f-4e46-a80a-e31deeab45d7", + ), + android: .new("ic_launcher"), + iOS: darwin, + macOS: darwin, + linux: .new(defaultActionName: "Open"), + ), + onDidReceiveNotificationResponse: (details) { + print(details.data); + }, + ); + + return notifications; + } + + Future requestPermissions() async { + final controller = await future; + + if (Platform.isIOS) { + return await controller + .resolvePlatformSpecificImplementation< + IOSFlutterLocalNotificationsPlugin + >() + ?.requestPermissions(alert: true, badge: true, sound: true) ?? + true; + } else if (Platform.isMacOS) { + return await controller + .resolvePlatformSpecificImplementation< + MacOSFlutterLocalNotificationsPlugin + >() + ?.requestPermissions(alert: true, badge: true, sound: true) ?? + true; + } else if (Platform.isAndroid) { + return await controller + .resolvePlatformSpecificImplementation< + AndroidFlutterLocalNotificationsPlugin + >() + ?.requestNotificationsPermission() ?? + true; + } + + return true; + } + + Future send({ + required int id, + required String title, + String? body, + File? icon, + String? payload, + }) async { + final notificationDetails = NotificationDetails( + android: .new( + "messages", + "Messages", + largeIcon: icon == null ? null : FilePathAndroidBitmap(icon.path), + ), + iOS: .new(), + macOS: .new(), + linux: .new(icon: icon == null ? null : FilePathLinuxIcon(icon.path)), + windows: .new(), + ); + + final controller = await future; + await controller.show( + id: id, + title: title, + body: body, + notificationDetails: notificationDetails, + payload: payload, + ); + } + + static final provider = + AsyncNotifierProvider< + NotificationsController, + FlutterLocalNotificationsPlugin + >(NotificationsController.new); +} diff --git a/lib/controllers/settings_sections.dart b/lib/controllers/settings_sections.dart index 8d67435..35753fe 100644 --- a/lib/controllers/settings_sections.dart +++ b/lib/controllers/settings_sections.dart @@ -8,6 +8,7 @@ import "package:m3e_buttons/m3e_buttons.dart"; import "package:nexus/controllers/account_data.dart"; import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; +import "package:nexus/controllers/notifications.dart"; import "package:nexus/controllers/settings.dart"; import "package:nexus/controllers/unified_push.dart"; import "package:nexus/controllers/spec_versions.dart"; @@ -132,17 +133,30 @@ class SettingsSectionsController orElse: () => false, ) ? pusherRegistered.maybeWhen( - data: (_) => - (value) => value - ? ref + data: (_) => (value) async { + if (value) { + if (await ref + .watch( + NotificationsController + .provider + .notifier, + ) + .requestPermissions()) { + ref .watch( UnifiedPushController .provider .notifier, ) .register() - .onError(showError) - : /*deregeister*/ null, + .onError(showError); + } else { + // TODO: Handle not granted + } + } else { + // TODO: Deregister + } + }, orElse: () => null, ) : null, diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index f72e8ec..c4d32ac 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -3,9 +3,12 @@ import "dart:io"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:intl/intl.dart"; +import "package:nexus/controllers/notifications.dart"; +import "package:nexus/controllers/rooms.dart"; import "package:nexus/main.dart"; import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; +import "package:nexus/models/content/message.dart"; import "package:nexus/models/requests/register_pusher.dart"; import "package:unifiedpush/unifiedpush.dart"; import "package:unifiedpush_storage_shared_preferences/storage.dart"; @@ -38,10 +41,29 @@ class UnifiedPushController extends AsyncNotifier { ); }, onMessage: (message, instance) async { + if (message.decrypted == false) { + // TODO: Handle more gracefully, show option to re-register pusher + throw Exception("Failed to decrypt notification"); + } final event = await client.handlePush( json.decode(String.fromCharCodes(message.content)), ); - print(event); + + final room = ref.read( + RoomsController.provider.select((rooms) => rooms[event.roomId]), + ); + + await ref + .read(NotificationsController.provider.notifier) + .send( + id: event.eventId.hashCode & 0x7fffffff, + title: room?.metadata?.name ?? "New Message", + body: switch (event.content) { + MessageContent(:final body) => body, + // TODO: Handle more types + _ => null, + }, + ); }, onRegistrationFailed: (error, instance) => throw error, onUnregistered: (instance) => ref.invalidateSelf(), diff --git a/lib/main.dart b/lib/main.dart index 2221151..aaed5a0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,6 +8,7 @@ import "package:media_kit/media_kit.dart"; import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; import "package:nexus/controllers/multi_provider.dart"; +import "package:nexus/controllers/notifications.dart"; import "package:nexus/controllers/settings.dart"; import "package:nexus/controllers/shared_prefs.dart"; import "package:nexus/controllers/unified_push.dart"; @@ -146,6 +147,7 @@ class const App(final bool isInBackground, {super.key}) IListConst([ SharedPrefsController.provider, ClientController.provider, + NotificationsController.provider, UnifiedPushController.provider, ]), ), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 603ea6a..70d9ba2 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -37,6 +38,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); + g_autoptr(FlPluginRegistrar) webcrypto_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WebcryptoPlugin"); + webcrypto_plugin_register_with_registrar(webcrypto_registrar); g_autoptr(FlPluginRegistrar) window_manager_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); window_manager_plugin_register_with_registrar(window_manager_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 7d8f046..1d53ad7 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_linux url_launcher_linux + webcrypto window_manager ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index f18d831..8b6bbb6 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,6 +8,7 @@ import Foundation import app_links import dynamic_color import file_selector_macos +import flutter_local_notifications import media_kit_libs_macos_video import media_kit_video import package_info_plus @@ -15,12 +16,14 @@ import screen_retriever_macos import shared_preferences_foundation import url_launcher_macos import wakelock_plus +import webcrypto import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) + FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin")) MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) @@ -28,5 +31,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) + WebcryptoPlugin.register(with: registry.registrar(forPlugin: "WebcryptoPlugin")) WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 6f957d9..9f951f3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -169,14 +169,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.2" - change_case: - dependency: transitive - description: - name: change_case - sha256: e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003 - url: "https://pub.dev" - source: hosted - version: "2.2.0" characters: dependency: transitive description: @@ -519,6 +511,46 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.0" + flutter_local_notifications: + dependency: "direct main" + description: + name: flutter_local_notifications + sha256: "1447ba911c60f2ba3f25dae1af151ec187162566b0f57e37771bf0b400f013ad" + url: "https://pub.dev" + source: hosted + version: "22.3.0" + flutter_local_notifications_linux: + dependency: transitive + description: + name: flutter_local_notifications_linux + sha256: "9ca97e63776f29ab1b955725c09999fc2c150523269db150c39274f2a43c5a8b" + url: "https://pub.dev" + source: hosted + version: "8.0.1" + flutter_local_notifications_platform_interface: + dependency: transitive + description: + name: flutter_local_notifications_platform_interface + sha256: "43c3761d916c9bd3d5c7ebbc44d82f4990329840c0c5d62ad5260cc1b5d399bd" + url: "https://pub.dev" + source: hosted + version: "12.2.0" + flutter_local_notifications_web: + dependency: transitive + description: + name: flutter_local_notifications_web + sha256: "516afaf97a2d1e67a036c6617321b00d205d72f7a67b6eccf936cd565f985878" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_local_notifications_windows: + dependency: transitive + description: + name: flutter_local_notifications_windows + sha256: "6f43bdd03b171b7a90f22647506fea33e2bb12294b7c7c7a3d690e960a382945" + url: "https://pub.dev" + source: hosted + version: "3.1.1" flutter_localizations: dependency: "direct main" description: flutter @@ -1007,14 +1039,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.3" - native_toolchain_cmake: - dependency: transitive - description: - name: native_toolchain_cmake - sha256: de90e8952bad0684bdcff4d674c53d961f5cd1fdcf3a0255a669a35986c4ac1d - url: "https://pub.dev" - source: hosted - version: "0.2.7" navigation_rail_m3e: dependency: "direct main" description: @@ -1517,6 +1541,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.7.1" + timezone: + dependency: transitive + description: + name: timezone + sha256: "981d1020d6ef8fe1e7b3de5054e5b25579ae7c403d7734adc508ffc47668e9cb" + url: "https://pub.dev" + source: hosted + version: "0.11.1" typed_data: dependency: transitive description: @@ -1750,13 +1782,13 @@ packages: source: hosted version: "3.0.3" webcrypto: - dependency: "direct overridden" + dependency: "direct dev" description: name: webcrypto - sha256: "9885ed99a846191542dd6ca820c83a098117df56be57453832233a3fef68f3f2" + sha256: "6b43001c4110856ff7fa5e5e65e7b2d44bec1d8b54a4d84d5fa2c7622267c5c1" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" webkit_inspection_protocol: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7f9a9d0..79a3378 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,8 +19,6 @@ environment: sdk: 3.13.0 dependency_overrides: - webcrypto: 0.6.1 - hooks: 2.2.0 dynamic_color: 2.1.0 path_provider_android: 2.2.23 # Pinned to avoid JNI linkify: @@ -83,6 +81,7 @@ dependencies: material_ui: 1.1.0 unifiedpush: 6.2.0 unifiedpush_storage_shared_preferences: 1.0.0 + flutter_local_notifications: ^22.3.0 dev_dependencies: build_runner: 2.16.0 @@ -91,6 +90,8 @@ dev_dependencies: riverpod_lint: 3.1.8 flutter_launcher_icons: 0.14.4 json_serializable: 6.14.1 + # Transitive dep but needed for commands + webcrypto: any flutter_launcher_icons: image_path: assets/icon.png diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 0694802..5d2b53e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -30,6 +31,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); + WebcryptoPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WebcryptoPlugin")); WindowManagerPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 238ef93..c74b2f5 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -10,10 +10,12 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_windows url_launcher_windows + webcrypto window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + flutter_local_notifications_windows ) set(PLUGIN_BUNDLED_LIBRARIES) From 74207e405bc37c1adb1486ec036bb1840ee99748 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 26 Aug 2026 00:46:57 -0400 Subject: [PATCH 08/14] include avatars on notifs --- lib/controllers/notifications.dart | 13 ++++++++++++- lib/controllers/unified_push.dart | 8 ++++++++ pubspec.lock | 2 +- pubspec.yaml | 3 ++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/controllers/notifications.dart b/lib/controllers/notifications.dart index faf5e8c..2109cb7 100644 --- a/lib/controllers/notifications.dart +++ b/lib/controllers/notifications.dart @@ -1,6 +1,8 @@ import "dart:io"; import "package:flutter_local_notifications/flutter_local_notifications.dart"; +// ignore: implementation_imports +import "package:flutter_local_notifications_linux/src/model/hint.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; class NotificationsController @@ -75,7 +77,16 @@ class NotificationsController ), iOS: .new(), macOS: .new(), - linux: .new(icon: icon == null ? null : FilePathLinuxIcon(icon.path)), + linux: .new( + customHints: icon == null + ? null + : [ + .new( + name: "image-path", + value: LinuxHintStringValue(icon.path), + ), + ], + ), windows: .new(), ); diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index c4d32ac..0698bda 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -53,11 +53,19 @@ class UnifiedPushController extends AsyncNotifier { RoomsController.provider.select((rooms) => rooms[event.roomId]), ); + final avatar = room?.metadata?.avatar; + final icon = avatar == null + ? null + : await ref + .read(ClientController.provider.notifier) + .downloadMedia(.new(mxc: avatar, isAvatar: true)); + await ref .read(NotificationsController.provider.notifier) .send( id: event.eventId.hashCode & 0x7fffffff, title: room?.metadata?.name ?? "New Message", + icon: icon, body: switch (event.content) { MessageContent(:final body) => body, // TODO: Handle more types diff --git a/pubspec.lock b/pubspec.lock index 9f951f3..5f85f85 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -520,7 +520,7 @@ packages: source: hosted version: "22.3.0" flutter_local_notifications_linux: - dependency: transitive + dependency: "direct main" description: name: flutter_local_notifications_linux sha256: "9ca97e63776f29ab1b955725c09999fc2c150523269db150c39274f2a43c5a8b" diff --git a/pubspec.yaml b/pubspec.yaml index 79a3378..de72e0e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -81,7 +81,8 @@ dependencies: material_ui: 1.1.0 unifiedpush: 6.2.0 unifiedpush_storage_shared_preferences: 1.0.0 - flutter_local_notifications: ^22.3.0 + flutter_local_notifications: 22.3.0 + flutter_local_notifications_linux: 8.0.1 dev_dependencies: build_runner: 2.16.0 From 0122feae1d1ae1cca0ab959a0b7356346c5693ef Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 26 Aug 2026 11:55:20 -0400 Subject: [PATCH 09/14] smarter notif logic --- lib/controllers/notifications.dart | 13 +++++-- lib/controllers/unified_push.dart | 58 +++++++++++++++++++----------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/lib/controllers/notifications.dart b/lib/controllers/notifications.dart index 2109cb7..d9bcd8f 100644 --- a/lib/controllers/notifications.dart +++ b/lib/controllers/notifications.dart @@ -1,9 +1,11 @@ +import "dart:convert"; import "dart:io"; import "package:flutter_local_notifications/flutter_local_notifications.dart"; // ignore: implementation_imports import "package:flutter_local_notifications_linux/src/model/hint.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; +import "package:nexus/controllers/event.dart"; class NotificationsController extends AsyncNotifier { @@ -26,7 +28,11 @@ class NotificationsController linux: .new(defaultActionName: "Open"), ), onDidReceiveNotificationResponse: (details) { - print(details.data); + if (details.payload case final payload?) { + final event = ref.watch( + EventController.provider(.fromJson(json.decode(payload))), + ); + } }, ); @@ -75,8 +81,6 @@ class NotificationsController "Messages", largeIcon: icon == null ? null : FilePathAndroidBitmap(icon.path), ), - iOS: .new(), - macOS: .new(), linux: .new( customHints: icon == null ? null @@ -87,6 +91,9 @@ class NotificationsController ), ], ), + // TODO: See if icons can be added to iOS, macOS, and Windows notifications (#68) + iOS: .new(), + macOS: .new(), windows: .new(), ); diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index 0698bda..1e90114 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -3,15 +3,19 @@ import "dart:io"; import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:intl/intl.dart"; +import "package:nexus/controllers/key.dart"; import "package:nexus/controllers/notifications.dart"; import "package:nexus/controllers/rooms.dart"; import "package:nexus/main.dart"; import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; import "package:nexus/models/content/message.dart"; +import "package:nexus/models/content/sticker.dart"; +import "package:nexus/models/requests/get_event.dart"; import "package:nexus/models/requests/register_pusher.dart"; import "package:unifiedpush/unifiedpush.dart"; import "package:unifiedpush_storage_shared_preferences/storage.dart"; +import "package:window_manager/window_manager.dart"; class UnifiedPushController extends AsyncNotifier { @override @@ -23,32 +27,39 @@ class UnifiedPushController extends AsyncNotifier { storage: UnifiedPushStorageSharedPreferences(), background: isInBackground, ), - onNewEndpoint: (endpoint, instance) async { - await client.registerPusher( - .new( - appDisplayName: "Nexus", - appId: "nexus.federated.nexus", - data: PusherData.webPush( - url: Uri.parse(endpoint.url), - auth: endpoint.pubKeySet!.auth, - ), - deviceDisplayName: - "Nexus on ${toBeginningOfSentenceCase(Platform.operatingSystem)}", - kind: .webPush, - lang: "en", - pushKey: endpoint.pubKeySet!.pubKey, + onNewEndpoint: (endpoint, instance) => client.registerPusher( + .new( + appDisplayName: "Nexus", + appId: "nexus.federated.nexus", + data: PusherData.webPush( + url: Uri.parse(endpoint.url), + auth: endpoint.pubKeySet!.auth, ), - ); - }, + deviceDisplayName: + "Nexus on ${toBeginningOfSentenceCase(Platform.operatingSystem)}", + kind: .webPush, + lang: "en", + pushKey: endpoint.pubKeySet!.pubKey, + ), + ), onMessage: (message, instance) async { if (message.decrypted == false) { - // TODO: Handle more gracefully, show option to re-register pusher - throw Exception("Failed to decrypt notification"); + throw Exception( + "Failed to decrypt notification. Try toggling off and on UnifiedPush in settings.", + ); } final event = await client.handlePush( json.decode(String.fromCharCodes(message.content)), ); + if (event.unreadType?.shouldNotify != true || + (!isInBackground && + await windowManager.isFocused() && + ref.watch(KeyController.provider(KeyController.roomKey)) == + event.roomId)) { + return; + } + final room = ref.read( RoomsController.provider.select((rooms) => rooms[event.roomId]), ); @@ -64,14 +75,19 @@ class UnifiedPushController extends AsyncNotifier { .read(NotificationsController.provider.notifier) .send( id: event.eventId.hashCode & 0x7fffffff, - title: room?.metadata?.name ?? "New Message", + title: room?.metadata?.name ?? "New Event", icon: icon, + payload: json.encode( + GetEventRequest(eventId: event.eventId, roomId: event.roomId), + ), body: switch (event.content) { - MessageContent(:final body) => body, - // TODO: Handle more types + MessageContent(:final body?) || + StickerContent(:final body) => body, _ => null, }, ); + + if (isInBackground) exit(0); }, onRegistrationFailed: (error, instance) => throw error, onUnregistered: (instance) => ref.invalidateSelf(), From 129f0794f22cd935644cd42a1c0979175c41c90c Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 26 Aug 2026 16:27:43 -0400 Subject: [PATCH 10/14] add wip deregistering --- lib/controllers/client.dart | 17 ++++-- lib/controllers/notifications.dart | 19 ++++--- lib/controllers/settings_sections.dart | 60 ++++++++++++++-------- lib/controllers/unified_push.dart | 28 +++++++--- lib/models/requests/deregister_pusher.dart | 13 +++++ lib/pages/notifications.dart | 14 +++++ lib/widgets/appbar.dart | 2 +- 7 files changed, 113 insertions(+), 40 deletions(-) create mode 100644 lib/models/requests/deregister_pusher.dart create mode 100644 lib/pages/notifications.dart diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart index 20a3954..60ab6ce 100644 --- a/lib/controllers/client.dart +++ b/lib/controllers/client.dart @@ -22,6 +22,7 @@ import "package:nexus/models/event.dart"; import "package:nexus/models/oauth_auth_code_response.dart"; import "package:nexus/models/open_graph_data.dart"; import "package:nexus/models/paginate.dart"; +import "package:nexus/models/requests/deregister_pusher.dart"; import "package:nexus/models/requests/download_media.dart"; import "package:nexus/models/requests/get_event.dart"; import "package:nexus/models/requests/get_related_events.dart"; @@ -178,12 +179,14 @@ class ClientController extends AsyncNotifier { return json; } - Future handlePush(Map data) async => .fromJson( - await callGomuksMethod( + Future handlePush(Map data) async { + final response = await callGomuksMethod( data, (handle, data) async => GomuksHandlePush(handle, data), - ), - ); + ); + + return response == null ? null : .fromJson(response); + } Future _sendCommand( String command, [ @@ -293,6 +296,12 @@ class ClientController extends AsyncNotifier { Future registerPusher(RegisterPusherRequest request) => _sendCommand("register_homeserver_push", request.toJson()); + Future deregisterPusher(DeregisterPusherRequest request) => + _sendCommand("register_homeserver_push", { + ...request.toJson(), + "kind": null, + }); + Future uploadMedia(UploadMediaRequest request) async => .fromJson(await _sendCommand("upload_media", request.toJson())); diff --git a/lib/controllers/notifications.dart b/lib/controllers/notifications.dart index d9bcd8f..bd80467 100644 --- a/lib/controllers/notifications.dart +++ b/lib/controllers/notifications.dart @@ -1,11 +1,12 @@ -import "dart:convert"; import "dart:io"; +import "package:material_ui/material_ui.dart"; +import "package:nexus/main.dart"; import "package:flutter_local_notifications/flutter_local_notifications.dart"; // ignore: implementation_imports import "package:flutter_local_notifications_linux/src/model/hint.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/event.dart"; +import "package:nexus/pages/notifications.dart"; class NotificationsController extends AsyncNotifier { @@ -22,16 +23,20 @@ class NotificationsController appUserModelId: "nexus.federated.nexus", guid: "dde78daf-130f-4e46-a80a-e31deeab45d7", ), - android: .new("ic_launcher"), + android: .new("ic_launcher_foreground"), iOS: darwin, macOS: darwin, linux: .new(defaultActionName: "Open"), ), onDidReceiveNotificationResponse: (details) { - if (details.payload case final payload?) { - final event = ref.watch( - EventController.provider(.fromJson(json.decode(payload))), - ); + if (details.payload case final eventId?) { + if (navigatorKey.currentContext case final context?) { + Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => NotificationsPage(eventId: eventId), + ), + ); + } } }, ); diff --git a/lib/controllers/settings_sections.dart b/lib/controllers/settings_sections.dart index 35753fe..1e60263 100644 --- a/lib/controllers/settings_sections.dart +++ b/lib/controllers/settings_sections.dart @@ -1,8 +1,9 @@ import "dart:io"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; +import "package:flutter_hooks/flutter_hooks.dart"; +import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:material_ui/material_ui.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:intl/intl.dart"; import "package:m3e_buttons/m3e_buttons.dart"; import "package:nexus/controllers/account_data.dart"; @@ -105,14 +106,16 @@ class SettingsSectionsController .new( title: "Push notifications", description: "Enable push notifications using Web Push", - builder: (title, description, icon) => Consumer( + builder: (title, description, icon) => HookConsumer( builder: (context, ref, _) { + final loading = useState(false); final pusherRegistered = ref.watch( UnifiedPushController.provider, ); final unifiedPushAllowed = ref.watch( UnifiedPushAllowedController.provider, ); + return SwitchListTile( title: Text(title), subtitle: Text( @@ -127,34 +130,47 @@ class SettingsSectionsController data: (value) => value, orElse: () => false, ), - onChanged: - unifiedPushAllowed.maybeWhen( - data: (data) => data == null, - orElse: () => false, - ) + onChanged: loading.value + ? null + : unifiedPushAllowed.maybeWhen( + data: (data) => data == null, + orElse: () => false, + ) ? pusherRegistered.maybeWhen( data: (_) => (value) async { - if (value) { - if (await ref - .watch( - NotificationsController - .provider - .notifier, - ) - .requestPermissions()) { - ref + try { + loading.value = true; + if (value) { + if (await ref + .watch( + NotificationsController + .provider + .notifier, + ) + .requestPermissions()) { + await ref + .watch( + UnifiedPushController + .provider + .notifier, + ) + .register(); + } else { + // TODO: Handle not granted + } + } else { + await ref .watch( UnifiedPushController .provider .notifier, ) - .register() - .onError(showError); - } else { - // TODO: Handle not granted + .deregister(); } - } else { - // TODO: Deregister + } catch (error, stackTrace) { + showError(error, stackTrace); + } finally { + loading.value = false; } }, orElse: () => null, diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index 1e90114..f9d8f8f 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -11,7 +11,6 @@ import "package:nexus/controllers/client.dart"; import "package:nexus/controllers/client_state.dart"; import "package:nexus/models/content/message.dart"; import "package:nexus/models/content/sticker.dart"; -import "package:nexus/models/requests/get_event.dart"; import "package:nexus/models/requests/register_pusher.dart"; import "package:unifiedpush/unifiedpush.dart"; import "package:unifiedpush_storage_shared_preferences/storage.dart"; @@ -52,9 +51,10 @@ class UnifiedPushController extends AsyncNotifier { json.decode(String.fromCharCodes(message.content)), ); - if (event.unreadType?.shouldNotify != true || + if (event == null || + event.unreadType?.shouldNotify != true || (!isInBackground && - await windowManager.isFocused() && + await windowManager.isFocused().onError((_, _) => false) && ref.watch(KeyController.provider(KeyController.roomKey)) == event.roomId)) { return; @@ -77,9 +77,7 @@ class UnifiedPushController extends AsyncNotifier { id: event.eventId.hashCode & 0x7fffffff, title: room?.metadata?.name ?? "New Event", icon: icon, - payload: json.encode( - GetEventRequest(eventId: event.eventId, roomId: event.roomId), - ), + payload: event.eventId, body: switch (event.content) { MessageContent(:final body?) || StickerContent(:final body) => body, @@ -128,6 +126,24 @@ class UnifiedPushController extends AsyncNotifier { if (!alreadyRegistered) ref.invalidateSelf(); } + Future deregister() async { + final clientState = ref.watch(ClientStateController.provider); + final key = await UnifiedPushStorageSharedPreferences().keys.get( + clientState!.deviceId!, + ); + + if (key == null) return; + + await ref + .watch(ClientController.provider.notifier) + .deregisterPusher( + .new(appId: "nexus.federated.nexus", pushKey: key.split("=").first), + ); + + await UnifiedPush.unregister(clientState.deviceId!); + ref.invalidateSelf(); + } + static final provider = AsyncNotifierProvider( UnifiedPushController.new, ); diff --git a/lib/models/requests/deregister_pusher.dart b/lib/models/requests/deregister_pusher.dart new file mode 100644 index 0000000..1416add --- /dev/null +++ b/lib/models/requests/deregister_pusher.dart @@ -0,0 +1,13 @@ +import "package:freezed_annotation/freezed_annotation.dart"; + +part "deregister_pusher.freezed.dart"; +part "deregister_pusher.g.dart"; + +@Freezed(toJson: false, fromJson: false) +@JsonSerializable() +class const DeregisterPusherRequest({ + required final String appId, + @JsonKey(name: "pushkey") required final String pushKey, +}) with _$DeregisterPusherRequest { + Map toJson() => _$DeregisterPusherRequestToJson(this); +} diff --git a/lib/pages/notifications.dart b/lib/pages/notifications.dart new file mode 100644 index 0000000..ceca514 --- /dev/null +++ b/lib/pages/notifications.dart @@ -0,0 +1,14 @@ +import "package:material_ui/material_ui.dart"; +import "package:hooks_riverpod/hooks_riverpod.dart"; +import "package:nexus/widgets/appbar.dart"; + +class const NotificationsPage({final String? eventId, super.key}) + extends HookConsumerWidget { + @override + Widget build(BuildContext context, WidgetRef ref) { + return Scaffold( + appBar: Appbar(title: Text("Notifications")), + body: Placeholder(), + ); + } +} diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart index a6058ea..33727ac 100644 --- a/lib/widgets/appbar.dart +++ b/lib/widgets/appbar.dart @@ -39,7 +39,7 @@ final class const Appbar({ : (_) => windowManager.startDragging(), ), child: AppBar( - leading: InkWell(onTap: onTap, child: leading), + leading: leading == null ? null : InkWell(onTap: onTap, child: leading), backgroundColor: backgroundColor, scrolledUnderElevation: scrolledUnderElevation, actionsPadding: const .symmetric(horizontal: 8), From 4314c88d5c60a49c48a5b76c6ee3b5aab7d92ca1 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 9 Sep 2026 15:19:10 -0400 Subject: [PATCH 11/14] fallback to empty profile if fetch fails --- gomuks | 2 +- lib/controllers/client.dart | 10 ++++++++-- lib/models/profile_response.dart | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gomuks b/gomuks index 9444dd2..0e06c7b 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 9444dd293664c300c6e710bb6cddcd9c6cab365d +Subproject commit 0e06c7b74f96d3e29a8101893ca1921d13a90573 diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart index b7d1eb4..af44d2f 100644 --- a/lib/controllers/client.dart +++ b/lib/controllers/client.dart @@ -2,6 +2,7 @@ import "dart:ffi"; import "dart:io"; import "dart:isolate"; import "dart:math"; + import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:ffi/ffi.dart"; import "package:flutter/foundation.dart"; @@ -261,8 +262,13 @@ class ClientController extends AsyncNotifier { Future paginate(PaginateRequest request) async => .fromJson(await _sendCommand("paginate", request.toJson())); - Future getProfile(String userId) async => - .fromJson(await _sendCommand("get_profile", {"user_id": userId})); + Future getProfile(String userId) async { + try { + return .fromJson(await _sendCommand("get_profile", {"user_id": userId})); + } catch (_) { + return ProfileResponse(profile: .new(id: userId)); + } + } Future reportEvent(ReportRequest request) => _sendCommand("report_event", request.toJson()); diff --git a/lib/models/profile_response.dart b/lib/models/profile_response.dart index 8984bcf..fcaaf2e 100644 --- a/lib/models/profile_response.dart +++ b/lib/models/profile_response.dart @@ -9,7 +9,7 @@ part "profile_response.g.dart"; @JsonSerializable() class const ProfileResponse({ @JsonKey(fromJson: Profile.fromJson) required final Profile profile, - required final Bio? bio, + final Bio? bio, }) with _$ProfileResponse { Map toJson() => _$ProfileResponseToJson(this); From 0201f71e5dcf9c5c1dbeca8a7a325f669a11f8ec Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 9 Sep 2026 15:26:04 -0400 Subject: [PATCH 12/14] allow banning left users --- lib/widgets/user_bottom_sheet.dart | 43 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/lib/widgets/user_bottom_sheet.dart b/lib/widgets/user_bottom_sheet.dart index a725613..feeb5a1 100644 --- a/lib/widgets/user_bottom_sheet.dart +++ b/lib/widgets/user_bottom_sheet.dart @@ -200,36 +200,35 @@ final class const UserBottomSheet( ), if (ref.watch( - PowerLevelController.provider( - .membershipAction( - action: .kick, - roomId: roomId!, - targetUser: userId, - ), - ), - ) && - member.status == .join || - member.status == .invite) + PowerLevelController.provider( + .membershipAction( + action: .kick, + roomId: roomId!, + targetUser: userId, + ), + ), + )) Padding( padding: .only(top: 4), child: Row( mainAxisSize: MainAxisSize.max, spacing: 8, children: [ - M3EButton.icon( - onPressed: () => showMembershipDialog(.kick), - shape: .square, - icon: Icon(Icons.sports_martial_arts), - label: Text("Kick"), - decoration: .new( - backgroundColor: WidgetStatePropertyAll( - theme.colorScheme.error, - ), - foregroundColor: WidgetStatePropertyAll( - theme.colorScheme.onError, + if (member.status == .join || member.status == .invite) + M3EButton.icon( + onPressed: () => showMembershipDialog(.kick), + shape: .square, + icon: Icon(Icons.sports_martial_arts), + label: Text("Kick"), + decoration: .new( + backgroundColor: WidgetStatePropertyAll( + theme.colorScheme.error, + ), + foregroundColor: WidgetStatePropertyAll( + theme.colorScheme.onError, + ), ), ), - ), M3EButton.icon( onPressed: () => showMembershipDialog(.ban), From da352cd035e0097ad6856f312fa4949467dccc11 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 9 Sep 2026 15:37:41 -0400 Subject: [PATCH 13/14] cap max length of embeds --- lib/widgets/url_preview.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/widgets/url_preview.dart b/lib/widgets/url_preview.dart index 37a2733..5eda427 100644 --- a/lib/widgets/url_preview.dart +++ b/lib/widgets/url_preview.dart @@ -31,9 +31,15 @@ class const UrlPreview(final Uri link, {super.key}) extends ConsumerWidget { Text( preview.title!, style: Theme.of(context).textTheme.titleLarge, + maxLines: 3, + overflow: .ellipsis, ), if (preview.description != null) ...[ - Text(preview.description!), + Text( + preview.description!, + maxLines: 20, + overflow: .ellipsis, + ), SizedBox(height: 4), ], if (preview.imageUrl != null) From 0a667fda0bc99c8d725c4d4c0175caab6bcb6eee Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 9 Sep 2026 15:44:25 -0400 Subject: [PATCH 14/14] update gomuks vendorHash --- linux/nix/pkg/gomuks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/nix/pkg/gomuks.nix b/linux/nix/pkg/gomuks.nix index ffa9d7c..0516f31 100644 --- a/linux/nix/pkg/gomuks.nix +++ b/linux/nix/pkg/gomuks.nix @@ -17,7 +17,7 @@ buildGoModule ( src = "${src}/gomuks"; - vendorHash = "sha256-C03ss88QAnmZu+XxoHhc1M/261xFl8hR/pzLbU37Qe8="; + vendorHash = "sha256-9CS/lAVT8gLWACLomwcEa8YNlAXvBOskPPx4zERg0wQ="; buildPhase = '' runHook preBuild