usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better note filtering

This commit is contained in:
syuilo 2018-12-29 05:51:17 +09:00
parent d7af18efbd
commit 0ac7682188
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/client/app/common/scripts/should-mute-note.ts
View File

@ -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))
);
} }