From c5a55e27c68c713abf112e4bee984ab6e3b82ace Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 21 Sep 2025 15:53:33 +0200 Subject: [PATCH] Add x.com domain to the alternate frontend URL patterns Currently the URL pattern for "Twitter" only matches twitter.com and not its new name x.com. This commit adds x.com to it and adjusts the group index at a later point in the code to match the new group. --- .../main/java/app/fedilab/android/mastodon/helper/Helper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java index c61a1efa..5ee38997 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java @@ -363,7 +363,7 @@ public class Helper { public static final Pattern mathsComposePattern = Pattern.compile("\\\\\\(.*\\\\\\)|\\\\\\[.*\\\\\\]"); public static final Pattern twitterPattern = Pattern.compile("((@[\\w]+)@twitter\\.com)"); public static final Pattern youtubePattern = Pattern.compile("(www\\.|m\\.)?(youtube\\.com|youtu\\.be|youtube-nocookie\\.com)/(((?!([\"'<])).)*)"); - public static final Pattern nitterPattern = Pattern.compile("(mobile\\.|www\\.)?twitter\\.com([\\w/-]+)"); + public static final Pattern nitterPattern = Pattern.compile("(mobile\\.|www\\.)?(twitter|x)\\.com([\\w/-]+)"); public static final Pattern bibliogramPattern = Pattern.compile("(m\\.|www\\.)?instagram.com(/p/[\\w-/]+)"); public static final Pattern libredditPattern = Pattern.compile("(www\\.|m\\.)?(reddit\\.com|preview\\.redd\\.it|i\\.redd\\.it|redd\\.it)/(((?!([\"'<])).)*)"); public static final Pattern ouichesPattern = Pattern.compile("https?://ouich\\.es/tag/(\\w+)"); @@ -794,7 +794,7 @@ public class Helper { if (nitter) { matcher = Helper.nitterPattern.matcher(url); if (matcher.find()) { - final String nitter_directory = matcher.group(2); + final String nitter_directory = matcher.group(3); String nitterHost = sharedpreferences.getString(context.getString(R.string.SET_NITTER_HOST), context.getString(R.string.DEFAULT_NITTER_HOST)).toLowerCase(); if (nitterHost.trim().isEmpty()) { nitterHost = context.getString(R.string.DEFAULT_NITTER_HOST);