aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api/accounts.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-24 17:05:32 +0200
committerChocobozzz <me@florianbigard.com>2018-04-24 17:12:57 +0200
commit48dce1c90dff4e90a4bcffefaecf157336cf904b (patch)
tree478de23812d0bfd93f47e9ad6ad8888c9edcc235 /server/controllers/api/accounts.ts
parent82e392f8a42a19815e932dd386e96e61ebe6d191 (diff)
downloadPeerTube-48dce1c90dff4e90a4bcffefaecf157336cf904b.tar.gz
PeerTube-48dce1c90dff4e90a4bcffefaecf157336cf904b.tar.zst
PeerTube-48dce1c90dff4e90a4bcffefaecf157336cf904b.zip
Update video channel routes
Diffstat (limited to 'server/controllers/api/accounts.ts')
-rw-r--r--server/controllers/api/accounts.ts209
1 files changed, 195 insertions, 14 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 06ab04033..04c5897c5 100644
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -1,11 +1,30 @@
1import * as express from 'express' 1import * as express from 'express'
2import { getFormattedObjects } from '../../helpers/utils' 2import { getFormattedObjects, resetSequelizeInstance } from '../../helpers/utils'
3import { asyncMiddleware, optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort } from '../../middlewares' 3import {
4 asyncMiddleware,
5 authenticate,
6 listVideoAccountChannelsValidator,
7 optionalAuthenticate,
8 paginationValidator,
9 setDefaultPagination,
10 setDefaultSort,
11 videoChannelsAddValidator,
12 videoChannelsGetValidator,
13 videoChannelsRemoveValidator,
14 videoChannelsUpdateValidator
15} from '../../middlewares'
4import { accountsGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators' 16import { accountsGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators'
5import { AccountModel } from '../../models/account/account' 17import { AccountModel } from '../../models/account/account'
6import { VideoModel } from '../../models/video/video' 18import { VideoModel } from '../../models/video/video'
7import { VideoSortField } from '../../../client/src/app/shared/video/sort-field.type'
8import { isNSFWHidden } from '../../helpers/express-utils' 19import { isNSFWHidden } from '../../helpers/express-utils'
20import { VideoChannelModel } from '../../models/video/video-channel'
21import { VideoChannelCreate, VideoChannelUpdate } from '../../../shared'
22import { sendUpdateActor } from '../../lib/activitypub/send'
23import { createVideoChannel } from '../../lib/video-channel'
24import { setAsyncActorKeys } from '../../lib/activitypub'
25import { sequelizeTypescript } from '../../initializers'
26import { logger } from '../../helpers/logger'
27import { retryTransactionWrapper } from '../../helpers/database-utils'
9 28
10const accountsRouter = express.Router() 29const accountsRouter = express.Router()
11 30
@@ -29,7 +48,45 @@ accountsRouter.get('/:id/videos',
29 setDefaultSort, 48 setDefaultSort,
30 setDefaultPagination, 49 setDefaultPagination,
31 optionalAuthenticate, 50 optionalAuthenticate,
32 asyncMiddleware(getAccountVideos) 51 asyncMiddleware(listAccountVideos)
52)
53
54accountsRouter.get('/:accountId/video-channels',
55 asyncMiddleware(listVideoAccountChannelsValidator),
56 asyncMiddleware(listVideoAccountChannels)
57)
58
59accountsRouter.post('/:accountId/video-channels',
60 authenticate,
61 videoChannelsAddValidator,
62 asyncMiddleware(addVideoChannelRetryWrapper)
63)
64
65accountsRouter.put('/:accountId/video-channels/:id',
66 authenticate,
67 asyncMiddleware(videoChannelsUpdateValidator),
68 updateVideoChannelRetryWrapper
69)
70
71accountsRouter.delete('/:accountId/video-channels/:id',
72 authenticate,
73 asyncMiddleware(videoChannelsRemoveValidator),
74 asyncMiddleware(removeVideoChannelRetryWrapper)
75)
76
77accountsRouter.get('/:accountId/video-channels/:id',
78 asyncMiddleware(videoChannelsGetValidator),
79 asyncMiddleware(getVideoChannel)
80)
81
82accountsRouter.get('/:accountId/video-channels/:id/videos',
83 asyncMiddleware(videoChannelsGetValidator),
84 paginationValidator,
85 videosSortValidator,
86 setDefaultSort,
87 setDefaultPagination,
88 optionalAuthenticate,
89 asyncMiddleware(listVideoChannelVideos)
33) 90)
34 91
35// --------------------------------------------------------------------------- 92// ---------------------------------------------------------------------------
@@ -52,18 +109,142 @@ async function listAccounts (req: express.Request, res: express.Response, next:
52 return res.json(getFormattedObjects(resultList.data, resultList.total)) 109 return res.json(getFormattedObjects(resultList.data, resultList.total))
53} 110}
54 111
55async function getAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) { 112async function listVideoAccountChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
113 const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
114
115 return res.json(getFormattedObjects(resultList.data, resultList.total))
116}
117
118// Wrapper to video channel add that retry the async function if there is a database error
119// We need this because we run the transaction in SERIALIZABLE isolation that can fail
120async function addVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
121 const options = {
122 arguments: [ req, res ],
123 errorMessage: 'Cannot insert the video video channel with many retries.'
124 }
125
126 const videoChannel = await retryTransactionWrapper(addVideoChannel, options)
127 return res.json({
128 videoChannel: {
129 id: videoChannel.id
130 }
131 }).end()
132}
133
134async function addVideoChannel (req: express.Request, res: express.Response) {
135 const videoChannelInfo: VideoChannelCreate = req.body
136 const account: AccountModel = res.locals.oauth.token.User.Account
137
138 const videoChannelCreated: VideoChannelModel = await sequelizeTypescript.transaction(async t => {
139 return createVideoChannel(videoChannelInfo, account, t)
140 })
141
142 setAsyncActorKeys(videoChannelCreated.Actor)
143 .catch(err => logger.error('Cannot set async actor keys for account %s.', videoChannelCreated.Actor.uuid, { err }))
144
145 logger.info('Video channel with uuid %s created.', videoChannelCreated.Actor.uuid)
146
147 return videoChannelCreated
148}
149
150async function updateVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
151 const options = {
152 arguments: [ req, res ],
153 errorMessage: 'Cannot update the video with many retries.'
154 }
155
156 await retryTransactionWrapper(updateVideoChannel, options)
157
158 return res.type('json').status(204).end()
159}
160
161async function updateVideoChannel (req: express.Request, res: express.Response) {
162 const videoChannelInstance = res.locals.videoChannel as VideoChannelModel
163 const videoChannelFieldsSave = videoChannelInstance.toJSON()
164 const videoChannelInfoToUpdate = req.body as VideoChannelUpdate
165
166 try {
167 await sequelizeTypescript.transaction(async t => {
168 const sequelizeOptions = {
169 transaction: t
170 }
171
172 if (videoChannelInfoToUpdate.name !== undefined) videoChannelInstance.set('name', videoChannelInfoToUpdate.name)
173 if (videoChannelInfoToUpdate.description !== undefined) videoChannelInstance.set('description', videoChannelInfoToUpdate.description)
174 if (videoChannelInfoToUpdate.support !== undefined) videoChannelInstance.set('support', videoChannelInfoToUpdate.support)
175
176 const videoChannelInstanceUpdated = await videoChannelInstance.save(sequelizeOptions)
177 await sendUpdateActor(videoChannelInstanceUpdated, t)
178 })
179
180 logger.info('Video channel with name %s and uuid %s updated.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
181 } catch (err) {
182 logger.debug('Cannot update the video channel.', { err })
183
184 // Force fields we want to update
185 // If the transaction is retried, sequelize will think the object has not changed
186 // So it will skip the SQL request, even if the last one was ROLLBACKed!
187 resetSequelizeInstance(videoChannelInstance, videoChannelFieldsSave)
188
189 throw err
190 }
191}
192
193async function removeVideoChannelRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
194 const options = {
195 arguments: [ req, res ],
196 errorMessage: 'Cannot remove the video channel with many retries.'
197 }
198
199 await retryTransactionWrapper(removeVideoChannel, options)
200
201 return res.type('json').status(204).end()
202}
203
204async function removeVideoChannel (req: express.Request, res: express.Response) {
205 const videoChannelInstance: VideoChannelModel = res.locals.videoChannel
206
207 return sequelizeTypescript.transaction(async t => {
208 await videoChannelInstance.destroy({ transaction: t })
209
210 logger.info('Video channel with name %s and uuid %s deleted.', videoChannelInstance.name, videoChannelInstance.Actor.uuid)
211 })
212
213}
214
215async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) {
216 const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id)
217
218 return res.json(videoChannelWithVideos.toFormattedJSON())
219}
220
221async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
222 const videoChannelInstance: VideoChannelModel = res.locals.videoChannel
223
224 const resultList = await VideoModel.listForApi({
225 start: req.query.start,
226 count: req.query.count,
227 sort: req.query.sort,
228 hideNSFW: isNSFWHidden(res),
229 withFiles: false,
230 videoChannelId: videoChannelInstance.id
231 })
232
233 return res.json(getFormattedObjects(resultList.data, resultList.total))
234}
235
236
237async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
56 const account: AccountModel = res.locals.account 238 const account: AccountModel = res.locals.account
57 239
58 const resultList = await VideoModel.listForApi( 240 const resultList = await VideoModel.listForApi({
59 req.query.start as number, 241 start: req.query.start,
60 req.query.count as number, 242 count: req.query.count,
61 req.query.sort as VideoSortField, 243 sort: req.query.sort,
62 isNSFWHidden(res), 244 hideNSFW: isNSFWHidden(res),
63 null, 245 withFiles: false,
64 false, 246 accountId: account.id
65 account.id 247 })
66 )
67 248
68 return res.json(getFormattedObjects(resultList.data, resultList.total)) 249 return res.json(getFormattedObjects(resultList.data, resultList.total))
69} 250}