Add handling for new Lemmy comment link format (#1629)

thunder-app · Dec 17, 2024 · b5e4a05 · b5e4a05
1 parent 849b3ba
commit b5e4a05
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 17 deletions.
diff --git a/lib/thunder/cubits/deep_links_cubit/deep_links_cubit.dart b/lib/thunder/cubits/deep_links_cubit/deep_links_cubit.dart
@@ -41,10 +41,18 @@ class DeepLinksCubit extends Cubit<DeepLinksState> {
           linkType: LinkType.user,
         ));
       } else if (link.contains("/post/")) {
+        LinkType linkType = LinkType.post;
+
+        // See if this is actually a comment link
+        Uri? uri = Uri.tryParse(link);
+        if (uri != null && uri.pathSegments.length >= 3 && int.tryParse(uri.pathSegments[2]) != null) {
+          linkType = LinkType.comment;
+        }
+
         emit(state.copyWith(
           deepLinkStatus: DeepLinkStatus.success,
           link: link,
-          linkType: LinkType.post,
+          linkType: linkType,
         ));
       } else if (link.contains("/comment/")) {
         emit(state.copyWith(

diff --git a/lib/utils/instance.dart b/lib/utils/instance.dart
@@ -128,27 +128,42 @@ Future<int?> getLemmyPostId(BuildContext context, String text) async {
 }
 
 final RegExp _comment = RegExp(r'^(https?:\/\/)(.*)\/comment\/([0-9]*).*$');
+final RegExp _commentAlternate = RegExp(r'^(https?:\/\/)(.*)\/post\/([0-9]*)\/([0-9]*).*$');
 Future<int?> getLemmyCommentId(BuildContext context, String text) async {
   LemmyApiV3 lemmy = LemmyClient.instance.lemmyApiV3;
 
-  final RegExpMatch? commentMatch = _comment.firstMatch(text);
+  String? instance;
+  int? commentId;
+
+  // Try legacy comment link format
+  RegExpMatch? commentMatch = _comment.firstMatch(text);
   if (commentMatch != null) {
-    final String? instance = commentMatch.group(2);
-    final int? commentId = int.tryParse(commentMatch.group(3)!);
-    if (commentId != null) {
-      if (instance == lemmy.host) {
-        return commentId;
-      } else {
-        // This is a comment on another instance. Try to resolve it
-        try {
-          // Show the loading page while we resolve the post
-          showLoadingPage(context);
+    // It's a match!
+    instance = commentMatch.group(2);
+    commentId = int.tryParse(commentMatch.group(3)!);
+  } else {
+    // Otherwise, try the new format
+    commentMatch = _commentAlternate.firstMatch(text);
+    if (commentMatch != null) {
+      // It's a match!
+      instance = commentMatch.group(2);
+      commentId = int.tryParse(commentMatch.group(4)!);
+    }
+  }
 
-          final ResolveObjectResponse resolveObjectResponse = await lemmy.run(ResolveObject(q: text));
-          return resolveObjectResponse.comment?.comment.id;
-        } catch (e) {
-          return null;
-        }
+  if (commentId != null) {
+    if (instance == lemmy.host) {
+      return commentId;
+    } else {
+      // This is a comment on another instance. Try to resolve it
+      try {
+        // Show the loading page while we resolve the post
+        showLoadingPage(context);
+
+        final ResolveObjectResponse resolveObjectResponse = await lemmy.run(ResolveObject(q: text));
+        return resolveObjectResponse.comment?.comment.id;
+      } catch (e) {
+        return null;
       }
     }
   }