Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Limit max live sessions

Chocobozzza6f2e92c35c8
diff --git a/server/core/controllers/api/videos/live.ts b/server/core/controllers/api/videos/live.ts
index 4c3f3c3248..f8b7a5e0c8 100644
--- a/server/core/controllers/api/videos/live.ts
+++ b/server/core/controllers/api/videos/live.ts
@@ -1,12 +1,5 @@
import express from 'express'
-import {
- HttpStatusCode,
- LiveVideoCreate,
- LiveVideoUpdate,
- ThumbnailType,
- UserRight,
- VideoState
-} from '@peertube/peertube-models'
+import { HttpStatusCode, LiveVideoCreate, LiveVideoUpdate, ThumbnailType, UserRight, VideoState } from '@peertube/peertube-models'
import { exists } from '@server/helpers/custom-validators/misc.js'
import { createReqFiles } from '@server/helpers/express-utils.js'
import { getFormattedObjects } from '@server/helpers/utils.js'
@@ -35,37 +28,33 @@ const liveRouter = express.Router()
const reqVideoFileLive = createReqFiles([ 'thumbnailfile', 'previewfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT)
-liveRouter.post('/live',
+liveRouter.post(
+ '/live',
authenticate,
reqVideoFileLive,
asyncMiddleware(videoLiveAddValidator),
asyncRetryTransactionMiddleware(addLiveVideo)
)
-liveRouter.get('/live/:videoId/sessions',
+liveRouter.get(
+ '/live/:videoId/sessions',
authenticate,
asyncMiddleware(videoLiveGetValidator),
videoLiveListSessionsValidator,
asyncMiddleware(getLiveVideoSessions)
)
-liveRouter.get('/live/:videoId',
- optionalAuthenticate,
- asyncMiddleware(videoLiveGetValidator),
- getLiveVideo
-)
+liveRouter.get('/live/:videoId', optionalAuthenticate, asyncMiddleware(videoLiveGetValidator), getLiveVideo)
-liveRouter.put('/live/:videoId',
+liveRouter.put(
+ '/live/:videoId',
authenticate,
asyncMiddleware(videoLiveGetValidator),
videoLiveUpdateValidator,
asyncRetryTransactionMiddleware(updateLiveVideo)
)
-liveRouter.get('/:videoId/live-session',
- asyncMiddleware(videoLiveFindReplaySessionValidator),
- getLiveReplaySession
-)
+liveRouter.get('/:videoId/live-session', asyncMiddleware(videoLiveFindReplaySessionValidator), getLiveReplaySession)
// ---------------------------------------------------------------------------
@@ -90,7 +79,7 @@ function getLiveReplaySession (req: express.Request, res: express.Response) {
async function getLiveVideoSessions (req: express.Request, res: express.Response) {
const videoLive = res.locals.videoLive
- const data = await VideoLiveSessionModel.listSessionsOfLiveForAPI({ videoId: videoLive.videoId })
+ const data = await VideoLiveSessionModel.listSessionsOfLiveForAPI({ videoId: videoLive.videoId, count: 100 })
return res.json(getFormattedObjects(data, data.length))
}
diff --git a/server/core/models/video/video-live-session.ts b/server/core/models/video/video-live-session.ts
index 1788de2d02..cd3bb356b8 100644
--- a/server/core/models/video/video-live-session.ts
+++ b/server/core/models/video/video-live-session.ts
@@ -10,7 +10,8 @@ import {
Column,
CreatedAt,
DataType,
- ForeignKey, Scopes,
+ ForeignKey,
+ Scopes,
Table,
UpdatedAt
} from 'sequelize-typescript'
@@ -54,7 +55,6 @@ export enum ScopeNames {
]
})
export class VideoLiveSessionModel extends SequelizeModel<VideoLiveSessionModel> {
-
@CreatedAt
createdAt: Date
@@ -174,13 +174,17 @@ export class VideoLiveSessionModel extends SequelizeModel<VideoLiveSessionModel>
})
}
- static listSessionsOfLiveForAPI (options: { videoId: number }) {
- const { videoId } = options
+ static listSessionsOfLiveForAPI (options: {
+ videoId: number
+ count: number
+ }) {
+ const { videoId, count } = options
const query: FindOptions<AttributesOnly<VideoLiveSessionModel>> = {
where: {
liveVideoId: videoId
},
+ limit: count,
order: [ [ 'startDate', 'ASC' ] ]
}