From ef988a3dd0ed0752d72b6edc65f3daef84ea5eb7 Mon Sep 17 00:00:00 2001 From: ms8661 Date: Tue, 11 Jan 2022 03:06:06 +0000 Subject: [PATCH 1/2] Handle mobile wikipedia URLs (subdomain='m') --- app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java b/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java index 8d6a9f7..022ba66 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java +++ b/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java @@ -113,7 +113,7 @@ public class Utils { public static final Pattern scriberipSubdomainPattern = Pattern.compile("([\\w_-]+)\\.medium.com/(((?!([\"'<])).)*)"); - public static final Pattern wikilessPattern = Pattern.compile("([\\w_-]+)\\.wikipedia.org/(((?!([\"'<])).)*)"); + public static final Pattern wikilessPattern = Pattern.compile("([\\w_-]+)\\.(?:m\\.)?wikipedia.org/(((?!([\"'<])).)*)"); public static final Pattern bibliogramAccountPattern = Pattern.compile("(m\\.|www\\.)?instagram.com(((?!/p/).)+)"); public static final Pattern maps = Pattern.compile("/maps/place/([^@]+@)?([\\d.,z]+).*"); From 68e5a818b730ec3063c43f01a0619f2e47ab816d Mon Sep 17 00:00:00 2001 From: ms8661 Date: Tue, 11 Jan 2022 03:33:04 +0000 Subject: [PATCH 2/2] Fix language param 'lang' appended to wikipedia URL; use '?' instead of '&' since it is the first and only param --- app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java b/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java index 022ba66..36c9ea7 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java +++ b/app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java @@ -361,7 +361,7 @@ public class Utils { } path = matcher.group(2); } - newUrl = scheme + wikilessHost + "/" + path + (subdomain != null ? "&lang=" + subdomain : ""); + newUrl = scheme + wikilessHost + "/" + path + (subdomain != null ? "?lang=" + subdomain : ""); return newUrl; } else { return url;