fix: Articles now shown on startup, click tag wrks!

feoh · feoh · commit b7613ec5da2f · 2026-04-06T14:45:12.000-04:00
diff --git a/lib/core/api/linkding_api_client.dart b/lib/core/api/linkding_api_client.dart
@@ -41,11 +41,17 @@ class LinkdingApiClient {
     int limit = 20,
     int offset = 0,
   }) async {
+    // Linkding uses the `q` parameter with `#tagname` syntax for tag filtering.
+    final parts = <String>[
+      if (query != null && query.isNotEmpty) query,
+      if (tag != null && tag.isNotEmpty) '#$tag',
+    ];
+    final q = parts.join(' ').trim();
+
     final response = await _dio.get(
       'api/bookmarks/',
       queryParameters: {
-        if (query != null && query.isNotEmpty) 'q': query,
-        if (tag != null && tag.isNotEmpty) 'tag': tag,
+        if (q.isNotEmpty) 'q': q,
         if (isArchived != null) 'is_archived': isArchived ? 1 : 0,
         if (isRead != null) 'is_read': isRead ? 1 : 0,
         'limit': limit,
diff --git a/lib/features/queue/queue_notifier.dart b/lib/features/queue/queue_notifier.dart
@@ -44,19 +44,24 @@ class QueueNotifier extends _$QueueNotifier {
   }
 
   void _fetchPage(int offset) async {
-    final settings = ref.read(settingsNotifierProvider).valueOrNull;
-    if (settings == null || !settings.isConfigured) return;
+    // Await settings — on startup they may still be loading from storage.
+    final settings = await ref.read(settingsNotifierProvider.future);
+    if (!settings.isConfigured) return;
+    final filterAtStart = _filter;
     try {
       final client = ref.read(apiClientProvider);
       final response = await client.getBookmarks(
-        query: _filter.query.isNotEmpty ? _filter.query : null,
-        tag: _filter.tag,
+        query: filterAtStart.query.isNotEmpty ? filterAtStart.query : null,
+        tag: filterAtStart.tag,
         isArchived: false,
         isRead: false,
         limit: _pageSize,
         offset: offset,
       );
 
+      // Discard stale response if the filter changed while awaiting.
+      if (_filter != filterAtStart) return;
+
       final isLast = offset + response.results.length >= response.count;
       if (isLast) {
         pagingController.appendLastPage(response.results);
@@ -67,10 +72,12 @@ class QueueNotifier extends _$QueueNotifier {
         );
       }
     } on DioException catch (e) {
+      if (_filter != filterAtStart) return;
       pagingController.error = e.error is ApiException
           ? e.error
           : UnknownException(e.message ?? 'Unknown error');
     } catch (e) {
+      if (_filter != filterAtStart) return;
       pagingController.error = UnknownException(e.toString());
     }
   }
diff --git a/lib/features/queue/queue_screen.dart b/lib/features/queue/queue_screen.dart
@@ -27,10 +27,9 @@ class _QueueScreenState extends ConsumerState<QueueScreen> {
     super.didChangeDependencies();
     final routeTag =
         GoRouterState.of(context).uri.queryParameters['tag'];
-    if (routeTag != null && routeTag != _selectedTag) {
-      setState(() => _selectedTag = routeTag);
-      WidgetsBinding.instance
-          .addPostFrameCallback((_) => _applyFilter());
+    if (routeTag != _selectedTag) {
+      _selectedTag = routeTag;
+      _applyFilter();
     }
   }
 
diff --git a/pubspec.lock b/pubspec.lock
@@ -548,10 +548,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -913,10 +913,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.10"
   timing:
     dependency: transitive
     description:

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,9 @@ class _QueueScreenState extends ConsumerState<QueueScreen> {`
`27`	`27`	`super.didChangeDependencies();`
`28`	`28`	`final routeTag =`
`29`	`29`	`GoRouterState.of(context).uri.queryParameters['tag'];`
`30`		`- if (routeTag != null && routeTag != _selectedTag) {`
`31`		`- setState(() => _selectedTag = routeTag);`
`32`		`- WidgetsBinding.instance`
`33`		`- .addPostFrameCallback((_) => _applyFilter());`
	`30`	`+ if (routeTag != _selectedTag) {`
	`31`	`+ _selectedTag = routeTag;`
	`32`	`+ _applyFilter();`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`