usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug

This commit is contained in:
syuilo 2019-04-13 14:11:15 +09:00
parent b0d626d862
commit 8c331da315
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/api/endpoints/admin/logs.ts
View File

@ -34,7 +34,7 @@ export default define(meta, async (ps) => {
if (ps.domain) { if (ps.domain) {
const whiteDomains = ps.domain.split(' ').filter(x => !x.startsWith('-')); const whiteDomains = ps.domain.split(' ').filter(x => !x.startsWith('-'));
const blackDomains = ps.domain.split(' ').filter(x => x.startsWith('-')); const blackDomains = ps.domain.split(' ').filter(x => x.startsWith('-')).map(x => x.substr(1));
if (whiteDomains.length > 0) { if (whiteDomains.length > 0) {
query.andWhere(new Brackets(qb => { query.andWhere(new Brackets(qb => {
@ -53,11 +53,17 @@ export default define(meta, async (ps) => {
if (blackDomains.length > 0) { if (blackDomains.length > 0) {
query.andWhere(new Brackets(qb => { query.andWhere(new Brackets(qb => {
for (const blackDomain of blackDomains) { for (const blackDomain of blackDomains) {
const subDomains = blackDomain.split('.');
let i = 0; let i = 0;
for (const subDomain of blackDomain.split('.')) { for (const subDomain of subDomains) {
const p = `blackSubDomain_${subDomain}_${i}`; const p = `blackSubDomain_${subDomain}_${i}`;
// SQL is 1 based, so we need '+ 1' if (i === subDomains.length - 1) {
qb.andWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain }); // 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 });
}
i++; i++;
} }
} }