7 files changed, 28 insertions, 38 deletions
diff --git a/server/lib/blocklist.ts b/server/lib/blocklist.ts
index d6b684015..98273a6ea 100644
--- a/server/lib/blocklist.ts
+++ b/server/lib/blocklist.ts
@@ -40,12 +40,12 @@ async function isBlockedByServerOrAccount (targetAccount: MAccountServer, userAc
  if (userAccount) sourceAccounts.push(userAccount.id)
-  const accountMutedHash = await AccountBlocklistModel.isAccountMutedByMulti(sourceAccounts, targetAccount.id)
+  const accountMutedHash = await AccountBlocklistModel.isAccountMutedByAccounts(sourceAccounts, targetAccount.id)
  if (accountMutedHash[serverAccountId] || (userAccount && accountMutedHash[userAccount.id])) {
    return true
  }
-  const instanceMutedHash = await ServerBlocklistModel.isServerMutedByMulti(sourceAccounts, targetAccount.Actor.serverId)
+  const instanceMutedHash = await ServerBlocklistModel.isServerMutedByAccounts(sourceAccounts, targetAccount.Actor.serverId)
  if (instanceMutedHash[serverAccountId] || (userAccount && instanceMutedHash[userAccount.id])) {
    return true
  }
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 360b4667f..adc3d712e 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -350,10 +350,6 @@ class ClientHtml {
    return join(__dirname, '../../../client/dist/standalone/videos/embed.html')
  }
-  private static addHtmlLang (htmlStringPage: string, paramLang: string) {
-    return htmlStringPage.replace('<html>', `<html lang="${paramLang}">`)
-  }
  private static addManifestContentHash (htmlStringPage: string) {
    return htmlStringPage.replace('[manifestContentHash]', FILES_CONTENT_HASH.MANIFEST)
  }
diff --git a/server/lib/notifier/shared/comment/comment-mention.ts b/server/lib/notifier/shared/comment/comment-mention.ts
index 4f84d8dea..765cbaad9 100644
--- a/server/lib/notifier/shared/comment/comment-mention.ts
+++ b/server/lib/notifier/shared/comment/comment-mention.ts
@@ -47,8 +47,8 @@ export class CommentMention extends AbstractNotification <MCommentOwnerVideo, MU
    const sourceAccounts = this.users.map(u => u.Account.id).concat([ this.serverAccountId ])
-    this.accountMutedHash = await AccountBlocklistModel.isAccountMutedByMulti(sourceAccounts, this.payload.accountId)
+    this.accountMutedHash = await AccountBlocklistModel.isAccountMutedByAccounts(sourceAccounts, this.payload.accountId)
-    this.instanceMutedHash = await ServerBlocklistModel.isServerMutedByMulti(sourceAccounts, this.payload.Account.Actor.serverId)
+    this.instanceMutedHash = await ServerBlocklistModel.isServerMutedByAccounts(sourceAccounts, this.payload.Account.Actor.serverId)
  }
  log () {
diff --git a/server/lib/plugins/plugin-manager.ts b/server/lib/plugins/plugin-manager.ts
index d4d2a7edc..6c2f4764e 100644
--- a/server/lib/plugins/plugin-manager.ts
+++ b/server/lib/plugins/plugin-manager.ts
@@ -1,8 +1,8 @@
-import decache from 'decache'
 import express from 'express'
 import { createReadStream, createWriteStream } from 'fs'
 import { ensureDir, outputFile, readJSON } from 'fs-extra'
 import { basename, join } from 'path'
+import { decachePlugin } from '@server/helpers/decache'
 import { MOAuthTokenUser, MUser } from '@server/types/models'
 import { getCompleteLocale } from '@shared/core-utils'
 import { ClientScript, PluginPackageJson, PluginTranslation, PluginTranslationPaths, RegisterServerHookOptions } from '@shared/models'
@@ -420,7 +420,7 @@ export class PluginManager implements ServerHook {
    // Delete cache if needed
    const modulePath = join(pluginPath, packageJSON.library)
-    decache(modulePath)
+    decachePlugin(pluginPath, modulePath)
    const library: PluginLibrary = require(modulePath)
    if (!isLibraryCodeValid(library)) {
diff --git a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
index d6e561cad..61e93eafa 100644
--- a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
+++ b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
@@ -1,9 +1,7 @@
-import { map } from 'bluebird'
-import { readdir, remove, stat } from 'fs-extra'
 import { logger, loggerTagsFactory } from '@server/helpers/logger'
-import { getResumableUploadPath } from '@server/helpers/upload'
 import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'
-import { METAFILE_EXTNAME } from '@uploadx/core'
+import { uploadx } from '../uploadx'
 import { AbstractScheduler } from './abstract-scheduler'
 const lTags = loggerTagsFactory('scheduler', 'resumable-upload', 'cleaner')
@@ -22,36 +20,17 @@ export class RemoveDanglingResumableUploadsScheduler extends AbstractScheduler {
  }
  protected async internalExecute () {
-    const path = getResumableUploadPath()
+    logger.debug('Removing dangling resumable uploads', lTags())
-    const files = await readdir(path)
-    const metafiles = files.filter(f => f.endsWith(METAFILE_EXTNAME))
-    if (metafiles.length === 0) return
+    const now = new Date().getTime()
-    logger.debug('Reading resumable video upload folder %s with %d files', path, metafiles.length, lTags())
    try {
-      await map(metafiles, metafile => {
+      // Remove files that were not updated since the last execution
-        return this.deleteIfOlderThan(metafile, this.lastExecutionTimeMs)
+      await uploadx.storage.purge(now - this.lastExecutionTimeMs)
-      }, { concurrency: 5 })
    } catch (error) {
      logger.error('Failed to handle file during resumable video upload folder cleanup', { error, ...lTags() })
    } finally {
-      this.lastExecutionTimeMs = new Date().getTime()
+      this.lastExecutionTimeMs = now
-    }
-  }
-  private async deleteIfOlderThan (metafile: string, olderThan: number) {
-    const metafilePath = getResumableUploadPath(metafile)
-    const statResult = await stat(metafilePath)
-    // Delete uploads that started since a long time
-    if (statResult.ctimeMs < olderThan) {
-      await remove(metafilePath)
-      const datafile = metafilePath.replace(new RegExp(`${METAFILE_EXTNAME}$`), '')
-      await remove(datafile)
    }
  }
diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts
index bdf6492f9..6aa459f82 100644
--- a/server/lib/server-config-manager.ts
+++ b/server/lib/server-config-manager.ts
@@ -47,6 +47,11 @@ class ServerConfigManager {
          miniature: {
            preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME
          }
+        },
+        menu: {
+          login: {
+            redirectOnSingleExternalAuth: CONFIG.CLIENT.MENU.LOGIN.REDIRECT_ON_SINGLE_EXTERNAL_AUTH
+          }
        }
      },
diff --git a/server/lib/uploadx.ts b/server/lib/uploadx.ts
new file mode 100644
index 000000000..11b1044db
--- /dev/null
+++ b/server/lib/uploadx.ts
@@ -0,0 +1,10 @@
+import express from 'express'
+import { getResumableUploadPath } from '@server/helpers/upload'
+import { Uploadx } from '@uploadx/core'
+const uploadx = new Uploadx({ directory: getResumableUploadPath() })
+uploadx.getUserId = (_, res: express.Response) => res.locals.oauth?.token.user.id
+export {
+  uploadx
+}

diff --git a/server/lib/blocklist.ts b/server/lib/blocklist.ts index d6b684015..98273a6ea 100644 --- a/server/lib/blocklist.ts +++ b/server/lib/blocklist.ts
@@ -40,12 +40,12 @@ async function isBlockedByServerOrAccount (targetAccount: MAccountServer, userAc
40		40
41	if (userAccount) sourceAccounts.push(userAccount.id)	41	if (userAccount) sourceAccounts.push(userAccount.id)
42		42
43	const accountMutedHash = await AccountBlocklistModel.isAccountMutedByMulti(sourceAccounts, targetAccount.id)	43	const accountMutedHash = await AccountBlocklistModel.isAccountMutedByAccounts(sourceAccounts, targetAccount.id)
44	if (accountMutedHash[serverAccountId] \|\| (userAccount && accountMutedHash[userAccount.id])) {	44	if (accountMutedHash[serverAccountId] \|\| (userAccount && accountMutedHash[userAccount.id])) {
45	return true	45	return true
46	}	46	}
47		47
48	const instanceMutedHash = await ServerBlocklistModel.isServerMutedByMulti(sourceAccounts, targetAccount.Actor.serverId)	48	const instanceMutedHash = await ServerBlocklistModel.isServerMutedByAccounts(sourceAccounts, targetAccount.Actor.serverId)
49	if (instanceMutedHash[serverAccountId] \|\| (userAccount && instanceMutedHash[userAccount.id])) {	49	if (instanceMutedHash[serverAccountId] \|\| (userAccount && instanceMutedHash[userAccount.id])) {
50	return true	50	return true
51	}	51	}


diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 360b4667f..adc3d712e 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts
@@ -350,10 +350,6 @@ class ClientHtml {
350	return join(__dirname, '../../../client/dist/standalone/videos/embed.html')	350	return join(__dirname, '../../../client/dist/standalone/videos/embed.html')
351	}	351	}
352		352
353	private static addHtmlLang (htmlStringPage: string, paramLang: string) {
354	return htmlStringPage.replace('<html>', `<html lang="${paramLang}">`)
355	}
356
357	private static addManifestContentHash (htmlStringPage: string) {	353	private static addManifestContentHash (htmlStringPage: string) {
358	return htmlStringPage.replace('[manifestContentHash]', FILES_CONTENT_HASH.MANIFEST)	354	return htmlStringPage.replace('[manifestContentHash]', FILES_CONTENT_HASH.MANIFEST)
359	}	355	}


diff --git a/server/lib/notifier/shared/comment/comment-mention.ts b/server/lib/notifier/shared/comment/comment-mention.ts index 4f84d8dea..765cbaad9 100644 --- a/server/lib/notifier/shared/comment/comment-mention.ts +++ b/server/lib/notifier/shared/comment/comment-mention.ts
@@ -47,8 +47,8 @@ export class CommentMention extends AbstractNotification <MCommentOwnerVideo, MU
47		47
48	const sourceAccounts = this.users.map(u => u.Account.id).concat([ this.serverAccountId ])	48	const sourceAccounts = this.users.map(u => u.Account.id).concat([ this.serverAccountId ])
49		49
50	this.accountMutedHash = await AccountBlocklistModel.isAccountMutedByMulti(sourceAccounts, this.payload.accountId)	50	this.accountMutedHash = await AccountBlocklistModel.isAccountMutedByAccounts(sourceAccounts, this.payload.accountId)
51	this.instanceMutedHash = await ServerBlocklistModel.isServerMutedByMulti(sourceAccounts, this.payload.Account.Actor.serverId)	51	this.instanceMutedHash = await ServerBlocklistModel.isServerMutedByAccounts(sourceAccounts, this.payload.Account.Actor.serverId)
52	}	52	}
53		53
54	log () {	54	log () {


diff --git a/server/lib/plugins/plugin-manager.ts b/server/lib/plugins/plugin-manager.ts index d4d2a7edc..6c2f4764e 100644 --- a/server/lib/plugins/plugin-manager.ts +++ b/server/lib/plugins/plugin-manager.ts
@@ -1,8 +1,8 @@
1	import decache from 'decache'
2	import express from 'express'	1	import express from 'express'
3	import { createReadStream, createWriteStream } from 'fs'	2	import { createReadStream, createWriteStream } from 'fs'
4	import { ensureDir, outputFile, readJSON } from 'fs-extra'	3	import { ensureDir, outputFile, readJSON } from 'fs-extra'
5	import { basename, join } from 'path'	4	import { basename, join } from 'path'
		5	import { decachePlugin } from '@server/helpers/decache'
6	import { MOAuthTokenUser, MUser } from '@server/types/models'	6	import { MOAuthTokenUser, MUser } from '@server/types/models'
7	import { getCompleteLocale } from '@shared/core-utils'	7	import { getCompleteLocale } from '@shared/core-utils'
8	import { ClientScript, PluginPackageJson, PluginTranslation, PluginTranslationPaths, RegisterServerHookOptions } from '@shared/models'	8	import { ClientScript, PluginPackageJson, PluginTranslation, PluginTranslationPaths, RegisterServerHookOptions } from '@shared/models'
@@ -420,7 +420,7 @@ export class PluginManager implements ServerHook {
420		420
421	// Delete cache if needed	421	// Delete cache if needed
422	const modulePath = join(pluginPath, packageJSON.library)	422	const modulePath = join(pluginPath, packageJSON.library)
423	decache(modulePath)	423	decachePlugin(pluginPath, modulePath)
424	const library: PluginLibrary = require(modulePath)	424	const library: PluginLibrary = require(modulePath)
425		425
426	if (!isLibraryCodeValid(library)) {	426	if (!isLibraryCodeValid(library)) {


diff --git a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts index d6e561cad..61e93eafa 100644 --- a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts +++ b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts
@@ -1,9 +1,7 @@
1	import { map } from 'bluebird'	1
2	import { readdir, remove, stat } from 'fs-extra'
3	import { logger, loggerTagsFactory } from '@server/helpers/logger'	2	import { logger, loggerTagsFactory } from '@server/helpers/logger'
4	import { getResumableUploadPath } from '@server/helpers/upload'
5	import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'	3	import { SCHEDULER_INTERVALS_MS } from '@server/initializers/constants'
6	import { METAFILE_EXTNAME } from '@uploadx/core'	4	import { uploadx } from '../uploadx'
7	import { AbstractScheduler } from './abstract-scheduler'	5	import { AbstractScheduler } from './abstract-scheduler'
8		6
9	const lTags = loggerTagsFactory('scheduler', 'resumable-upload', 'cleaner')	7	const lTags = loggerTagsFactory('scheduler', 'resumable-upload', 'cleaner')
@@ -22,36 +20,17 @@ export class RemoveDanglingResumableUploadsScheduler extends AbstractScheduler {
22	}	20	}
23		21
24	protected async internalExecute () {	22	protected async internalExecute () {
25	const path = getResumableUploadPath()	23	logger.debug('Removing dangling resumable uploads', lTags())
26	const files = await readdir(path)
27
28	const metafiles = files.filter(f => f.endsWith(METAFILE_EXTNAME))
29		24
30	if (metafiles.length === 0) return	25	const now = new Date().getTime()
31
32	logger.debug('Reading resumable video upload folder %s with %d files', path, metafiles.length, lTags())
33		26
34	try {	27	try {
35	await map(metafiles, metafile => {	28	// Remove files that were not updated since the last execution
36	return this.deleteIfOlderThan(metafile, this.lastExecutionTimeMs)	29	await uploadx.storage.purge(now - this.lastExecutionTimeMs)
37	}, { concurrency: 5 })
38	} catch (error) {	30	} catch (error) {
39	logger.error('Failed to handle file during resumable video upload folder cleanup', { error, ...lTags() })	31	logger.error('Failed to handle file during resumable video upload folder cleanup', { error, ...lTags() })
40	} finally {	32	} finally {
41	this.lastExecutionTimeMs = new Date().getTime()	33	this.lastExecutionTimeMs = now
42	}
43	}
44
45	private async deleteIfOlderThan (metafile: string, olderThan: number) {
46	const metafilePath = getResumableUploadPath(metafile)
47	const statResult = await stat(metafilePath)
48
49	// Delete uploads that started since a long time
50	if (statResult.ctimeMs < olderThan) {
51	await remove(metafilePath)
52
53	const datafile = metafilePath.replace(new RegExp(`${METAFILE_EXTNAME}$`), '')
54	await remove(datafile)
55	}	34	}
56	}	35	}
57		36


diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index bdf6492f9..6aa459f82 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts
@@ -47,6 +47,11 @@ class ServerConfigManager {
47	miniature: {	47	miniature: {
48	preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME	48	preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME
49	}	49	}
		50	},
		51	menu: {
		52	login: {
		53	redirectOnSingleExternalAuth: CONFIG.CLIENT.MENU.LOGIN.REDIRECT_ON_SINGLE_EXTERNAL_AUTH
		54	}
50	}	55	}
51	},	56	},
52		57


diff --git a/server/lib/uploadx.ts b/server/lib/uploadx.ts new file mode 100644 index 000000000..11b1044db --- /dev/null +++ b/server/lib/uploadx.ts
@@ -0,0 +1,10 @@
		1	import express from 'express'
		2	import { getResumableUploadPath } from '@server/helpers/upload'
		3	import { Uploadx } from '@uploadx/core'
		4
		5	const uploadx = new Uploadx({ directory: getResumableUploadPath() })
		6	uploadx.getUserId = (_, res: express.Response) => res.locals.oauth?.token.user.id
		7
		8	export {
		9	uploadx
		10	}