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

don't break custom emoji in pronouns

Browse Source
This commit is contained in:
sk
2023-10-17 00:38:27 +02:00
parent fc09514a4d
commit 92d7ae67ef
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1700,14 +1700,17 @@ public class UiUtils {
Matcher matcher=trimPronouns.matcher(text); Matcher matcher=trimPronouns.matcher(text);
if(!matcher.find()) return null; if(!matcher.find()) return null;
String matched=matcher.group(1); String pronouns=matcher.group(1);
// crude fix to allow for pronouns like "it(/she)" // crude fix to allow for pronouns like "it(/she)"
int missingClosingParens=0; int missingClosingParens=0;
for(char c : matched.toCharArray()){ for(char c : pronouns.toCharArray()){
if(c=='(') missingClosingParens++; if(c=='(') missingClosingParens++;
if(c==')') missingClosingParens--; if(c==')') missingClosingParens--;
} }
return matched+")".repeat(Math.max(0, missingClosingParens)); pronouns+=")".repeat(Math.max(0, missingClosingParens));
// if ends with an un-closed custom emoji
if(pronouns.matches("^.*\\s+:[a-zA-Z_]+$")) pronouns+=':';
return pronouns;
} }
// https://stackoverflow.com/questions/9475589/how-to-get-string-from-different-locales-in-android // https://stackoverflow.com/questions/9475589/how-to-get-string-from-different-locales-in-android