import * as express from 'express'
+import { logger } from '@server/helpers/logger'
import { createAccountAbuse, createVideoAbuse, createVideoCommentAbuse } from '@server/lib/moderation'
+import { Notifier } from '@server/lib/notifier'
import { AbuseModel } from '@server/models/abuse/abuse'
import { AbuseMessageModel } from '@server/models/abuse/abuse-message'
import { getServerActor } from '@server/models/application/application'
-import { AbuseCreate, abusePredefinedReasonsMap, AbuseState, UserRight } from '../../../shared'
+import { abusePredefinedReasonsMap } from '@shared/core-utils/abuse'
+import { AbuseCreate, AbuseState, UserRight } from '../../../shared'
import { getFormattedObjects } from '../../helpers/utils'
import { sequelizeTypescript } from '../../initializers/database'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
+ checkAbuseValidForMessagesValidator,
deleteAbuseMessageValidator,
ensureUserHasRight,
getAbuseValidator,
abuseRouter.get('/:id/messages',
authenticate,
asyncMiddleware(getAbuseValidator),
+ checkAbuseValidForMessagesValidator,
asyncRetryTransactionMiddleware(listAbuseMessages)
)
abuseRouter.post('/:id/messages',
authenticate,
asyncMiddleware(getAbuseValidator),
+ checkAbuseValidForMessagesValidator,
addAbuseMessageValidator,
asyncRetryTransactionMiddleware(addAbuseMessage)
)
abuseRouter.delete('/:id/messages/:messageId',
authenticate,
asyncMiddleware(getAbuseValidator),
+ checkAbuseValidForMessagesValidator,
asyncMiddleware(deleteAbuseMessageValidator),
asyncRetryTransactionMiddleware(deleteAbuseMessage)
)
// ---------------------------------------------------------------------------
export {
- abuseRouter,
-
- // FIXME: deprecated in 2.3. Remove these exports
- listAbusesForAdmins,
- updateAbuse,
- deleteAbuse,
- reportAbuse
+ abuseRouter
}
// ---------------------------------------------------------------------------
async function updateAbuse (req: express.Request, res: express.Response) {
const abuse = res.locals.abuse
+ let stateUpdated = false
if (req.body.moderationComment !== undefined) abuse.moderationComment = req.body.moderationComment
- if (req.body.state !== undefined) abuse.state = req.body.state
+
+ if (req.body.state !== undefined) {
+ abuse.state = req.body.state
+ stateUpdated = true
+ }
await sequelizeTypescript.transaction(t => {
return abuse.save({ transaction: t })
})
- // TODO: Notification
+ if (stateUpdated === true) {
+ AbuseModel.loadFull(abuse.id)
+ .then(abuseFull => Notifier.Instance.notifyOnAbuseStateChange(abuseFull))
+ .catch(err => logger.error('Cannot notify on abuse state change', { err }))
+ }
// Do not send the delete to other instances, we updated OUR copy of this abuse
- return res.type('json').status(204).end()
+ return res.sendStatus(204)
}
async function deleteAbuse (req: express.Request, res: express.Response) {
// Do not send the delete to other instances, we delete OUR copy of this abuse
- return res.type('json').status(204).end()
+ return res.sendStatus(204)
}
async function reportAbuse (req: express.Request, res: express.Response) {
abuseId: abuse.id
})
- // TODO: Notification
+ AbuseModel.loadFull(abuse.id)
+ .then(abuseFull => Notifier.Instance.notifyOnAbuseMessage(abuseFull, abuseMessage))
+ .catch(err => logger.error('Cannot notify on new abuse message', { err }))
return res.json({
abuseMessage: {