import 'multer'
import * as express from 'express'
-import { UserUpdateMe, UserVideoRate as FormattedUserVideoRate, VideoSortField } from '../../../../shared'
+import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger'
+import { Hooks } from '@server/lib/plugins/hooks'
+import { ActorImageType, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { UserVideoQuota } from '../../../../shared/models/users/user-video-quota.model'
import { createReqFiles } from '../../../helpers/express-utils'
import { getFormattedObjects } from '../../../helpers/utils'
import { MIMETYPES } from '../../../initializers/constants'
import { sequelizeTypescript } from '../../../initializers/database'
import { sendUpdateActor } from '../../../lib/activitypub/send'
-import { updateActorAvatarFile } from '../../../lib/avatar'
-import { sendVerifyUserEmail } from '../../../lib/user'
+import { deleteLocalActorImageFile, updateLocalActorImageFile } from '../../../lib/actor-image'
+import { getOriginalVideoFileTotalDailyFromUser, getOriginalVideoFileTotalFromUser, sendVerifyUserEmail } from '../../../lib/user'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ setDefaultVideosSort,
usersUpdateMeValidator,
usersVideoRatingValidator
} from '../../../middlewares'
import { deleteMeValidator, videoImportsSortValidator, videosSortValidator } from '../../../middlewares/validators'
-import { updateAvatarValidator } from '../../../middlewares/validators/avatar'
+import { updateAvatarValidator } from '../../../middlewares/validators/actor-image'
import { AccountModel } from '../../../models/account/account'
import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
-import { UserModel } from '../../../models/account/user'
+import { UserModel } from '../../../models/user/user'
import { VideoModel } from '../../../models/video/video'
import { VideoImportModel } from '../../../models/video/video-import'
+import { AttributesOnly } from '@shared/core-utils'
+
+const auditLogger = auditLoggerFactory('users')
const reqAvatarFile = createReqFiles([ 'avatarfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.TMP_DIR })
authenticate,
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
asyncMiddleware(getUserVideos)
)
asyncRetryTransactionMiddleware(updateMyAvatar)
)
+meRouter.delete('/me/avatar',
+ authenticate,
+ asyncRetryTransactionMiddleware(deleteMyAvatar)
+)
+
// ---------------------------------------------------------------------------
export {
async function getUserVideos (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
- const resultList = await VideoModel.listUserVideosForApi(
- user.Account.id,
- req.query.start as number,
- req.query.count as number,
- req.query.sort as VideoSortField,
- req.query.search as string
+
+ const apiOptions = await Hooks.wrapObject({
+ accountId: user.Account.id,
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ isLive: req.query.isLive
+ }, 'filter:api.user.me.videos.list.params')
+
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoModel.listUserVideosForApi,
+ apiOptions,
+ 'filter:api.user.me.videos.list.result'
)
const additionalAttributes = {
async function getUserInformation (req: express.Request, res: express.Response) {
// We did not load channels in res.locals.user
- const user = await UserModel.loadForMeAPI(res.locals.oauth.token.user.username)
+ const user = await UserModel.loadForMeAPI(res.locals.oauth.token.user.id)
return res.json(user.toMeFormattedJSON())
}
async function getUserVideoQuotaUsed (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.user
- const videoQuotaUsed = await UserModel.getOriginalVideoFileTotalFromUser(user)
- const videoQuotaUsedDaily = await UserModel.getOriginalVideoFileTotalDailyFromUser(user)
+ const videoQuotaUsed = await getOriginalVideoFileTotalFromUser(user)
+ const videoQuotaUsedDaily = await getOriginalVideoFileTotalDailyFromUser(user)
const data: UserVideoQuota = {
videoQuotaUsed,
}
async function deleteMe (req: express.Request, res: express.Response) {
- const user = res.locals.oauth.token.User
+ const user = await UserModel.loadByIdWithChannels(res.locals.oauth.token.User.id)
+
+ auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()))
await user.destroy()
- return res.sendStatus(204)
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function updateMe (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.user
- if (body.password !== undefined) user.password = body.password
- if (body.nsfwPolicy !== undefined) user.nsfwPolicy = body.nsfwPolicy
- if (body.webTorrentEnabled !== undefined) user.webTorrentEnabled = body.webTorrentEnabled
- if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo
- if (body.autoPlayNextVideo !== undefined) user.autoPlayNextVideo = body.autoPlayNextVideo
- if (body.autoPlayNextVideoPlaylist !== undefined) user.autoPlayNextVideoPlaylist = body.autoPlayNextVideoPlaylist
- if (body.videosHistoryEnabled !== undefined) user.videosHistoryEnabled = body.videosHistoryEnabled
- if (body.videoLanguages !== undefined) user.videoLanguages = body.videoLanguages
- if (body.theme !== undefined) user.theme = body.theme
- if (body.noInstanceConfigWarningModal !== undefined) user.noInstanceConfigWarningModal = body.noInstanceConfigWarningModal
- if (body.noWelcomeModal !== undefined) user.noWelcomeModal = body.noWelcomeModal
+ const keysToUpdate: (keyof UserUpdateMe & keyof AttributesOnly<UserModel>)[] = [
+ 'password',
+ 'nsfwPolicy',
+ 'webTorrentEnabled',
+ 'autoPlayVideo',
+ 'autoPlayNextVideo',
+ 'autoPlayNextVideoPlaylist',
+ 'videosHistoryEnabled',
+ 'videoLanguages',
+ 'theme',
+ 'noInstanceConfigWarningModal',
+ 'noWelcomeModal'
+ ]
+
+ for (const key of keysToUpdate) {
+ if (body[key] !== undefined) user.set(key, body[key])
+ }
if (body.email !== undefined) {
if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) {
await sequelizeTypescript.transaction(async t => {
await user.save({ transaction: t })
- if (body.displayName !== undefined || body.description !== undefined) {
- const userAccount = await AccountModel.load(user.Account.id, t)
+ if (body.displayName === undefined && body.description === undefined) return
- if (body.displayName !== undefined) userAccount.name = body.displayName
- if (body.description !== undefined) userAccount.description = body.description
- await userAccount.save({ transaction: t })
+ const userAccount = await AccountModel.load(user.Account.id, t)
- await sendUpdateActor(userAccount, t)
- }
+ if (body.displayName !== undefined) userAccount.name = body.displayName
+ if (body.description !== undefined) userAccount.description = body.description
+ await userAccount.save({ transaction: t })
+
+ await sendUpdateActor(userAccount, t)
})
if (sendVerificationEmail === true) {
await sendVerifyUserEmail(user, true)
}
- return res.sendStatus(204)
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
async function updateMyAvatar (req: express.Request, res: express.Response) {
const userAccount = await AccountModel.load(user.Account.id)
- const avatar = await updateActorAvatarFile(avatarPhysicalFile, userAccount)
+ const avatar = await updateLocalActorImageFile(userAccount, avatarPhysicalFile, ActorImageType.AVATAR)
return res.json({ avatar: avatar.toFormattedJSON() })
}
+
+async function deleteMyAvatar (req: express.Request, res: express.Response) {
+ const user = res.locals.oauth.token.user
+
+ const userAccount = await AccountModel.load(user.Account.id)
+ await deleteLocalActorImageFile(userAccount, ActorImageType.AVATAR)
+
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
+}
projects / github / Chocobozzz / PeerTube.git / blobdiff