diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-15 17:05:41 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-15 17:05:41 +0900 |
| commit | a6befdd541a08f79686c505cc6dd6c92f32b8dbd (patch) | |
| tree | 564e43250592c93ec82d8349b046b81f8b42ddf3 /src/server/api/endpoints | |
| parent | Resolve #4925 (diff) | |
| download | sharkey-a6befdd541a08f79686c505cc6dd6c92f32b8dbd.tar.gz sharkey-a6befdd541a08f79686c505cc6dd6c92f32b8dbd.tar.bz2 sharkey-a6befdd541a08f79686c505cc6dd6c92f32b8dbd.zip | |
Fix bug
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/admin/logs.ts | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts index 86e99730c5..060df09adf 100644 --- a/src/server/api/endpoints/admin/logs.ts +++ b/src/server/api/endpoints/admin/logs.ts @@ -53,16 +53,18 @@ export default define(meta, async (ps) => { if (blackDomains.length > 0) { query.andWhere(new Brackets(qb => { for (const blackDomain of blackDomains) { - const subDomains = blackDomain.split('.'); - let i = 0; - for (const subDomain of subDomains) { - const p = `blackSubDomain_${subDomain}_${i}`; - // 全体で否定できないのでド・モルガンの法則で - // !(P && Q) を !P || !Q で表す - // SQL is 1 based, so we need '+ 1' - qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); - i++; - } + qb.andWhere(new Brackets(qb => { + const subDomains = blackDomain.split('.'); + let i = 0; + for (const subDomain of subDomains) { + const p = `blackSubDomain_${subDomain}_${i}`; + // 全体で否定できないのでド・モルガンの法則で + // !(P && Q) を !P || !Q で表す + // SQL is 1 based, so we need '+ 1' + qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); + i++; + } + })); } })); } |