From dae86118ed5d4026d04acb9d0e36829b9ad8eb4e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 19 Mar 2019 10:35:15 +0100 Subject: Cleanup express locals typings --- server/controllers/api/videos/comment.ts | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'server/controllers/api/videos/comment.ts') diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index 70c1148ba..176ee8bd4 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -8,7 +8,8 @@ import { buildFormattedCommentTree, createVideoComment } from '../../../lib/vide import { asyncMiddleware, asyncRetryTransactionMiddleware, - authenticate, optionalAuthenticate, + authenticate, + optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort @@ -21,11 +22,9 @@ import { removeVideoCommentValidator, videoCommentThreadsSortValidator } from '../../../middlewares/validators' -import { VideoModel } from '../../../models/video/video' import { VideoCommentModel } from '../../../models/video/video-comment' import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' import { AccountModel } from '../../../models/account/account' -import { UserModel } from '../../../models/account/user' import { Notifier } from '../../../lib/notifier' const auditLogger = auditLoggerFactory('comments') @@ -70,9 +69,9 @@ export { // --------------------------------------------------------------------------- -async function listVideoThreads (req: express.Request, res: express.Response, next: express.NextFunction) { - const video = res.locals.video as VideoModel - const user: UserModel = res.locals.oauth ? res.locals.oauth.token.User : undefined +async function listVideoThreads (req: express.Request, res: express.Response) { + const video = res.locals.video + const user = res.locals.oauth ? res.locals.oauth.token.User : undefined let resultList: ResultList @@ -88,9 +87,9 @@ async function listVideoThreads (req: express.Request, res: express.Response, ne return res.json(getFormattedObjects(resultList.data, resultList.total)) } -async function listVideoThreadComments (req: express.Request, res: express.Response, next: express.NextFunction) { - const video = res.locals.video as VideoModel - const user: UserModel = res.locals.oauth ? res.locals.oauth.token.User : undefined +async function listVideoThreadComments (req: express.Request, res: express.Response) { + const video = res.locals.video + const user = res.locals.oauth ? res.locals.oauth.token.User : undefined let resultList: ResultList @@ -110,7 +109,7 @@ async function addVideoCommentThread (req: express.Request, res: express.Respons const videoCommentInfo: VideoCommentCreate = req.body const comment = await sequelizeTypescript.transaction(async t => { - const account = await AccountModel.load((res.locals.oauth.token.User as UserModel).Account.id, t) + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) return createVideoComment({ text: videoCommentInfo.text, @@ -132,7 +131,7 @@ async function addVideoCommentReply (req: express.Request, res: express.Response const videoCommentInfo: VideoCommentCreate = req.body const comment = await sequelizeTypescript.transaction(async t => { - const account = await AccountModel.load((res.locals.oauth.token.User as UserModel).Account.id, t) + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) return createVideoComment({ text: videoCommentInfo.text, @@ -149,7 +148,7 @@ async function addVideoCommentReply (req: express.Request, res: express.Response } async function removeVideoComment (req: express.Request, res: express.Response) { - const videoCommentInstance: VideoCommentModel = res.locals.videoComment + const videoCommentInstance = res.locals.videoComment await sequelizeTypescript.transaction(async t => { await videoCommentInstance.destroy({ transaction: t }) -- cgit v1.2.3