From 7e4c1b4df0095316c98a114696f43236c65dd8a5 Mon Sep 17 00:00:00 2001 From: franzap <_@franzap.com> Date: Thu, 24 Oct 2024 01:02:47 -0300 Subject: [PATCH] Data loading adjustments --- lib/models/nostr_adapter.dart | 4 ++-- lib/widgets/latest_releases_container.dart | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/models/nostr_adapter.dart b/lib/models/nostr_adapter.dart index 4e5dcab..2891abd 100644 --- a/lib/models/nostr_adapter.dart +++ b/lib/models/nostr_adapter.dart @@ -124,8 +124,9 @@ mixin NostrAdapter> on Adapter { kinds: {kind, ...?additionalKinds}, tags: params, limit: limit, - since: since, until: until, + // Disable since when until is present + since: until != null ? null : since, ); final result = await relay.queryRaw(req); @@ -170,7 +171,6 @@ mixin NostrAdapter> on Adapter { class RelayListenerNotifier extends Notifier { @override void build() { - fetch(); final timer = Timer.periodic(Duration(minutes: 30), (_) => fetch()); // This will get disposed when clearing and restarting the app diff --git a/lib/widgets/latest_releases_container.dart b/lib/widgets/latest_releases_container.dart index bbf165e..1801527 100644 --- a/lib/widgets/latest_releases_container.dart +++ b/lib/widgets/latest_releases_container.dart @@ -88,17 +88,13 @@ class LatestReleasesAppNotifier extends StateNotifier>> { int _page = 1; final Ref ref; - LatestReleasesAppNotifier(this.ref) : super(AsyncLoading()); + LatestReleasesAppNotifier(this.ref) : super(AsyncLoading()) { + fetch(); + } Future fetch({bool next = false}) async { if (next) { _page++; - } else { - final apps = _fetchLocal(); - if (apps.isNotEmpty) { - state = AsyncData(apps); - return; - } } // Can't use ignoreReturn, as super.findAll does use the result @@ -107,6 +103,7 @@ class LatestReleasesAppNotifier extends StateNotifier>> { 'includes': true, 'limit': 10, 'until': next ? _oldestCreatedAt : null, + 'since': null, }, );