mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-14 00:35:52 +02:00
* Update ja-JP.yml * Added settable config for muted instances * added psql query for removal of muted notes * Added filtering and trimming for instance mutes * cleaned up filtering of bad instance mutes and added a refresh at the end for the list on the client * Added notification & streaming timeline muting * Updated changelog * Added missing semicolon * Apply japanese string suggestions from robflop Co-authored-by: Robin B. <robflop98@outlook.com> * Changed Ja-JP instance mute title string to one suggested by sousuke Co-authored-by: sousuke0422 <sousuke20xx@gmail.com> * Update ja-JP instanceMuteDescription based on sousuke's suggestion Co-authored-by: sousuke0422 <sousuke20xx@gmail.com> * added notification mute * added notification and note children muting * Fixed a bug where local notifications were getting filtered on cold start * Fixed instance mute imports * Fixed not saving/loading instance mutes * removed en-US translations for instance mute * moved instance mute migration to js * changed settings index back to spaces * removed destructuring assignment from notification stream in instance mute check call Co-authored-by: tamaina <tamaina@hotmail.co.jp> * added .note accessor for checking note data instead of notification data * changed note to use Packed<'Note'> instead of any and removed usage of snake case Co-authored-by: tamaina <tamaina@hotmail.co.jp> * changed notification mute check to check specifically for notification host * changed to using single quotes * moved @click to the end for the linter * revert unnecessary changes * restored newlines * whitespace removal Co-authored-by: syuilo <syuilotan@yahoo.co.jp> Co-authored-by: Robin B. <robflop98@outlook.com> Co-authored-by: sousuke0422 <sousuke20xx@gmail.com> Co-authored-by: puffaboo <emilis@jigglypuff.club> Co-authored-by: tamaina <tamaina@hotmail.co.jp>
49 lines
1.5 KiB
TypeScript
49 lines
1.5 KiB
TypeScript
import autobind from 'autobind-decorator';
|
|
import Channel from '../channel';
|
|
import { Notes } from '@/models/index';
|
|
import { isInstanceMuted, isUserFromMutedInstance } from '@/misc/is-instance-muted';
|
|
|
|
export default class extends Channel {
|
|
public readonly chName = 'main';
|
|
public static shouldShare = true;
|
|
public static requireCredential = true;
|
|
|
|
@autobind
|
|
public async init(params: any) {
|
|
// Subscribe main stream channel
|
|
this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
|
|
switch (data.type) {
|
|
case 'notification': {
|
|
// Ignore notifications from instances the user has muted
|
|
if (isUserFromMutedInstance(data.body, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
|
|
if (data.body.userId && this.muting.has(data.body.userId)) return;
|
|
|
|
if (data.body.note && data.body.note.isHidden) {
|
|
const note = await Notes.pack(data.body.note.id, this.user, {
|
|
detail: true
|
|
});
|
|
this.connection.cacheNote(note);
|
|
data.body.note = note;
|
|
}
|
|
break;
|
|
}
|
|
case 'mention': {
|
|
if (isInstanceMuted(data.body, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
|
|
|
|
if (this.muting.has(data.body.userId)) return;
|
|
if (data.body.isHidden) {
|
|
const note = await Notes.pack(data.body.id, this.user, {
|
|
detail: true
|
|
});
|
|
this.connection.cacheNote(note);
|
|
data.body = note;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
this.send(data.type, data.body);
|
|
});
|
|
}
|
|
}
|