mirror of
https://github.com/misskey-dev/misskey
synced 2024-05-26 13:20:25 +02:00
18dbcfa0b0
* fix(server): notes/createのバリデーションが効いていない
Fix #10079
Co-Authored-By: mei23 <m@m544.net>
* anyOf内にバリデーションを書いても最初の一つしかチェックされない
* ✌️
* wip
* wip
* ✌️
* RequiredProp
* Revert "RequiredProp"
This reverts commit 7469390011
.
* add api:notes/create
* fix lint
* text
* ✌️
* improve readability
---------
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
145 lines
4.1 KiB
TypeScript
145 lines
4.1 KiB
TypeScript
import { Brackets } from 'typeorm';
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import type { NotesRepository } from '@/models/index.js';
|
|
import { safeForSql } from '@/misc/safe-for-sql.js';
|
|
import { normalizeForSearch } from '@/misc/normalize-for-search.js';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { QueryService } from '@/core/QueryService.js';
|
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
|
|
export const meta = {
|
|
tags: ['notes', 'hashtags'],
|
|
|
|
res: {
|
|
type: 'array',
|
|
optional: false, nullable: false,
|
|
items: {
|
|
type: 'object',
|
|
optional: false, nullable: false,
|
|
ref: 'Note',
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
reply: { type: 'boolean', nullable: true, default: null },
|
|
renote: { type: 'boolean', nullable: true, default: null },
|
|
withFiles: {
|
|
type: 'boolean',
|
|
default: false,
|
|
description: 'Only show notes that have attached files.',
|
|
},
|
|
poll: { type: 'boolean', nullable: true, default: null },
|
|
sinceId: { type: 'string', format: 'misskey:id' },
|
|
untilId: { type: 'string', format: 'misskey:id' },
|
|
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
|
|
|
tag: { type: 'string', minLength: 1 },
|
|
query: {
|
|
type: 'array',
|
|
description: 'The outer arrays are chained with OR, the inner arrays are chained with AND.',
|
|
items: {
|
|
type: 'array',
|
|
items: {
|
|
type: 'string',
|
|
minLength: 1,
|
|
},
|
|
minItems: 1,
|
|
},
|
|
minItems: 1,
|
|
},
|
|
},
|
|
anyOf: [
|
|
{ required: ['tag'] },
|
|
{ required: ['query'] },
|
|
],
|
|
} as const;
|
|
|
|
// eslint-disable-next-line import/no-default-export
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> {
|
|
constructor(
|
|
@Inject(DI.notesRepository)
|
|
private notesRepository: NotesRepository,
|
|
|
|
private noteEntityService: NoteEntityService,
|
|
private queryService: QueryService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
|
|
.innerJoinAndSelect('note.user', 'user')
|
|
.leftJoinAndSelect('user.avatar', 'avatar')
|
|
.leftJoinAndSelect('user.banner', 'banner')
|
|
.leftJoinAndSelect('note.reply', 'reply')
|
|
.leftJoinAndSelect('note.renote', 'renote')
|
|
.leftJoinAndSelect('reply.user', 'replyUser')
|
|
.leftJoinAndSelect('replyUser.avatar', 'replyUserAvatar')
|
|
.leftJoinAndSelect('replyUser.banner', 'replyUserBanner')
|
|
.leftJoinAndSelect('renote.user', 'renoteUser')
|
|
.leftJoinAndSelect('renoteUser.avatar', 'renoteUserAvatar')
|
|
.leftJoinAndSelect('renoteUser.banner', 'renoteUserBanner');
|
|
|
|
this.queryService.generateVisibilityQuery(query, me);
|
|
if (me) this.queryService.generateMutedUserQuery(query, me);
|
|
if (me) this.queryService.generateBlockedUserQuery(query, me);
|
|
|
|
try {
|
|
if (ps.tag) {
|
|
if (!safeForSql(normalizeForSearch(ps.tag))) throw 'Injection';
|
|
query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
|
|
} else {
|
|
query.andWhere(new Brackets(qb => {
|
|
for (const tags of ps.query!) {
|
|
qb.orWhere(new Brackets(qb => {
|
|
for (const tag of tags) {
|
|
if (!safeForSql(normalizeForSearch(tag))) throw 'Injection';
|
|
qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`);
|
|
}
|
|
}));
|
|
}
|
|
}));
|
|
}
|
|
} catch (e) {
|
|
if (e === 'Injection') return [];
|
|
throw e;
|
|
}
|
|
|
|
if (ps.reply != null) {
|
|
if (ps.reply) {
|
|
query.andWhere('note.replyId IS NOT NULL');
|
|
} else {
|
|
query.andWhere('note.replyId IS NULL');
|
|
}
|
|
}
|
|
|
|
if (ps.renote != null) {
|
|
if (ps.renote) {
|
|
query.andWhere('note.renoteId IS NOT NULL');
|
|
} else {
|
|
query.andWhere('note.renoteId IS NULL');
|
|
}
|
|
}
|
|
|
|
if (ps.withFiles) {
|
|
query.andWhere('note.fileIds != \'{}\'');
|
|
}
|
|
|
|
if (ps.poll != null) {
|
|
if (ps.poll) {
|
|
query.andWhere('note.hasPoll = TRUE');
|
|
} else {
|
|
query.andWhere('note.hasPoll = FALSE');
|
|
}
|
|
}
|
|
|
|
// Search notes
|
|
const notes = await query.take(ps.limit).getMany();
|
|
|
|
return await this.noteEntityService.packMany(notes, me);
|
|
});
|
|
}
|
|
}
|