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

Merge pull request #455 from FineFindus/fix/quote=whitespace

Browse Source 
fix(StatusDisplayItem/Quote): allow whitespace in closing br tag
This commit is contained in:
LucasGGamerM
2024-07-07 08:58:32 -03:00
committed by GitHub
parent bc08c149b7 0c95f6db1b
commit ec72653dba
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -86,7 +86,7 @@ public abstract class StatusDisplayItem{
public static final int FLAG_NO_MEDIA_PREVIEW=1 << 8; public static final int FLAG_NO_MEDIA_PREVIEW=1 << 8;
private final static Pattern QUOTE_MENTION_PATTERN=Pattern.compile("(?:<p>)?\\s?(?:RE:\\s?(<br\\/?>)?)?<a href=\"https:\\/\\/[^\"]+\"[^>]*><span class=\"invisible\">https:\\/\\/<\\/span><span class=\"ellipsis\">[^<]+<\\/span><span class=\"invisible\">[^<]+<\\/span><\\/a>(?:<\\/p>)?$"); private final static Pattern QUOTE_MENTION_PATTERN=Pattern.compile("(?:<p>)?\\s?(?:RE:\\s?(<br\\s?\\/?>)?)?<a href=\"https:\\/\\/[^\"]+\"[^>]*><span class=\"invisible\">https:\\/\\/<\\/span><span class=\"ellipsis\">[^<]+<\\/span><span class=\"invisible\">[^<]+<\\/span><\\/a>(?:<\\/p>)?$");
private final static Pattern QUOTE_PATTERN=Pattern.compile("[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$"); private final static Pattern QUOTE_PATTERN=Pattern.compile("[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$");
public void setAncestryInfo( public void setAncestryInfo(
@@ -280,9 +280,6 @@ public abstract class StatusDisplayItem{
Matcher matcher=QUOTE_MENTION_PATTERN.matcher(status.content); Matcher matcher=QUOTE_MENTION_PATTERN.matcher(status.content);
if(matcher.find()){ if(matcher.find()){
String quoteMention=matcher.group(); String quoteMention=matcher.group();
// FIXME: This is ugly. I wanna do it all in the regex >:(
if(statusForContent.content.contains("RE:<br />"+quoteMention))
quoteMention = "RE:<br />"+quoteMention;
statusForContent.content=statusForContent.content.replace(quoteMention, ""); statusForContent.content=statusForContent.content.replace(quoteMention, "");
} }
} }