-import * as path from 'path'
-import * as express from 'express'
import { diff } from 'deep-object-diff'
+import express from 'express'
+import flatten from 'flat'
import { chain } from 'lodash'
-import * as flatten from 'flat'
-import * as winston from 'winston'
-import { jsonLoggerFormat, labelFormatter } from './logger'
-import { User, VideoAbuse, VideoChannel, VideoDetails, VideoImport } from '../../shared'
-import { VideoComment } from '../../shared/models/videos/video-comment.model'
+import { join } from 'path'
+import { addColors, config, createLogger, format, transports } from 'winston'
+import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
+import { AdminAbuse, User, VideoChannel, VideoDetails, VideoImport } from '../../shared'
import { CustomConfig } from '../../shared/models/server/custom-config.model'
+import { VideoComment } from '../../shared/models/videos/comment/video-comment.model'
import { CONFIG } from '../initializers/config'
-import { AUDIT_LOG_FILENAME } from '@server/initializers/constants'
+import { jsonLoggerFormat, labelFormatter } from './logger'
function getAuditIdFromRes (res: express.Response) {
return res.locals.oauth.token.User.username
DELETE = 'delete'
}
-const colors = winston.config.npm.colors
-colors.audit = winston.config.npm.colors.info
+const colors = config.npm.colors
+colors.audit = config.npm.colors.info
-winston.addColors(colors)
+addColors(colors)
-const auditLogger = winston.createLogger({
+const auditLogger = createLogger({
levels: { audit: 0 },
transports: [
- new winston.transports.File({
- filename: path.join(CONFIG.STORAGE.LOG_DIR, AUDIT_LOG_FILENAME),
+ new transports.File({
+ filename: join(CONFIG.STORAGE.LOG_DIR, AUDIT_LOG_FILENAME),
level: 'audit',
maxsize: 5242880,
maxFiles: 5,
- format: winston.format.combine(
- winston.format.timestamp(),
- labelFormatter,
- winston.format.splat(),
+ format: format.combine(
+ format.timestamp(),
+ labelFormatter(),
+ format.splat(),
jsonLoggerFormat
)
})
constructor (private readonly keysToKeep: string[], private readonly prefix: string, private readonly entityInfos: object) { }
toLogKeys (): object {
- return chain(flatten(this.entityInfos, { delimiter: '-', safe: true }))
+ return chain(flatten<object, any>(this.entityInfos, { delimiter: '-', safe: true }))
.pick(this.keysToKeep)
- .mapKeys((value, key) => `${this.prefix}-${key}`)
+ .mapKeys((_value, key) => `${this.prefix}-${key}`)
.value()
}
}
}
}
-const videoAbuseKeysToKeep = [
+const abuseKeysToKeep = [
'id',
'reason',
'reporterAccount',
- 'video-id',
- 'video-name',
- 'video-uuid',
'createdAt'
]
-class VideoAbuseAuditView extends EntityAuditView {
- constructor (private readonly videoAbuse: VideoAbuse) {
- super(videoAbuseKeysToKeep, 'abuse', videoAbuse)
+class AbuseAuditView extends EntityAuditView {
+ constructor (private readonly abuse: AdminAbuse) {
+ super(abuseKeysToKeep, 'abuse', abuse)
}
}
CommentAuditView,
UserAuditView,
VideoAuditView,
- VideoAbuseAuditView,
+ AbuseAuditView,
CustomConfigAuditView
}