054417354c
* 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>
41 lines
1.4 KiB
TypeScript
41 lines
1.4 KiB
TypeScript
import { User } from '@/models/entities/user';
|
|
import { id } from '@/models/id';
|
|
import { UserProfiles } from '@/models/index';
|
|
import { SelectQueryBuilder, Brackets } from 'typeorm';
|
|
|
|
function createMutesQuery(id: string) {
|
|
return UserProfiles.createQueryBuilder('user_profile')
|
|
.select('user_profile.mutedInstances')
|
|
.where('user_profile.userId = :muterId', { muterId: id });
|
|
}
|
|
|
|
export function generateMutedInstanceQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
|
|
const mutingQuery = createMutesQuery(me.id);
|
|
|
|
q
|
|
.andWhere(new Brackets(qb => { qb
|
|
.andWhere('note.userHost IS NULL')
|
|
.orWhere(`NOT((${ mutingQuery.getQuery() })::jsonb ? note.userHost)`);
|
|
}))
|
|
.andWhere(new Brackets(qb => { qb
|
|
.where(`note.replyUserHost IS NULL`)
|
|
.orWhere(`NOT ((${ mutingQuery.getQuery() })::jsonb ? note.replyUserHost)`);
|
|
}))
|
|
.andWhere(new Brackets(qb => { qb
|
|
.where(`note.renoteUserHost IS NULL`)
|
|
.orWhere(`NOT ((${ mutingQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
|
|
}));
|
|
q.setParameters(mutingQuery.getParameters());
|
|
}
|
|
|
|
export function generateMutedInstanceNotificationQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
|
|
const mutingQuery = createMutesQuery(me.id);
|
|
|
|
q.andWhere(new Brackets(qb => { qb
|
|
.andWhere('notifier.host IS NULL')
|
|
.orWhere(`NOT (( ${mutingQuery.getQuery()} )::jsonb ? notifier.host)`);
|
|
}));
|
|
|
|
q.setParameters(mutingQuery.getParameters());
|
|
}
|