From 6e4bb95dda8aa894023ec8795be05bcaa6ba7079 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 2 Feb 2023 18:03:09 +0100
Subject: [PATCH] More deep link detection

---
 .../mastodon/helper/SpannableHelper.java      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
index f10f9ee42..426323e4a 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
@@ -514,6 +514,8 @@ public class SpannableHelper {
                 Matcher matcherLink = link.matcher(finalUrl);
                 Pattern linkLong = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w_.-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)(/[0-9]+)?$");
                 Matcher matcherLinkLong = linkLong.matcher(finalUrl);
+                Pattern userWithoutAt = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(users/([\\w._-]*[0-9]*))/statuses/([0-9]+)");
+                Matcher matcherUserWithoutAt = userWithoutAt.matcher(finalUrl);
                 if (matcherLink.find() && !finalUrl.contains("medium.com")) {
                     if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
                         CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
@@ -567,6 +569,38 @@ public class SpannableHelper {
                             public void federatedStatus(Status status) {
                             }
 
+                            @Override
+                            public void federatedAccount(Account account) {
+                                Intent intent = new Intent(context, ProfileActivity.class);
+                                Bundle b = new Bundle();
+                                b.putSerializable(Helper.ARG_ACCOUNT, account);
+                                intent.putExtras(b);
+                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                context.startActivity(intent);
+                            }
+                        });
+                    }
+                } else if (matcherUserWithoutAt.find() && !finalUrl.contains("medium.com")) {
+                    if (matcherUserWithoutAt.group(4) != null && Objects.requireNonNull(matcherUserWithoutAt.group(4)).length() > 0) { //It's a toot
+                        CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
+                            @Override
+                            public void federatedStatus(Status status) {
+                                Intent intent = new Intent(context, ContextActivity.class);
+                                intent.putExtra(Helper.ARG_STATUS, status);
+                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                context.startActivity(intent);
+                            }
+
+                            @Override
+                            public void federatedAccount(Account account) {
+                            }
+                        });
+                    } else {//It's an account
+                        CrossActionHelper.fetchRemoteAccount(context, currentAccount, matcherUserWithoutAt.group(3) + "@" + matcherUserWithoutAt.group(1), new CrossActionHelper.Callback() {
+                            @Override
+                            public void federatedStatus(Status status) {
+                            }
+
                             @Override
                             public void federatedAccount(Account account) {
                                 Intent intent = new Intent(context, ProfileActivity.class);