From abb128016f2eae514c462cd9ad1534be768bc1d4 Mon Sep 17 00:00:00 2001
From: olorin99 <36951539+olorin99@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:53:13 +1000
Subject: [PATCH] Couple of fixes for microblogs and mentions. (#22)

---
 lib/src/api/posts.dart                |  4 ++--
 lib/src/screens/feed/feed_screen.dart |  2 +-
 lib/src/widgets/markdown_mention.dart | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/api/posts.dart b/lib/src/api/posts.dart
index 7bcc6d6..50ab8b0 100644
--- a/lib/src/api/posts.dart
+++ b/lib/src/api/posts.dart
@@ -23,7 +23,7 @@ class APIPosts {
 
   Future<PostListModel> list(
     FeedSource source, {
-    int? page,
+    String? page,
     FeedSort? sort,
     List<String>? langs,
     bool? usePreferredLangs,
@@ -34,7 +34,7 @@ class APIPosts {
 
     final path = source.getPostsPath()!;
     final query = queryParams({
-      'p': page?.toString(),
+      'p': page,
       'sort': sort?.name,
       'lang': langs?.join(','),
       'usePreferredLangs': (usePreferredLangs ?? false).toString(),
diff --git a/lib/src/screens/feed/feed_screen.dart b/lib/src/screens/feed/feed_screen.dart
index 1307da6..f10bad6 100644
--- a/lib/src/screens/feed/feed_screen.dart
+++ b/lib/src/screens/feed/feed_screen.dart
@@ -300,7 +300,7 @@ class _FeedScreenBodyState extends State<FeedScreenBody> {
             ),
         PostType.microblog => context.read<SettingsController>().api.posts.list(
               widget.source,
-              page: int.parse(pageKey),
+              page: pageKey.isEmpty ? null : pageKey,
               sort: widget.sort,
               usePreferredLangs: whenLoggedIn(context,
                   context.read<SettingsController>().useAccountLangFilter),
diff --git a/lib/src/widgets/markdown_mention.dart b/lib/src/widgets/markdown_mention.dart
index c5ea86e..f3d5d49 100644
--- a/lib/src/widgets/markdown_mention.dart
+++ b/lib/src/widgets/markdown_mention.dart
@@ -150,10 +150,10 @@ class MentionWidgetState extends State<MentionWidget> {
     final modifier = widget.name[0];
     final split = widget.name.substring(1).split('@');
     final name = split[0];
-    final host = (split.length > 1 && split[1] != widget.originInstance)
+    final host = (split.length > 1)
         ? split[1]
-        : null;
-    final cacheKey = host != null ? '$name@$host' : name;
+        : widget.originInstance;
+    final cacheKey = '$name@$host';
 
     setState(() {
       _displayName = modifier + name;
@@ -164,7 +164,7 @@ class MentionWidgetState extends State<MentionWidget> {
         if (!userMentionCache.containsKey(cacheKey)) {
           userMentionCache[cacheKey] =
               await context.read<SettingsController>().api.users.getByName(
-                    host != null ? '@$name@$host' : name,
+                    '@$name@$host',
                   );
         }
         final user = userMentionCache[cacheKey]!;
@@ -183,7 +183,7 @@ class MentionWidgetState extends State<MentionWidget> {
         if (!magazineMentionCache.containsKey(cacheKey)) {
           magazineMentionCache[cacheKey] =
               await context.read<SettingsController>().api.magazines.getByName(
-                    host != null ? '$name@$host' : name,
+                    '$name@$host',
                   );
         }
         final magazine = magazineMentionCache[cacheKey]!;