owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(LinkCard): skip redirects to accounts

Browse Source
This commit is contained in:
FineFindus
2024-06-29 11:33:37 +02:00
parent 77c5173014
commit f590fde7a4
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
View File

@@ -20,6 +20,7 @@ import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
import org.joinmastodon.android.ui.text.HtmlParser; import org.joinmastodon.android.ui.text.HtmlParser;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
import java.util.Optional;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import me.grishka.appkit.imageloader.ImageLoaderViewHolder; import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
@@ -147,25 +148,31 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
// Mastodon.social sometimes adds an additional redirect page // Mastodon.social sometimes adds an additional redirect page
// this is really disruptive on mobile, especially since it breaks the loopUp/openURL functionality // this is really disruptive on mobile, especially since it breaks the loopUp/openURL functionality
Uri parsedURL=Uri.parse(url); Uri parsedURL=Uri.parse(url);
if(parsedURL.getPath()!=null && parsedURL.getPath().startsWith("/redirect/statuses/")){ if(parsedURL.getPath()!=null && parsedURL.getPath().startsWith("/redirect/")){
// find actually linked url in status content url=findRedirectedURL(parsedURL).orElse(url);
Matcher matcher=HtmlParser.URL_PATTERN.matcher(item.status.content);
String foundURL;
while(matcher.find()){
foundURL=matcher.group(3);
if(TextUtils.isEmpty(matcher.group(4)))
foundURL="http://"+foundURL;
// SAFETY: Cannot be null, as otherwise the matcher wouldn't find it
// also, group is marked as non-null
assert foundURL!=null && parsedURL.getLastPathSegment()!=null;
if(foundURL.endsWith(parsedURL.getLastPathSegment())) {
// found correct URL
url=foundURL;
break;
}
}
} }
UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), url); UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), url);
} }
private Optional<String> findRedirectedURL(Uri url){
// find actually linked url in status content
Matcher matcher=HtmlParser.URL_PATTERN.matcher(item.status.content);
boolean isAccountRedirect=url.getPath().startsWith("/redirect/accounts");
String foundURL;
while(matcher.find()){
foundURL=matcher.group(3);
if(TextUtils.isEmpty(matcher.group(4)))
foundURL="http://"+foundURL;
// SAFETY: Cannot be null, as otherwise the matcher wouldn't find it
// also, group is marked as non-null
assert foundURL!=null && url.getLastPathSegment()!=null;
if(foundURL.endsWith(url.getLastPathSegment()) ||
(isAccountRedirect && foundURL.matches("https://"+url.getHost()+"/@[a-zA-Z0-9_]+@[a-zA-Z0-9._]+$"))){
// found correct URL
return Optional.of(foundURL);
}
}
return Optional.empty();
}
} }
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -1482,7 +1482,7 @@ public class UiUtils {
return; return;
} }
Optional<Account> account = results.accounts.stream() Optional<Account> account = results.accounts.stream()
.filter(a -> uri.equals(Uri.parse(a.url))).findAny(); .filter(a -> uri.getPath().contains(a.getFullyQualifiedName())).findAny();
if (account.isPresent()) { if (account.isPresent()) {
args.putParcelable("profileAccount", Parcels.wrap(account.get())); args.putParcelable("profileAccount", Parcels.wrap(account.get()));
go.accept(ProfileFragment.class, args); go.accept(ProfileFragment.class, args);