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

feat(Quote): hide filtered quotes 

Hides quote of that would have been hidden by a filter, essentially
reverting back to the previous behaviour.

(Partially) Closes: https://github.com/LucasGGamerM/moshidon/issues/488
This commit is contained in:
FineFindus 2024-08-03 00:08:45 +02:00
parent 81519fe906
commit 55259f103d
No known key found for this signature in database
GPG Key ID: 64873EE210FF8E6B
1 changed files with 3 additions and 2 deletions
Show Stats 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

@ -339,7 +339,7 @@ public abstract class StatusDisplayItem{
contentItems.add(new DummyStatusDisplayItem(parentID, fragment)); contentItems.add(new DummyStatusDisplayItem(parentID, fragment));
contentItems.addAll(buildItems(fragment, statusForContent.quote, accountID, parentObject, knownAccounts, filterContext, FLAG_NO_FOOTER|FLAG_INSET|FLAG_NO_EMOJI_REACTIONS|FLAG_IS_FOR_QUOTE)); contentItems.addAll(buildItems(fragment, statusForContent.quote, accountID, parentObject, knownAccounts, filterContext, FLAG_NO_FOOTER|FLAG_INSET|FLAG_NO_EMOJI_REACTIONS|FLAG_IS_FOR_QUOTE));
} else if((flags & FLAG_INSET)==0 && statusForContent.mediaAttachments.isEmpty()){ } else if((flags & FLAG_INSET)==0 && statusForContent.mediaAttachments.isEmpty()){
tryAddNonOfficialQuote(statusForContent, fragment, accountID); tryAddNonOfficialQuote(statusForContent, fragment, accountID, filterContext);
} }
if(contentItems!=items && statusForContent.spoilerRevealed){ if(contentItems!=items && statusForContent.spoilerRevealed){
items.addAll(contentItems); items.addAll(contentItems);
@ -421,7 +421,7 @@ public abstract class StatusDisplayItem{
* Tries to adds a non-official quote to a status. * Tries to adds a non-official quote to a status.
* A non-official quote is a quote on an instance that does not support quotes officially. * A non-official quote is a quote on an instance that does not support quotes officially.
*/ */
private static void tryAddNonOfficialQuote(Status status, BaseStatusListFragment fragment, String accountID) { private static void tryAddNonOfficialQuote(Status status, BaseStatusListFragment fragment, String accountID, FilterContext filterContext) {
Matcher matcher=QUOTE_PATTERN.matcher(status.getStrippedText()); Matcher matcher=QUOTE_PATTERN.matcher(status.getStrippedText());
if(!matcher.find()) if(!matcher.find())
@ -432,6 +432,7 @@ public abstract class StatusDisplayItem{
new GetSearchResults(quoteURL, GetSearchResults.Type.STATUSES, true, null, 0, 0).setCallback(new Callback<>(){ new GetSearchResults(quoteURL, GetSearchResults.Type.STATUSES, true, null, 0, 0).setCallback(new Callback<>(){
@Override @Override
public void onSuccess(SearchResults results){ public void onSuccess(SearchResults results){
AccountSessionManager.get(accountID).filterStatuses(results.statuses, filterContext);
if (!results.statuses.isEmpty()){ if (!results.statuses.isEmpty()){
status.quote=results.statuses.get(0); status.quote=results.statuses.get(0);
fragment.updateStatusWithQuote(status); fragment.updateStatusWithQuote(status);