aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-02-16 11:56:58 +0100
committerChocobozzz <me@florianbigard.com>2023-02-16 11:56:58 +0100
commite65ef81cf51746616182a822bd6933bf0d16717a (patch)
treeff9e715b50eb690b8fbb5263cf1371d9f8103ff1 /server/controllers
parent5bfe684e76d32a7745671635f8a75f932bd522e4 (diff)
downloadPeerTube-e65ef81cf51746616182a822bd6933bf0d16717a.tar.gz
PeerTube-e65ef81cf51746616182a822bd6933bf0d16717a.tar.zst
PeerTube-e65ef81cf51746616182a822bd6933bf0d16717a.zip
Update server dependencies
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/jobs.ts6
-rw-r--r--server/controllers/api/users/index.ts2
-rw-r--r--server/controllers/api/users/my-subscriptions.ts4
3 files changed, 7 insertions, 5 deletions
diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index 0a45c33ab..6a53e3083 100644
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -26,7 +26,7 @@ jobsRouter.post('/pause',
26jobsRouter.post('/resume', 26jobsRouter.post('/resume',
27 authenticate, 27 authenticate,
28 ensureUserHasRight(UserRight.MANAGE_JOBS), 28 ensureUserHasRight(UserRight.MANAGE_JOBS),
29 asyncMiddleware(resumeJobQueue) 29 resumeJobQueue
30) 30)
31 31
32jobsRouter.get('/:state?', 32jobsRouter.get('/:state?',
@@ -55,8 +55,8 @@ async function pauseJobQueue (req: express.Request, res: express.Response) {
55 return res.sendStatus(HttpStatusCode.NO_CONTENT_204) 55 return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
56} 56}
57 57
58async function resumeJobQueue (req: express.Request, res: express.Response) { 58function resumeJobQueue (req: express.Request, res: express.Response) {
59 await JobQueue.Instance.resume() 59 JobQueue.Instance.resume()
60 60
61 return res.sendStatus(HttpStatusCode.NO_CONTENT_204) 61 return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
62} 62}
diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts
index 5a5a12e82..96366d68c 100644
--- a/server/controllers/api/users/index.ts
+++ b/server/controllers/api/users/index.ts
@@ -309,7 +309,7 @@ async function changeUserBlock (res: express.Response, user: MUserAccountDefault
309 await user.save({ transaction: t }) 309 await user.save({ transaction: t })
310 }) 310 })
311 311
312 await Emailer.Instance.addUserBlockJob(user, block, reason) 312 Emailer.Instance.addUserBlockJob(user, block, reason)
313 313
314 auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView) 314 auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView)
315} 315}
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index a750f9bd1..6c64e99a7 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -138,7 +138,9 @@ async function deleteUserSubscription (req: express.Request, res: express.Respon
138 const subscription = res.locals.subscription 138 const subscription = res.locals.subscription
139 139
140 await sequelizeTypescript.transaction(async t => { 140 await sequelizeTypescript.transaction(async t => {
141 if (subscription.state === 'accepted') await sendUndoFollow(subscription, t) 141 if (subscription.state === 'accepted') {
142 sendUndoFollow(subscription, t)
143 }
142 144
143 return subscription.destroy({ transaction: t }) 145 return subscription.destroy({ transaction: t })
144 }) 146 })