diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-14 16:06:04 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-14 16:06:04 +0900 |
| commit | 2d5158c680a5e1506c63b8d4ba559920db4a70db (patch) | |
| tree | 99e82522d3d8753343afa2ff963cf069b2c79ac3 /src/server | |
| parent | Update docker-compose.yml (diff) | |
| download | sharkey-2d5158c680a5e1506c63b8d4ba559920db4a70db.tar.gz sharkey-2d5158c680a5e1506c63b8d4ba559920db4a70db.tar.bz2 sharkey-2d5158c680a5e1506c63b8d4ba559920db4a70db.zip | |
Fix bug
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/endpoints/admin/logs.ts | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts index cb5d3940c5..86e99730c5 100644 --- a/src/server/api/endpoints/admin/logs.ts +++ b/src/server/api/endpoints/admin/logs.ts @@ -57,13 +57,10 @@ export default define(meta, async (ps) => { let i = 0; for (const subDomain of subDomains) { const p = `blackSubDomain_${subDomain}_${i}`; - if (i === subDomains.length - 1) { - // SQL is 1 based, so we need '+ 1' - qb.andWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); - } else { - // SQL is 1 based, so we need '+ 1' - qb.andWhere(`log.domain[${i + 1}] = :${p}`, { [p]: subDomain }); - } + // 全体で否定できないのでド・モルガンの法則で + // !(P && Q) を !P || !Q で表す + // SQL is 1 based, so we need '+ 1' + qb.orWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); i++; } } |