From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: Migrate server to ESM Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports) --- server/controllers/api/users/my-notifications.ts | 116 ----------------------- 1 file changed, 116 deletions(-) delete mode 100644 server/controllers/api/users/my-notifications.ts (limited to 'server/controllers/api/users/my-notifications.ts') diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts deleted file mode 100644 index 6014cdbbf..000000000 --- a/server/controllers/api/users/my-notifications.ts +++ /dev/null @@ -1,116 +0,0 @@ -import 'multer' -import express from 'express' -import { UserNotificationModel } from '@server/models/user/user-notification' -import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' -import { UserNotificationSetting } from '../../../../shared/models/users' -import { - asyncMiddleware, - asyncRetryTransactionMiddleware, - authenticate, - paginationValidator, - setDefaultPagination, - setDefaultSort, - userNotificationsSortValidator -} from '../../../middlewares' -import { - listUserNotificationsValidator, - markAsReadUserNotificationsValidator, - updateNotificationSettingsValidator -} from '../../../middlewares/validators/user-notifications' -import { UserNotificationSettingModel } from '../../../models/user/user-notification-setting' -import { meRouter } from './me' -import { getFormattedObjects } from '@server/helpers/utils' - -const myNotificationsRouter = express.Router() - -meRouter.put('/me/notification-settings', - authenticate, - updateNotificationSettingsValidator, - asyncRetryTransactionMiddleware(updateNotificationSettings) -) - -myNotificationsRouter.get('/me/notifications', - authenticate, - paginationValidator, - userNotificationsSortValidator, - setDefaultSort, - setDefaultPagination, - listUserNotificationsValidator, - asyncMiddleware(listUserNotifications) -) - -myNotificationsRouter.post('/me/notifications/read', - authenticate, - markAsReadUserNotificationsValidator, - asyncMiddleware(markAsReadUserNotifications) -) - -myNotificationsRouter.post('/me/notifications/read-all', - authenticate, - asyncMiddleware(markAsReadAllUserNotifications) -) - -export { - myNotificationsRouter -} - -// --------------------------------------------------------------------------- - -async function updateNotificationSettings (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - const body = req.body as UserNotificationSetting - - const query = { - where: { - userId: user.id - } - } - - const values: UserNotificationSetting = { - newVideoFromSubscription: body.newVideoFromSubscription, - newCommentOnMyVideo: body.newCommentOnMyVideo, - abuseAsModerator: body.abuseAsModerator, - videoAutoBlacklistAsModerator: body.videoAutoBlacklistAsModerator, - blacklistOnMyVideo: body.blacklistOnMyVideo, - myVideoPublished: body.myVideoPublished, - myVideoImportFinished: body.myVideoImportFinished, - newFollow: body.newFollow, - newUserRegistration: body.newUserRegistration, - commentMention: body.commentMention, - newInstanceFollower: body.newInstanceFollower, - autoInstanceFollowing: body.autoInstanceFollowing, - abuseNewMessage: body.abuseNewMessage, - abuseStateChange: body.abuseStateChange, - newPeerTubeVersion: body.newPeerTubeVersion, - newPluginVersion: body.newPluginVersion, - myVideoStudioEditionFinished: body.myVideoStudioEditionFinished - } - - await UserNotificationSettingModel.update(values, query) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} - -async function listUserNotifications (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - - const resultList = await UserNotificationModel.listForApi(user.id, req.query.start, req.query.count, req.query.sort, req.query.unread) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - -async function markAsReadUserNotifications (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - - await UserNotificationModel.markAsRead(user.id, req.body.ids) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} - -async function markAsReadAllUserNotifications (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - - await UserNotificationModel.markAllAsRead(user.id) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} -- cgit v1.2.3