mirror of
https://github.com/misskey-dev/misskey.git
synced 2024-12-03 12:06:58 +01:00
Fix #6016
This commit is contained in:
parent
177e19632a
commit
09175b84df
1 changed files with 4 additions and 2 deletions
|
@ -6,6 +6,7 @@ import { Notes } from '../../../../models';
|
|||
import { generateMuteQuery } from '../../common/generate-mute-query';
|
||||
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
|
||||
import { Brackets } from 'typeorm';
|
||||
import { safeForSql } from '../../../../misc/safe-for-sql';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
|
@ -99,7 +100,7 @@ export default define(meta, async (ps, me) => {
|
|||
if (me) generateMuteQuery(query, me);
|
||||
|
||||
if (ps.tag) {
|
||||
if (/[\0\x08\x09\x1a\n\r"'\\\%]/g.test(ps.tag)) return;
|
||||
if (!safeForSql(ps.tag)) return;
|
||||
query.andWhere(`'{"${ps.tag.toLowerCase()}"}' <@ note.tags`);
|
||||
} else {
|
||||
let i = 0;
|
||||
|
@ -107,7 +108,8 @@ export default define(meta, async (ps, me) => {
|
|||
for (const tags of ps.query!) {
|
||||
qb.orWhere(new Brackets(qb => {
|
||||
for (const tag of tags) {
|
||||
qb.andWhere(`:tag${i} = ANY(note.tags)`, { [`tag${i}`]: tag.toLowerCase() });
|
||||
if (!safeForSql(tag)) return;
|
||||
qb.andWhere(`'{"${tag.toLowerCase()}"}' <@ note.tags`);
|
||||
i++;
|
||||
}
|
||||
}));
|
||||
|
|
Loading…
Reference in a new issue