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>
75 lines
2.1 KiB
TypeScript
75 lines
2.1 KiB
TypeScript
import $ from 'cafy';
|
|
import { ID } from '@/misc/cafy-id';
|
|
import define from '../../define';
|
|
import { makePaginationQuery } from '../../common/make-pagination-query';
|
|
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
|
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
|
|
import { Brackets } from 'typeorm';
|
|
import { Notes } from '@/models/index';
|
|
import { generateBlockedUserQuery } from '../../common/generate-block-query';
|
|
import { generateMutedInstanceQuery } from '../../common/generate-muted-instance-query';
|
|
|
|
export const meta = {
|
|
tags: ['notes'],
|
|
|
|
requireCredential: false as const,
|
|
|
|
params: {
|
|
noteId: {
|
|
validator: $.type(ID),
|
|
},
|
|
|
|
limit: {
|
|
validator: $.optional.num.range(1, 100),
|
|
default: 10
|
|
},
|
|
|
|
sinceId: {
|
|
validator: $.optional.type(ID),
|
|
},
|
|
|
|
untilId: {
|
|
validator: $.optional.type(ID),
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'array' as const,
|
|
optional: false as const, nullable: false as const,
|
|
items: {
|
|
type: 'object' as const,
|
|
optional: false as const, nullable: false as const,
|
|
ref: 'Note',
|
|
}
|
|
},
|
|
};
|
|
|
|
export default define(meta, async (ps, user) => {
|
|
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
|
.andWhere(new Brackets(qb => { qb
|
|
.where(`note.replyId = :noteId`, { noteId: ps.noteId })
|
|
.orWhere(new Brackets(qb => { qb
|
|
.where(`note.renoteId = :noteId`, { noteId: ps.noteId })
|
|
.andWhere(new Brackets(qb => { qb
|
|
.where(`note.text IS NOT NULL`)
|
|
.orWhere(`note.fileIds != '{}'`)
|
|
.orWhere(`note.hasPoll = TRUE`);
|
|
}));
|
|
}));
|
|
}))
|
|
.innerJoinAndSelect('note.user', 'user')
|
|
.leftJoinAndSelect('note.reply', 'reply')
|
|
.leftJoinAndSelect('note.renote', 'renote')
|
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
|
.leftJoinAndSelect('renote.user', 'renoteUser');
|
|
|
|
generateVisibilityQuery(query, user);
|
|
if (user) generateMutedUserQuery(query, user);
|
|
if (user) generateBlockedUserQuery(query, user);
|
|
if (user) generateMutedInstanceQuery(query, user);
|
|
|
|
const notes = await query.take(ps.limit!).getMany();
|
|
|
|
return await Notes.packMany(notes, user);
|
|
});
|