Merge pull request #143 from camelus-hq/chore-upgrade-packages

1-leo · web-flow · commit 10d9e371fe4c · 2025-11-21T18:08:54.000+01:00
Chore upgrade packages
diff --git a/apipod/apipod_client/pubspec.yaml b/apipod/apipod_client/pubspec.yaml
@@ -6,7 +6,7 @@ environment:
 
 dependencies:
   serverpod_client: 2.8.0
-  ndk: ^0.5.1
+  ndk: ^0.6.0
 
 
 dependency_overrides:
diff --git a/lib/domain_layer/usecases/generate_private_key.dart b/lib/domain_layer/usecases/generate_private_key.dart
@@ -9,7 +9,10 @@ import '../entities/generated_private_key.dart';
 
 class GeneratePrivateKey {
   static GeneratedPrivateKey generateKey() {
-    final mnemonic = Mnemonic.generate(Language.english, entropyLength: 256);
+    final mnemonic = Mnemonic.generate(
+      Language.english,
+      length: MnemonicLength.words24,
+    );
 
     final sentence = mnemonic.sentence;
     final words = mnemonic.words;
diff --git a/lib/presentation_layer/components/edit_profile.dart b/lib/presentation_layer/components/edit_profile.dart
@@ -3,6 +3,7 @@ import 'dart:typed_data';
 import 'package:camelus/l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 import '../atoms/camer_upload.dart';
 import '../atoms/round_image_border.dart';
diff --git a/lib/presentation_layer/components/enable_notifications.dart b/lib/presentation_layer/components/enable_notifications.dart
@@ -7,6 +7,7 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 import '../atoms/spinner_center.dart';
 import '../providers/db_app_provider.dart';
diff --git a/lib/presentation_layer/components/note_card/post_content.dart b/lib/presentation_layer/components/note_card/post_content.dart
@@ -5,8 +5,10 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_link_previewer/flutter_link_previewer.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:go_router/go_router.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
+
 import 'package:url_launcher/url_launcher_string.dart';
 
 import '../../../domain_layer/entities/parsed_post.dart';
diff --git a/lib/presentation_layer/components/starter_packs/edit_starter_pack/edit_starter_pack_provider.dart b/lib/presentation_layer/components/starter_packs/edit_starter_pack/edit_starter_pack_provider.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:ndk/shared/nips/nip19/nip19.dart';
 
 import '../../../../data_layer/data_sources/serverpod_data_source.dart';
diff --git a/lib/presentation_layer/components/starter_packs/trending_starter_packs/trending_starter_packs_state_provider.dart b/lib/presentation_layer/components/starter_packs/trending_starter_packs/trending_starter_packs_state_provider.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:camelus/presentation_layer/providers/ndk_provider.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:ndk/ndk.dart';
-import 'package:riverpod/riverpod.dart';
 
 import '../../../../data_layer/models/nostr_lists_model.dart';
 import '../../../../domain_layer/entities/nostr_list.dart';
diff --git a/lib/presentation_layer/components/video/video_player_state_provider.dart b/lib/presentation_layer/components/video/video_player_state_provider.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:ndk/ndk.dart';
 import 'package:video_player/video_player.dart';
 
diff --git a/lib/presentation_layer/components/write_post/post_settings_dialog.dart b/lib/presentation_layer/components/write_post/post_settings_dialog.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:flutter/material.dart';
 import 'package:camelus/l10n/app_localizations.dart';
 
diff --git a/lib/presentation_layer/providers/app_bar_provider/app_bottom_bar_provider.dart b/lib/presentation_layer/providers/app_bar_provider/app_bottom_bar_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'dart:async';
 
 enum NavigationTab { home, search, notifications, chat }
diff --git a/lib/presentation_layer/providers/db_ndk_provider.dart b/lib/presentation_layer/providers/db_ndk_provider.dart
@@ -1,5 +1,5 @@
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:ndk/ndk.dart';
-import 'package:riverpod/riverpod.dart';
 
 final dbNdkProvider = StateNotifierProvider<DbProviderNotifier, CacheManager?>((
   ref,
diff --git a/lib/presentation_layer/providers/event_feed/event_feed_provider.dart b/lib/presentation_layer/providers/event_feed/event_feed_provider.dart
@@ -18,8 +18,10 @@ final eventFeedStateProvider = NotifierProvider.autoDispose
 
 /// The [EventFeedState] class is a state notifier for managing the feed state of an event.
 /// It handles fetching, updating and cleaning up the data for a root note and its comments.
-class EventFeedState
-    extends AutoDisposeFamilyNotifier<FeedEventViewModel, String> {
+class EventFeedState extends Notifier<FeedEventViewModel> {
+  final String rootEventId;
+  EventFeedState(this.rootEventId);
+
   // Stream subscriptions for root note and comment notes.
   StreamSubscription? _rootNoteSub;
   StreamSubscription? _commentNotesSub;
@@ -28,13 +30,6 @@ class EventFeedState
 
   /// Resets the state and disposes of active resources like stream subscriptions.
   Future<void> resetStateDispose() async {
-    // Resets the state to an empty FeedEventViewModel.
-    state = FeedEventViewModel(
-      comments: [],
-      unprocessedCommentsSet: {},
-      rootNote: null,
-    );
-
     // Cancels the subscriptions to the streams if active.
     _commentNotesSub?.cancel();
     _rootNoteSub?.cancel();
@@ -46,17 +41,21 @@ class EventFeedState
 
   /// Called when the notifier is first built. Initializes the event feed and subscriptions.
   @override
-  FeedEventViewModel build(String arg) {
+  FeedEventViewModel build() {
+    final notesP = ref.read(getNotesProvider);
+
     /// auto dispose delay
     final link = ref.keepAlive();
     Timer? timer;
 
     ref.onCancel(() {
-      _cancelNewNotesSub();
+      notesP.closeSubscription("replies-sub-$threadId");
+
+      _commentNotesSub?.cancel();
       timer = Timer(Duration(minutes: 2), () => link.close());
     });
     ref.onResume(() {
-      _subNewNotes(arg);
+      _subNewNotes(rootEventId);
       timer?.cancel();
     });
 
@@ -67,7 +66,7 @@ class EventFeedState
     });
 
     // Performs the initial fetch for the root note and its replies.
-    _initialFetch(arg);
+    _initialFetch(rootEventId);
 
     // Returns the initial state of the event feed.
     return FeedEventViewModel(
@@ -78,7 +77,7 @@ class EventFeedState
   }
 
   /// Fetches the root note and its replies for the given rootNoteId.
-  _initialFetch(String rootNoteId) {
+  void _initialFetch(String rootNoteId) {
     final notesP = ref.watch(getNotesProvider);
     // Subscribes to updates for the root note.
 
@@ -118,7 +117,7 @@ class EventFeedState
   }
 
   /// Subcribes to new notes for the given root note ID.
-  _subNewNotes(String rootNoteId) {
+  void _subNewNotes(String rootNoteId) {
     final notesP = ref.watch(getNotesProvider);
     final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
 
@@ -153,11 +152,4 @@ class EventFeedState
           );
         });
   }
-
-  _cancelNewNotesSub() {
-    final notesP = ref.watch(getNotesProvider);
-    notesP.closeSubscription("replies-sub-$threadId");
-
-    _commentNotesSub?.cancel();
-  }
 }
diff --git a/lib/presentation_layer/providers/following_contact_state_provider.dart b/lib/presentation_layer/providers/following_contact_state_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:riverpod/riverpod.dart';
 import 'dart:async';
 
@@ -32,7 +33,7 @@ final contactListStateProvider =
 /// convenience provider
 final contactListSelfStateProvider = Provider<ContactListState>((ref) {
   final selfPubkey = ref.watch(ndkProvider).accounts.getPublicKey();
-  
+
   // If no pubkey (read-only mode), return empty contact list
   if (selfPubkey == null) {
     return ContactListState(
@@ -51,7 +52,7 @@ final contactListSelfStateProvider = Provider<ContactListState>((ref) {
       ),
     );
   }
-  
+
   return ref.watch(contactListStateProvider(selfPubkey));
 });
 
diff --git a/lib/presentation_layer/providers/generic_feed_provider.dart b/lib/presentation_layer/providers/generic_feed_provider.dart
@@ -15,27 +15,18 @@ final genericFeedStateProvider = NotifierProvider.autoDispose
     .family<GenericFeedState, FeedViewModel, FeedFilter>(GenericFeedState.new);
 
 // State management for a generic feed
-class GenericFeedState
-    extends AutoDisposeFamilyNotifier<FeedViewModel, FeedFilter> {
-  // Resets the state and disposes of active subscriptions
-  Future<void> _resetStateDispose() async {
-    final notesP = ref.watch(getNotesProvider);
-    await notesP.closeSubscription("sub-${arg.feedId}");
-    state = FeedViewModel(
-      timelineRootNotes: [],
-      newRootNotes: [],
-      timelineRootAndReplyNotes: [],
-      newRootAndReplyNotes: [],
-    );
-  }
+class GenericFeedState extends Notifier<FeedViewModel> {
+  final FeedFilter feedFilter;
+  GenericFeedState(this.feedFilter);
 
   @override
-  FeedViewModel build(FeedFilter arg) {
+  FeedViewModel build() {
+    final notesP = ref.read(getNotesProvider);
     // Ensures resources are cleaned up when provider is disposed
-    ref.onDispose(() {
-      _resetStateDispose();
+    ref.onDispose(() async {
+      await notesP.closeSubscription("sub-${feedFilter.feedId}");
     });
-    _setupSubscription(arg); // Initialize data subscription
+    _setupSubscription(feedFilter); // Initialize data subscription
     return FeedViewModel(
       timelineRootNotes: [],
       newRootNotes: [],
@@ -148,16 +139,20 @@ class GenericFeedState
 
   // Loads more notes for infinite scrolling
   Future<void> loadMore() async {
-    int cutoff = await _getCutoffTime(arg.feedId);
-    await _saveCutoffTime(arg.feedId);
+    int cutoff = await _getCutoffTime(feedFilter.feedId);
+    await _saveCutoffTime(feedFilter.feedId);
 
     if (state.timelineRootAndReplyNotes.isNotEmpty) {
       cutoff = state.timelineRootAndReplyNotes.last.created_at - 1;
     }
 
     final rootNotesBeforeCount = state.timelineRootNotes.length;
 
-    final networkNotesStream = _fetchNetworkNotes(arg, cutoff, limit: 20);
+    final networkNotesStream = _fetchNetworkNotes(
+      feedFilter,
+      cutoff,
+      limit: 20,
+    );
 
     networkNotesStream
         .bufferTime(const Duration(milliseconds: 100))
diff --git a/lib/presentation_layer/providers/language_provider.dart b/lib/presentation_layer/providers/language_provider.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 import '../../domain_layer/repositories/app_db.dart';
 import 'db_app_provider.dart';
diff --git a/lib/presentation_layer/providers/link_preview_state_provider.dart b/lib/presentation_layer/providers/link_preview_state_provider.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_chat_types/flutter_chat_types.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 final linkPreviewProvider = StateProvider.family<PreviewData?, String>(
   (ref, link) => null,
diff --git a/lib/presentation_layer/providers/metadata_state_provider.dart b/lib/presentation_layer/providers/metadata_state_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 import '../../domain_layer/entities/user_metadata.dart';
 import '../../domain_layer/usecases/get_user_metadata.dart';
diff --git a/lib/presentation_layer/providers/moderation/moderation_state_provider.dart b/lib/presentation_layer/providers/moderation/moderation_state_provider.dart
@@ -1,6 +1,8 @@
 import 'package:camelus/presentation_layer/providers/following_contact_state_provider.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'package:flutter_riverpod/legacy.dart';
+
 import '../ndk_provider.dart';
 
 class ModerationState {
@@ -37,7 +39,10 @@ class ModerationNotifier extends StateNotifier<ModerationState> {
     if (myUserPubkey == null) return;
 
     // Listen to contact changes
-    ref.listen(contactListStateProvider(myUserPubkey!), (previous, next) {
+    ref.listen<ContactListState>(contactListStateProvider(myUserPubkey!), (
+      previous,
+      next,
+    ) {
       _updateTrustedPubkeys(next);
     });
 
diff --git a/lib/presentation_layer/providers/nostr_lists_follow_state_provider.dart b/lib/presentation_layer/providers/nostr_lists_follow_state_provider.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:riverpod/riverpod.dart';
 import 'dart:async';
 
diff --git a/lib/presentation_layer/providers/notification_feed_provider.dart b/lib/presentation_layer/providers/notification_feed_provider.dart
@@ -17,28 +17,21 @@ final notificationsStateProvider =
       NotificationsState.new,
     );
 
-class NotificationsState extends FamilyNotifier<NotificationViewModel, String> {
+class NotificationsState extends Notifier<NotificationViewModel> {
+  final String userPubkey;
+  NotificationsState(this.userPubkey);
+
   static const String subscriptionId = "notifications-sub";
   static const String notificationCutoffKey = "notifications-cutoff";
 
-  Future<void> _resetStateDispose() async {
-    final notesP = ref.watch(getNotesProvider);
-    await notesP.closeSubscription(subscriptionId);
-    state = NotificationViewModel(
-      timelineNotifications: [],
-      newNotifications: [],
-    );
-  }
-
   @override
-  NotificationViewModel build(String arg) {
+  NotificationViewModel build() {
+    final notesP = ref.read(getNotesProvider);
     // Clean up when provider is disposed
-    ref.onDispose(() {
-      _resetStateDispose();
+    ref.onDispose(() async {
+      await notesP.closeSubscription(subscriptionId);
     });
 
-    final userPubkey = arg;
-
     _setupSubscription(userPubkey);
 
     return NotificationViewModel(
@@ -78,8 +71,6 @@ class NotificationsState extends FamilyNotifier<NotificationViewModel, String> {
 
   // Process incoming notifications
   Future<void> _processNewNotifications(List<NostrNote> notes) async {
-    final userPubkey = arg;
-
     // Filter notes that are interactions with the user's content
     // and convert them to notification objects
     final notifications = _convertToNotifications(notes, userPubkey);
@@ -183,8 +174,6 @@ class NotificationsState extends FamilyNotifier<NotificationViewModel, String> {
       cutoff = state.timelineNotifications.last.createdAt - 1;
     }
 
-    final userPubkey = arg;
-
     final notesP = ref.watch(getNotesProvider);
     final notesStream = notesP.genericNostrQuery(
       requestId: "notifications-query",
diff --git a/lib/presentation_layer/providers/reactions_state_provider.dart b/lib/presentation_layer/providers/reactions_state_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 
 import '../../domain_layer/entities/nostr_note.dart';
 import '../../domain_layer/usecases/user_reactions.dart';
diff --git a/lib/presentation_layer/providers/reposts_state_provider.dart b/lib/presentation_layer/providers/reposts_state_provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:riverpod/riverpod.dart';
 
 import '../../domain_layer/entities/nostr_note.dart';
diff --git a/lib/presentation_layer/providers/signer_provider.dart b/lib/presentation_layer/providers/signer_provider.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_riverpod/legacy.dart';
 import 'package:ndk/ndk.dart';
 import 'package:riverpod/riverpod.dart';
 
diff --git a/lib/presentation_layer/providers/theme_provider.dart b/lib/presentation_layer/providers/theme_provider.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/legacy.dart';
 import 'db_app_provider.dart';
 
 enum ThemeType { camelus, nostr, custom, system }
diff --git a/lib/presentation_layer/routes/nostr/bookmarks/bookmarks_state_provider.dart b/lib/presentation_layer/routes/nostr/bookmarks/bookmarks_state_provider.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod/legacy.dart';
 import '../../../../domain_layer/entities/nostr_list.dart';
 import '../../../../domain_layer/entities/nostr_note.dart';
 import '../../../providers/get_notes_provider.dart';
diff --git a/lib/presentation_layer/routes/nostr/profile/edit_profile_page.dart b/lib/presentation_layer/routes/nostr/profile/edit_profile_page.dart
diff --git a/lib/presentation_layer/routes/nostr/settings/file_servers/file_server_state_provider.dart b/lib/presentation_layer/routes/nostr/settings/file_servers/file_server_state_provider.dart
diff --git a/lib/presentation_layer/routes/nostr/settings/inital_route/inital_route_settings.dart b/lib/presentation_layer/routes/nostr/settings/inital_route/inital_route_settings.dart
diff --git a/lib/presentation_layer/routes/search/search_state_notifier.dart b/lib/presentation_layer/routes/search/search_state_notifier.dart
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import 'package:flutter_riverpod/flutter_riverpod.dart';`
	`2`	`+import 'package:flutter_riverpod/legacy.dart';`
`2`	`3`	`import 'package:flutter/material.dart';`
`3`	`4`	`import 'package:camelus/l10n/app_localizations.dart';`
`4`	`5`