aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/utils
diff options
context:
space:
mode:
Diffstat (limited to 'shared/utils')
-rw-r--r--shared/utils/server/jobs.ts3
-rw-r--r--shared/utils/users/user-notifications.ts11
2 files changed, 13 insertions, 1 deletions
diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts
index 6218c0b66..692b5e24d 100644
--- a/shared/utils/server/jobs.ts
+++ b/shared/utils/server/jobs.ts
@@ -29,6 +29,7 @@ function getJobsListPaginationAndSort (url: string, accessToken: string, state:
29} 29}
30 30
31async function waitJobs (serversArg: ServerInfo[] | ServerInfo) { 31async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
32 const pendingJobWait = process.env.NODE_PENDING_JOB_WAIT ? parseInt(process.env.NODE_PENDING_JOB_WAIT, 10) : 2000
32 let servers: ServerInfo[] 33 let servers: ServerInfo[]
33 34
34 if (Array.isArray(serversArg) === false) servers = [ serversArg as ServerInfo ] 35 if (Array.isArray(serversArg) === false) servers = [ serversArg as ServerInfo ]
@@ -62,7 +63,7 @@ async function waitJobs (serversArg: ServerInfo[] | ServerInfo) {
62 63
63 // Retry, in case of new jobs were created 64 // Retry, in case of new jobs were created
64 if (pendingRequests === false) { 65 if (pendingRequests === false) {
65 await wait(2000) 66 await wait(pendingJobWait)
66 await Promise.all(tasksBuilder()) 67 await Promise.all(tasksBuilder())
67 } 68 }
68 69
diff --git a/shared/utils/users/user-notifications.ts b/shared/utils/users/user-notifications.ts
index 1222899e7..bcbe29fc7 100644
--- a/shared/utils/users/user-notifications.ts
+++ b/shared/utils/users/user-notifications.ts
@@ -54,6 +54,16 @@ function markAsReadNotifications (url: string, token: string, ids: number[], sta
54 statusCodeExpected 54 statusCodeExpected
55 }) 55 })
56} 56}
57function markAsReadAllNotifications (url: string, token: string, statusCodeExpected = 204) {
58 const path = '/api/v1/users/me/notifications/read-all'
59
60 return makePostBodyRequest({
61 url,
62 path,
63 token,
64 statusCodeExpected
65 })
66}
57 67
58async function getLastNotification (serverUrl: string, accessToken: string) { 68async function getLastNotification (serverUrl: string, accessToken: string) {
59 const res = await getUserNotifications(serverUrl, accessToken, 0, 1, undefined, '-createdAt') 69 const res = await getUserNotifications(serverUrl, accessToken, 0, 1, undefined, '-createdAt')
@@ -409,6 +419,7 @@ export {
409 CheckerBaseParams, 419 CheckerBaseParams,
410 CheckerType, 420 CheckerType,
411 checkNotification, 421 checkNotification,
422 markAsReadAllNotifications,
412 checkMyVideoImportIsFinished, 423 checkMyVideoImportIsFinished,
413 checkUserRegistered, 424 checkUserRegistered,
414 checkVideoIsPublished, 425 checkVideoIsPublished,