mirror of
https://activitypub.software/TransFem-org/Sharkey
synced 2024-11-22 22:15:12 +00:00
Better note filtering
This commit is contained in:
parent
d7af18efbd
commit
0ac7682188
1 changed files with 13 additions and 4 deletions
|
@ -2,8 +2,17 @@ export default function(me, settings, note) {
|
||||||
const isMyNote = note.userId == me.id;
|
const isMyNote = note.userId == me.id;
|
||||||
const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
|
const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
|
||||||
|
|
||||||
return settings.showMyRenotes === false && isMyNote && isPureRenote ||
|
const includesMutedWords = (text: string) =>
|
||||||
settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id ||
|
text
|
||||||
settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null ||
|
? settings.mutedWords.some(q => q.length > 0 && !q.some(word => !text.includes(word)))
|
||||||
!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word)));
|
: false;
|
||||||
|
|
||||||
|
return (
|
||||||
|
(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
|
||||||
|
(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
|
||||||
|
(settings.showMyRenotes === false && isMyNote && isPureRenote) ||
|
||||||
|
(settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
|
||||||
|
(settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
|
||||||
|
(!isMyNote && includesMutedWords(note.text))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue