diff options
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/blocking/create.ts | 5 | ||||
| -rw-r--r-- | src/services/logger.ts | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index 76c4bda9dc..defe377514 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -9,8 +9,13 @@ import { User } from '@/models/entities/user'; import { Blockings, Users, FollowRequests, Followings, UserListJoinings, UserLists } from '@/models/index'; import { perUserFollowingChart } from '@/services/chart/index'; import { genId } from '@/misc/gen-id'; +import { IdentifiableError } from '@/misc/identifiable-error'; export default async function(blocker: User, blockee: User) { + if (blockee.isAdmin || blockee.isModerator) { + throw new IdentifiableError('e42b7890-5e4d-9d9c-d54b-cf4dd30adfb5'); + } + await Promise.all([ cancelRequest(blocker, blockee), cancelRequest(blockee, blocker), diff --git a/src/services/logger.ts b/src/services/logger.ts index 229be891e1..8e783e67f6 100644 --- a/src/services/logger.ts +++ b/src/services/logger.ts @@ -2,7 +2,7 @@ import * as cluster from 'cluster'; import * as os from 'os'; import * as chalk from 'chalk'; import * as dateformat from 'dateformat'; -import { program } from '../argv'; +import { envOption } from '../env'; import { getRepository } from 'typeorm'; import { Log } from '@/models/entities/log'; import { genId } from '@/misc/gen-id'; @@ -52,7 +52,7 @@ export default class Logger { } private log(level: Level, message: string, data?: Record<string, any> | null, important = false, subDomains: Domain[] = [], store = true): void { - if (program.quiet) return; + if (envOption.quiet) return; if (!this.store) store = false; if (level === 'debug') store = false; @@ -80,7 +80,7 @@ export default class Logger { null; let log = `${l} ${worker}\t[${domains.join(' ')}]\t${m}`; - if (program.withLogTime) log = chalk.gray(time) + ' ' + log; + if (envOption.withLogTime) log = chalk.gray(time) + ' ' + log; console.log(important ? chalk.bold(log) : log); @@ -132,7 +132,7 @@ export default class Logger { } public debug(message: string, data?: Record<string, any> | null, important = false): void { // デバッグ用に使う(開発者に必要だが利用者に不要な情報) - if (process.env.NODE_ENV != 'production' || program.verbose) { + if (process.env.NODE_ENV != 'production' || envOption.verbose) { this.log('debug', message, data, important); } } |