3 files changed, 20 insertions, 3 deletions

diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 898a92d43..720db19cb 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,15 +1,24 @@
 export * from './bulk/bulk'
+
 export * from './cli/cli'
+
 export * from './feeds/feeds'
+
 export * from './mock-servers/mock-instances-index'
-export * from './miscs/miscs'
+
+export * from './miscs/email'
 export * from './miscs/sql'
+export * from './miscs/miscs'
 export * from './miscs/stubs'
+
 export * from './moderation/abuses'
 export * from './plugins/mock-blocklist'
+
 export * from './requests/check-api-params'
 export * from './requests/requests'
+
 export * from './search/videos'
+
 export * from './server/activitypub'
 export * from './server/clients'
 export * from './server/config'
@@ -18,9 +27,14 @@ export * from './server/follows'
 export * from './server/jobs'
 export * from './server/plugins'
 export * from './server/servers'
+
 export * from './users/accounts'
+export * from './users/blocklist'
 export * from './users/login'
+export * from './users/user-notifications'
+export * from './users/user-subscriptions'
 export * from './users/users'
+
 export * from './videos/live'
 export * from './videos/services'
 export * from './videos/video-blacklist'
diff --git a/shared/extra-utils/server/plugins.ts b/shared/extra-utils/server/plugins.ts
index 864954ee7..d53e5b382 100644
--- a/shared/extra-utils/server/plugins.ts
+++ b/shared/extra-utils/server/plugins.ts
@@ -4,12 +4,12 @@ import { expect } from 'chai'
 import { readJSON, writeJSON } from 'fs-extra'
 import { join } from 'path'
 import { RegisteredServerSettings } from '@shared/models'
-import { PeertubePluginIndexList } from '../../models/plugins/peertube-plugin-index-list.model'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
+import { PeertubePluginIndexList } from '../../models/plugins/plugin-index/peertube-plugin-index-list.model'
 import { PluginType } from '../../models/plugins/plugin.type'
 import { buildServerDirectory, root } from '../miscs/miscs'
 import { makeGetRequest, makePostBodyRequest, makePutBodyRequest } from '../requests/requests'
 import { ServerInfo } from './servers'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 function listPlugins (parameters: {
   url: string
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 479f08e12..d04757470 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -45,9 +45,12 @@ interface ServerInfo {
     uuid: string
     name?: string
     url?: string
+
     account?: {
       name: string
     }
+
+    embedPath?: string
   }
 
   remoteVideo?: {