From bf54587a3e2ad9c2c186828f2a5682b91ee2cc00 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Dec 2021 09:29:23 +0100 Subject: [PATCH] shared/ typescript types dir server-commands --- scripts/benchmark.ts | 2 +- scripts/generate-code-contributors.ts | 2 +- server/tests/api/activitypub/cleaner.ts | 2 +- server/tests/api/activitypub/client.ts | 2 +- server/tests/api/activitypub/fetch.ts | 2 +- server/tests/api/activitypub/helpers.ts | 2 +- server/tests/api/activitypub/refresher.ts | 2 +- server/tests/api/activitypub/security.ts | 2 +- server/tests/api/check-params/abuses.ts | 2 +- server/tests/api/check-params/accounts.ts | 2 +- server/tests/api/check-params/blocklist.ts | 2 +- server/tests/api/check-params/bulk.ts | 2 +- server/tests/api/check-params/config.ts | 2 +- server/tests/api/check-params/contact-form.ts | 10 ++++- server/tests/api/check-params/custom-pages.ts | 2 +- server/tests/api/check-params/debug.ts | 2 +- server/tests/api/check-params/follows.ts | 2 +- server/tests/api/check-params/jobs.ts | 2 +- server/tests/api/check-params/live.ts | 2 +- server/tests/api/check-params/logs.ts | 2 +- server/tests/api/check-params/my-user.ts | 2 +- server/tests/api/check-params/plugins.ts | 2 +- server/tests/api/check-params/redundancy.ts | 2 +- server/tests/api/check-params/search.ts | 2 +- server/tests/api/check-params/services.ts | 2 +- server/tests/api/check-params/transcoding.ts | 2 +- server/tests/api/check-params/upload-quota.ts | 2 +- .../api/check-params/user-notifications.ts | 2 +- .../api/check-params/user-subscriptions.ts | 2 +- server/tests/api/check-params/users-admin.ts | 2 +- server/tests/api/check-params/users.ts | 2 +- .../tests/api/check-params/video-blacklist.ts | 2 +- .../tests/api/check-params/video-captions.ts | 2 +- .../tests/api/check-params/video-channels.ts | 2 +- .../tests/api/check-params/video-comments.ts | 2 +- server/tests/api/check-params/video-files.ts | 2 +- .../tests/api/check-params/video-imports.ts | 2 +- .../tests/api/check-params/video-playlists.ts | 2 +- .../api/check-params/videos-common-filters.ts | 2 +- .../tests/api/check-params/videos-history.ts | 2 +- .../api/check-params/videos-overviews.ts | 2 +- server/tests/api/check-params/videos.ts | 2 +- server/tests/api/live/live-constraints.ts | 2 +- server/tests/api/live/live-permanent.ts | 2 +- server/tests/api/live/live-rtmps.ts | 2 +- server/tests/api/live/live-save-replay.ts | 2 +- server/tests/api/live/live-socket-messages.ts | 2 +- server/tests/api/live/live-views.ts | 2 +- server/tests/api/live/live.ts | 2 +- server/tests/api/moderation/abuses.ts | 2 +- .../api/moderation/blocklist-notification.ts | 2 +- server/tests/api/moderation/blocklist.ts | 2 +- .../tests/api/moderation/video-blacklist.ts | 2 +- .../api/notifications/admin-notifications.ts | 2 +- .../notifications/comments-notifications.ts | 2 +- .../notifications/moderation-notifications.ts | 2 +- .../api/notifications/notifications-api.ts | 2 +- .../api/notifications/user-notifications.ts | 2 +- server/tests/api/object-storage/live.ts | 2 +- .../tests/api/object-storage/video-imports.ts | 2 +- server/tests/api/object-storage/videos.ts | 2 +- .../tests/api/redundancy/manage-redundancy.ts | 2 +- .../api/redundancy/redundancy-constraints.ts | 2 +- server/tests/api/redundancy/redundancy.ts | 2 +- .../search-activitypub-video-channels.ts | 2 +- .../search-activitypub-video-playlists.ts | 2 +- .../api/search/search-activitypub-videos.ts | 2 +- server/tests/api/search/search-channels.ts | 2 +- server/tests/api/search/search-index.ts | 2 +- server/tests/api/search/search-playlists.ts | 2 +- server/tests/api/search/search-videos.ts | 2 +- server/tests/api/server/auto-follows.ts | 2 +- server/tests/api/server/bulk.ts | 2 +- server/tests/api/server/config-defaults.ts | 2 +- server/tests/api/server/config.ts | 2 +- server/tests/api/server/contact-form.ts | 2 +- server/tests/api/server/email.ts | 2 +- server/tests/api/server/follow-constraints.ts | 2 +- server/tests/api/server/follows-moderation.ts | 2 +- server/tests/api/server/follows.ts | 2 +- server/tests/api/server/handle-down.ts | 2 +- server/tests/api/server/homepage.ts | 2 +- server/tests/api/server/jobs.ts | 2 +- server/tests/api/server/logs.ts | 2 +- server/tests/api/server/no-client.ts | 2 +- server/tests/api/server/plugins.ts | 2 +- server/tests/api/server/proxy.ts | 4 +- server/tests/api/server/reverse-proxy.ts | 2 +- server/tests/api/server/services.ts | 2 +- server/tests/api/server/slow-follows.ts | 2 +- server/tests/api/server/stats.ts | 2 +- server/tests/api/server/tracker.ts | 2 +- server/tests/api/users/user-subscriptions.ts | 2 +- .../tests/api/users/users-multiple-servers.ts | 2 +- server/tests/api/users/users-verification.ts | 2 +- server/tests/api/users/users.ts | 2 +- server/tests/api/videos/audio-only.ts | 2 +- server/tests/api/videos/multiple-servers.ts | 2 +- server/tests/api/videos/resumable-upload.ts | 2 +- server/tests/api/videos/single-server.ts | 2 +- server/tests/api/videos/video-captions.ts | 2 +- .../api/videos/video-change-ownership.ts | 2 +- server/tests/api/videos/video-channels.ts | 2 +- server/tests/api/videos/video-comments.ts | 2 +- .../api/videos/video-create-transcoding.ts | 2 +- server/tests/api/videos/video-description.ts | 2 +- server/tests/api/videos/video-files.ts | 2 +- server/tests/api/videos/video-hls.ts | 2 +- server/tests/api/videos/video-imports.ts | 2 +- server/tests/api/videos/video-nsfw.ts | 2 +- .../api/videos/video-playlist-thumbnails.ts | 2 +- server/tests/api/videos/video-playlists.ts | 2 +- server/tests/api/videos/video-privacy.ts | 2 +- .../tests/api/videos/video-schedule-update.ts | 2 +- server/tests/api/videos/video-transcoder.ts | 2 +- .../tests/api/videos/videos-common-filters.ts | 2 +- server/tests/api/videos/videos-history.ts | 2 +- server/tests/api/videos/videos-overview.ts | 2 +- .../tests/api/videos/videos-views-cleaner.ts | 2 +- .../tests/cli/create-import-video-file-job.ts | 2 +- .../cli/create-move-video-storage-job.ts | 2 +- server/tests/cli/create-transcoding-job.ts | 2 +- server/tests/cli/peertube.ts | 2 +- server/tests/cli/plugins.ts | 2 +- server/tests/cli/print-transcode-command.ts | 2 +- server/tests/cli/prune-storage.ts | 2 +- server/tests/cli/regenerate-thumbnails.ts | 2 +- server/tests/cli/reset-password.ts | 2 +- server/tests/cli/update-host.ts | 2 +- server/tests/client.ts | 2 +- server/tests/external-plugins/auth-ldap.ts | 2 +- .../external-plugins/auto-block-videos.ts | 2 +- server/tests/external-plugins/auto-mute.ts | 2 +- server/tests/feeds/feeds.ts | 2 +- server/tests/helpers/image.ts | 2 +- server/tests/helpers/request.ts | 4 +- server/tests/misc-endpoints.ts | 2 +- server/tests/plugins/action-hooks.ts | 2 +- server/tests/plugins/external-auth.ts | 2 +- server/tests/plugins/filter-hooks.ts | 2 +- server/tests/plugins/html-injection.ts | 2 +- server/tests/plugins/id-and-pass-auth.ts | 2 +- server/tests/plugins/plugin-helpers.ts | 2 +- server/tests/plugins/plugin-router.ts | 2 +- server/tests/plugins/plugin-storage.ts | 2 +- server/tests/plugins/plugin-transcoding.ts | 2 +- server/tests/plugins/plugin-unloading.ts | 2 +- server/tests/plugins/translations.ts | 2 +- server/tests/plugins/video-constants.ts | 2 +- server/tests/shared/video.ts | 2 +- server/tools/cli.ts | 2 +- server/tools/peertube-import-videos.ts | 2 +- shared/extra-utils/index.ts | 16 +------ .../bulk/bulk-command.ts | 0 .../bulk/index.ts | 0 .../cli/cli-command.ts | 0 .../cli/index.ts | 0 .../custom-pages/custom-pages-command.ts | 0 .../custom-pages/index.ts | 0 .../feeds/feeds-command.ts | 0 .../feeds/index.ts | 0 shared/server-commands/index.ts | 15 +++++++ .../logs/index.ts | 0 .../logs/logs-command.ts | 0 .../miscs/checks.ts | 0 .../miscs/generate.ts | 0 .../miscs/index.ts | 0 .../miscs/sql-command.ts | 0 .../miscs/tests.ts | 0 .../miscs/webtorrent.ts | 0 .../mock-servers/index.ts | 0 .../mock-servers/mock-429.ts | 0 .../mock-servers/mock-email.ts | 0 .../mock-servers/mock-instances-index.ts | 0 .../mock-joinpeertube-versions.ts | 0 .../mock-servers/mock-object-storage.ts | 0 .../mock-servers/mock-plugin-blocklist.ts | 0 .../mock-servers/mock-proxy.ts | 0 .../mock-servers/utils.ts | 0 .../moderation/abuses-command.ts | 0 .../moderation/index.ts | 0 .../overviews/index.ts | 0 .../overviews/overviews-command.ts | 0 .../requests/check-api-params.ts | 0 .../requests/index.ts | 0 .../requests/requests.ts | 0 .../search/index.ts | 0 .../search/search-command.ts | 0 .../server/config-command.ts | 0 .../server/contact-form-command.ts | 0 .../server/debug-command.ts | 0 .../server/directories.ts | 0 .../server/follows-command.ts | 0 .../server/follows.ts | 0 .../server/index.ts | 0 .../server/jobs-command.ts | 0 .../server/jobs.ts | 0 .../server/object-storage-command.ts | 0 .../server/plugins-command.ts | 0 .../server/plugins.ts | 2 +- .../server/redundancy-command.ts | 0 .../server/server.ts | 0 .../server/servers-command.ts | 0 .../server/servers.ts | 0 .../server/stats-command.ts | 0 .../server/tracker.ts | 0 .../shared/abstract-command.ts | 0 .../shared/index.ts | 0 .../socket/index.ts | 0 .../socket/socket-io-command.ts | 0 .../users/accounts-command.ts | 0 .../users/actors.ts | 0 .../users/blocklist-command.ts | 0 .../users/index.ts | 0 .../users/login-command.ts | 0 .../users/login.ts | 0 .../users/notifications-command.ts | 0 .../users/notifications.ts | 0 .../users/subscriptions-command.ts | 0 .../users/users-command.ts | 0 .../videos/blacklist-command.ts | 0 .../videos/captions-command.ts | 0 .../videos/captions.ts | 0 .../videos/change-ownership-command.ts | 0 .../videos/channels-command.ts | 0 .../videos/channels.ts | 0 .../videos/comments-command.ts | 0 .../videos/history-command.ts | 0 .../videos/imports-command.ts | 0 .../videos/index.ts | 0 .../videos/live-command.ts | 0 .../videos/live.ts | 0 .../videos/playlists-command.ts | 0 .../videos/playlists.ts | 0 .../videos/services-command.ts | 0 .../videos/streaming-playlists-command.ts | 0 .../videos/streaming-playlists.ts | 0 .../videos/videos-command.ts | 0 .../videos/videos.ts | 0 shared/tsconfig.types.json | 5 ++- shared/typescript-utils/index.ts | 1 + shared/typescript-utils/types.ts | 45 +++++++++++++++++++ 242 files changed, 228 insertions(+), 172 deletions(-) rename shared/{extra-utils => server-commands}/bulk/bulk-command.ts (100%) rename shared/{extra-utils => server-commands}/bulk/index.ts (100%) rename shared/{extra-utils => server-commands}/cli/cli-command.ts (100%) rename shared/{extra-utils => server-commands}/cli/index.ts (100%) rename shared/{extra-utils => server-commands}/custom-pages/custom-pages-command.ts (100%) rename shared/{extra-utils => server-commands}/custom-pages/index.ts (100%) rename shared/{extra-utils => server-commands}/feeds/feeds-command.ts (100%) rename shared/{extra-utils => server-commands}/feeds/index.ts (100%) create mode 100644 shared/server-commands/index.ts rename shared/{extra-utils => server-commands}/logs/index.ts (100%) rename shared/{extra-utils => server-commands}/logs/logs-command.ts (100%) rename shared/{extra-utils => server-commands}/miscs/checks.ts (100%) rename shared/{extra-utils => server-commands}/miscs/generate.ts (100%) rename shared/{extra-utils => server-commands}/miscs/index.ts (100%) rename shared/{extra-utils => server-commands}/miscs/sql-command.ts (100%) rename shared/{extra-utils => server-commands}/miscs/tests.ts (100%) rename shared/{extra-utils => server-commands}/miscs/webtorrent.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/index.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-429.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-email.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-instances-index.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-joinpeertube-versions.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-object-storage.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-plugin-blocklist.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/mock-proxy.ts (100%) rename shared/{extra-utils => server-commands}/mock-servers/utils.ts (100%) rename shared/{extra-utils => server-commands}/moderation/abuses-command.ts (100%) rename shared/{extra-utils => server-commands}/moderation/index.ts (100%) rename shared/{extra-utils => server-commands}/overviews/index.ts (100%) rename shared/{extra-utils => server-commands}/overviews/overviews-command.ts (100%) rename shared/{extra-utils => server-commands}/requests/check-api-params.ts (100%) rename shared/{extra-utils => server-commands}/requests/index.ts (100%) rename shared/{extra-utils => server-commands}/requests/requests.ts (100%) rename shared/{extra-utils => server-commands}/search/index.ts (100%) rename shared/{extra-utils => server-commands}/search/search-command.ts (100%) rename shared/{extra-utils => server-commands}/server/config-command.ts (100%) rename shared/{extra-utils => server-commands}/server/contact-form-command.ts (100%) rename shared/{extra-utils => server-commands}/server/debug-command.ts (100%) rename shared/{extra-utils => server-commands}/server/directories.ts (100%) rename shared/{extra-utils => server-commands}/server/follows-command.ts (100%) rename shared/{extra-utils => server-commands}/server/follows.ts (100%) rename shared/{extra-utils => server-commands}/server/index.ts (100%) rename shared/{extra-utils => server-commands}/server/jobs-command.ts (100%) rename shared/{extra-utils => server-commands}/server/jobs.ts (100%) rename shared/{extra-utils => server-commands}/server/object-storage-command.ts (100%) rename shared/{extra-utils => server-commands}/server/plugins-command.ts (100%) rename shared/{extra-utils => server-commands}/server/plugins.ts (92%) rename shared/{extra-utils => server-commands}/server/redundancy-command.ts (100%) rename shared/{extra-utils => server-commands}/server/server.ts (100%) rename shared/{extra-utils => server-commands}/server/servers-command.ts (100%) rename shared/{extra-utils => server-commands}/server/servers.ts (100%) rename shared/{extra-utils => server-commands}/server/stats-command.ts (100%) rename shared/{extra-utils => server-commands}/server/tracker.ts (100%) rename shared/{extra-utils => server-commands}/shared/abstract-command.ts (100%) rename shared/{extra-utils => server-commands}/shared/index.ts (100%) rename shared/{extra-utils => server-commands}/socket/index.ts (100%) rename shared/{extra-utils => server-commands}/socket/socket-io-command.ts (100%) rename shared/{extra-utils => server-commands}/users/accounts-command.ts (100%) rename shared/{extra-utils => server-commands}/users/actors.ts (100%) rename shared/{extra-utils => server-commands}/users/blocklist-command.ts (100%) rename shared/{extra-utils => server-commands}/users/index.ts (100%) rename shared/{extra-utils => server-commands}/users/login-command.ts (100%) rename shared/{extra-utils => server-commands}/users/login.ts (100%) rename shared/{extra-utils => server-commands}/users/notifications-command.ts (100%) rename shared/{extra-utils => server-commands}/users/notifications.ts (100%) rename shared/{extra-utils => server-commands}/users/subscriptions-command.ts (100%) rename shared/{extra-utils => server-commands}/users/users-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/blacklist-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/captions-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/captions.ts (100%) rename shared/{extra-utils => server-commands}/videos/change-ownership-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/channels-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/channels.ts (100%) rename shared/{extra-utils => server-commands}/videos/comments-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/history-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/imports-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/index.ts (100%) rename shared/{extra-utils => server-commands}/videos/live-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/live.ts (100%) rename shared/{extra-utils => server-commands}/videos/playlists-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/playlists.ts (100%) rename shared/{extra-utils => server-commands}/videos/services-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/streaming-playlists-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/streaming-playlists.ts (100%) rename shared/{extra-utils => server-commands}/videos/videos-command.ts (100%) rename shared/{extra-utils => server-commands}/videos/videos.ts (100%) create mode 100644 shared/typescript-utils/index.ts create mode 100644 shared/typescript-utils/types.ts diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts index 788318313..011519fe3 100644 --- a/scripts/benchmark.ts +++ b/scripts/benchmark.ts @@ -3,7 +3,7 @@ registerTSPaths() import autocannon, { printResult } from 'autocannon' import { writeJson } from 'fs-extra' -import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { Video, VideoPrivacy } from '@shared/models' let server: PeerTubeServer diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts index 70b33c0d3..449407c44 100755 --- a/scripts/generate-code-contributors.ts +++ b/scripts/generate-code-contributors.ts @@ -1,7 +1,7 @@ import { registerTSPaths } from '../server/helpers/register-ts-paths' registerTSPaths() -import { CLICommand } from '@shared/extra-utils' +import { CLICommand } from '@shared/server-commands' run() .then(() => process.exit(0)) diff --git a/server/tests/api/activitypub/cleaner.ts b/server/tests/api/activitypub/cleaner.ts index 51cf6e599..c3368c7eb 100644 --- a/server/tests/api/activitypub/cleaner.ts +++ b/server/tests/api/activitypub/cleaner.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts index c3e4b7f74..e69ab3cb9 100644 --- a/server/tests/api/activitypub/client.ts +++ b/server/tests/api/activitypub/client.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index 422a75d6e..93bf01842 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts index 57b1cab23..5aa94af5d 100644 --- a/server/tests/api/activitypub/helpers.ts +++ b/server/tests/api/activitypub/helpers.ts @@ -3,7 +3,7 @@ import 'mocha' import { expect } from 'chai' import { cloneDeep } from 'lodash' -import { buildAbsoluteFixturePath, buildRequestStub } from '@shared/extra-utils' +import { buildAbsoluteFixturePath, buildRequestStub } from '@shared/server-commands' import { buildSignedActivity } from '../../../helpers/activitypub' import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index 81fee0044..669a86fca 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts @@ -11,7 +11,7 @@ import { setDefaultVideoChannel, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models' describe('Test AP refresher', function () { diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts index 2700cff13..3b871ae12 100644 --- a/server/tests/api/activitypub/security.ts +++ b/server/tests/api/activitypub/security.ts @@ -6,7 +6,7 @@ import { activityPubContextify, buildSignedActivity } from '@server/helpers/acti import { buildDigest } from '@server/helpers/peertube-crypto' import { HTTP_SIGNATURE } from '@server/initializers/constants' import { buildGlobalHeaders } from '@server/lib/job-queue/handlers/utils/activitypub-http-utils' -import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/extra-utils' +import { buildAbsoluteFixturePath, cleanupTests, createMultipleServers, killallServers, PeerTubeServer, wait } from '@shared/server-commands' import { makeFollowRequest, makePOSTAPRequest } from '@server/tests/shared' import { HttpStatusCode } from '@shared/models' diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts index fb9a5fd8b..58167cbab 100644 --- a/server/tests/api/check-params/abuses.ts +++ b/server/tests/api/check-params/abuses.ts @@ -14,7 +14,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { AbuseCreate, AbuseState, HttpStatusCode } from '@shared/models' describe('Test abuses API validators', function () { diff --git a/server/tests/api/check-params/accounts.ts b/server/tests/api/check-params/accounts.ts index 141d869b7..fc8e63ed4 100644 --- a/server/tests/api/check-params/accounts.ts +++ b/server/tests/api/check-params/accounts.ts @@ -8,7 +8,7 @@ import { cleanupTests, createSingleServer, PeerTubeServer -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test accounts API validators', function () { diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts index f72a892e2..2dc3a166d 100644 --- a/server/tests/api/check-params/blocklist.ts +++ b/server/tests/api/check-params/blocklist.ts @@ -13,7 +13,7 @@ import { makePostBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test blocklist API validators', function () { diff --git a/server/tests/api/check-params/bulk.ts b/server/tests/api/check-params/bulk.ts index bc9d7784d..9bd0016cf 100644 --- a/server/tests/api/check-params/bulk.ts +++ b/server/tests/api/check-params/bulk.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createSingleServer, makePostBodyRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, makePostBodyRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test bulk API validators', function () { diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts index a6e87730a..3cccb612a 100644 --- a/server/tests/api/check-params/config.ts +++ b/server/tests/api/check-params/config.ts @@ -10,7 +10,7 @@ import { makePutBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { CustomConfig, HttpStatusCode } from '@shared/models' describe('Test config API validators', function () { diff --git a/server/tests/api/check-params/contact-form.ts b/server/tests/api/check-params/contact-form.ts index 9f86fecc6..a2e51e14d 100644 --- a/server/tests/api/check-params/contact-form.ts +++ b/server/tests/api/check-params/contact-form.ts @@ -1,9 +1,15 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createSingleServer, killallServers, MockSmtpServer, PeerTubeServer } from '@shared/extra-utils' -import { ContactFormCommand } from '@shared/extra-utils/server' import { HttpStatusCode } from '@shared/models' +import { + cleanupTests, + ContactFormCommand, + createSingleServer, + killallServers, + MockSmtpServer, + PeerTubeServer +} from '@shared/server-commands' describe('Test contact form API validators', function () { let server: PeerTubeServer diff --git a/server/tests/api/check-params/custom-pages.ts b/server/tests/api/check-params/custom-pages.ts index 9fbbea315..a102ee437 100644 --- a/server/tests/api/check-params/custom-pages.ts +++ b/server/tests/api/check-params/custom-pages.ts @@ -8,7 +8,7 @@ import { makePutBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test custom pages validators', function () { diff --git a/server/tests/api/check-params/debug.ts b/server/tests/api/check-params/debug.ts index a55786359..cfa44deca 100644 --- a/server/tests/api/check-params/debug.ts +++ b/server/tests/api/check-params/debug.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test debug API validators', function () { diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts index 2bc9f6b96..6121d2202 100644 --- a/server/tests/api/check-params/follows.ts +++ b/server/tests/api/check-params/follows.ts @@ -12,7 +12,7 @@ import { makePostBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test server follows API validators', function () { diff --git a/server/tests/api/check-params/jobs.ts b/server/tests/api/check-params/jobs.ts index 23d95d8e4..b7c603755 100644 --- a/server/tests/api/check-params/jobs.ts +++ b/server/tests/api/check-params/jobs.ts @@ -10,7 +10,7 @@ import { makeGetRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test jobs API validators', function () { diff --git a/server/tests/api/check-params/live.ts b/server/tests/api/check-params/live.ts index 8e1d655d4..8b79d97e0 100644 --- a/server/tests/api/check-params/live.ts +++ b/server/tests/api/check-params/live.ts @@ -13,7 +13,7 @@ import { sendRTMPStream, setAccessTokensToServers, stopFfmpeg -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models' describe('Test video lives API validator', function () { diff --git a/server/tests/api/check-params/logs.ts b/server/tests/api/check-params/logs.ts index 05372257a..970671c15 100644 --- a/server/tests/api/check-params/logs.ts +++ b/server/tests/api/check-params/logs.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test logs API validators', function () { diff --git a/server/tests/api/check-params/my-user.ts b/server/tests/api/check-params/my-user.ts index d35284d60..c8ac71476 100644 --- a/server/tests/api/check-params/my-user.ts +++ b/server/tests/api/check-params/my-user.ts @@ -15,7 +15,7 @@ import { PeerTubeServer, setAccessTokensToServers, UsersCommand -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserRole, VideoCreateResult } from '@shared/models' describe('Test my user API validators', function () { diff --git a/server/tests/api/check-params/plugins.ts b/server/tests/api/check-params/plugins.ts index 2c436376c..79e487590 100644 --- a/server/tests/api/check-params/plugins.ts +++ b/server/tests/api/check-params/plugins.ts @@ -12,7 +12,7 @@ import { makePutBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, PeerTubePlugin, PluginType } from '@shared/models' describe('Test server plugins API validators', function () { diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts index d9f905549..f3bfcb16c 100644 --- a/server/tests/api/check-params/redundancy.ts +++ b/server/tests/api/check-params/redundancy.ts @@ -15,7 +15,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCreateResult } from '@shared/models' describe('Test server redundancy API validators', function () { diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts index cc15d2593..edeeed571 100644 --- a/server/tests/api/check-params/search.ts +++ b/server/tests/api/check-params/search.ts @@ -10,7 +10,7 @@ import { makeGetRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' function updateSearchIndex (server: PeerTubeServer, enabled: boolean, disableLocalSearch = false) { diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts index 8d795fabc..e63f09884 100644 --- a/server/tests/api/check-params/services.ts +++ b/server/tests/api/check-params/services.ts @@ -8,7 +8,7 @@ import { PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models' describe('Test services API validators', function () { diff --git a/server/tests/api/check-params/transcoding.ts b/server/tests/api/check-params/transcoding.ts index 6b6f73d46..11ade9071 100644 --- a/server/tests/api/check-params/transcoding.ts +++ b/server/tests/api/check-params/transcoding.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { HttpStatusCode, UserRole } from '@shared/models' describe('Test transcoding API validators', function () { diff --git a/server/tests/api/check-params/upload-quota.ts b/server/tests/api/check-params/upload-quota.ts index 322e93d0d..02898bb87 100644 --- a/server/tests/api/check-params/upload-quota.ts +++ b/server/tests/api/check-params/upload-quota.ts @@ -12,7 +12,7 @@ import { setDefaultVideoChannel, VideosCommand, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoImportState, VideoPrivacy } from '@shared/models' describe('Test upload quota', function () { diff --git a/server/tests/api/check-params/user-notifications.ts b/server/tests/api/check-params/user-notifications.ts index 17edf5aa1..912d4a992 100644 --- a/server/tests/api/check-params/user-notifications.ts +++ b/server/tests/api/check-params/user-notifications.ts @@ -14,7 +14,7 @@ import { PeerTubeServer, setAccessTokensToServers, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserNotificationSetting, UserNotificationSettingValue } from '@shared/models' describe('Test user notifications API validators', function () { diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts index 624069c80..95226dff5 100644 --- a/server/tests/api/check-params/user-subscriptions.ts +++ b/server/tests/api/check-params/user-subscriptions.ts @@ -13,7 +13,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test user subscriptions API validators', function () { diff --git a/server/tests/api/check-params/users-admin.ts b/server/tests/api/check-params/users-admin.ts index f71414a6b..c98b5e189 100644 --- a/server/tests/api/check-params/users-admin.ts +++ b/server/tests/api/check-params/users-admin.ts @@ -15,7 +15,7 @@ import { MockSmtpServer, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserAdminFlag, UserRole } from '@shared/models' describe('Test users admin API validators', function () { diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 5f9cbc5eb..254177afd 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -9,7 +9,7 @@ import { MockSmtpServer, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserRole } from '@shared/models' describe('Test users API validators', function () { diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index 1f926d227..7eb3c1cae 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts @@ -15,7 +15,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoBlacklistType } from '@shared/models' describe('Test video blacklist API validators', function () { diff --git a/server/tests/api/check-params/video-captions.ts b/server/tests/api/check-params/video-captions.ts index 90f429314..34c1a9673 100644 --- a/server/tests/api/check-params/video-captions.ts +++ b/server/tests/api/check-params/video-captions.ts @@ -10,7 +10,7 @@ import { makeUploadRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCreateResult } from '@shared/models' describe('Test video captions API validator', function () { diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts index e86c315fa..747a5d3ec 100644 --- a/server/tests/api/check-params/video-channels.ts +++ b/server/tests/api/check-params/video-channels.ts @@ -17,7 +17,7 @@ import { makeUploadRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoChannelUpdate } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts index 2d9ee1e0d..05cf61cba 100644 --- a/server/tests/api/check-params/video-comments.ts +++ b/server/tests/api/check-params/video-comments.ts @@ -13,7 +13,7 @@ import { makePostBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCreateResult } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/check-params/video-files.ts b/server/tests/api/check-params/video-files.ts index 3ccdf5f49..90ab4460c 100644 --- a/server/tests/api/check-params/video-files.ts +++ b/server/tests/api/check-params/video-files.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { HttpStatusCode, UserRole } from '@shared/models' describe('Test videos files', function () { diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts index d6d745488..7cefb2a54 100644 --- a/server/tests/api/check-params/video-imports.ts +++ b/server/tests/api/check-params/video-imports.ts @@ -15,7 +15,7 @@ import { makeUploadRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' describe('Test video imports API validator', function () { diff --git a/server/tests/api/check-params/video-playlists.ts b/server/tests/api/check-params/video-playlists.ts index e4d541b48..ac3c13f78 100644 --- a/server/tests/api/check-params/video-playlists.ts +++ b/server/tests/api/check-params/video-playlists.ts @@ -12,7 +12,7 @@ import { PlaylistsCommand, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistCreate, diff --git a/server/tests/api/check-params/videos-common-filters.ts b/server/tests/api/check-params/videos-common-filters.ts index f2b5bee8e..6b3ec917e 100644 --- a/server/tests/api/check-params/videos-common-filters.ts +++ b/server/tests/api/check-params/videos-common-filters.ts @@ -8,7 +8,7 @@ import { PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserRole, VideoInclude, VideoPrivacy } from '@shared/models' describe('Test video filters validators', function () { diff --git a/server/tests/api/check-params/videos-history.ts b/server/tests/api/check-params/videos-history.ts index c3c309ed2..e4b4c4b2a 100644 --- a/server/tests/api/check-params/videos-history.ts +++ b/server/tests/api/check-params/videos-history.ts @@ -11,7 +11,7 @@ import { makePutBodyRequest, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test videos history API validator', function () { diff --git a/server/tests/api/check-params/videos-overviews.ts b/server/tests/api/check-params/videos-overviews.ts index c2139d74b..1da15dc43 100644 --- a/server/tests/api/check-params/videos-overviews.ts +++ b/server/tests/api/check-params/videos-overviews.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/server-commands' describe('Test videos overview', function () { let server: PeerTubeServer diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts index d02b6e156..3b2607eed 100644 --- a/server/tests/api/check-params/videos.ts +++ b/server/tests/api/check-params/videos.ts @@ -19,7 +19,7 @@ import { PeerTubeServer, root, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, PeerTubeProblemDocument, VideoCreateResult, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts index 6a6a11796..89880c46b 100644 --- a/server/tests/api/live/live-constraints.ts +++ b/server/tests/api/live/live-constraints.ts @@ -14,7 +14,7 @@ import { setDefaultVideoChannel, wait, waitJobs -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts index c5f942901..12a4d64d8 100644 --- a/server/tests/api/live/live-permanent.ts +++ b/server/tests/api/live/live-permanent.ts @@ -14,7 +14,7 @@ import { stopFfmpeg, wait, waitJobs -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/live/live-rtmps.ts b/server/tests/api/live/live-rtmps.ts index 378e6df3c..31e8f906e 100644 --- a/server/tests/api/live/live-rtmps.ts +++ b/server/tests/api/live/live-rtmps.ts @@ -14,7 +14,7 @@ import { stopFfmpeg, testFfmpegStreamError, waitUntilLivePublishedOnAllServers -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/live/live-save-replay.ts b/server/tests/api/live/live-save-replay.ts index 6c4ea90ca..9fb6b4e54 100644 --- a/server/tests/api/live/live-save-replay.ts +++ b/server/tests/api/live/live-save-replay.ts @@ -18,7 +18,7 @@ import { waitJobs, waitUntilLivePublishedOnAllServers, waitUntilLiveSavedOnAllServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, LiveVideoCreate, VideoPrivacy, VideoState } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/live/live-socket-messages.ts b/server/tests/api/live/live-socket-messages.ts index 33ee2c051..42cf9c5f6 100644 --- a/server/tests/api/live/live-socket-messages.ts +++ b/server/tests/api/live/live-socket-messages.ts @@ -14,7 +14,7 @@ import { wait, waitJobs, waitUntilLivePublishedOnAllServers -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/live/live-views.ts b/server/tests/api/live/live-views.ts index 9186af8e7..5de4436be 100644 --- a/server/tests/api/live/live-views.ts +++ b/server/tests/api/live/live-views.ts @@ -15,7 +15,7 @@ import { wait, waitJobs, waitUntilLivePublishedOnAllServers -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index b96c03cf8..3869fd6c7 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts @@ -24,7 +24,7 @@ import { wait, waitJobs, waitUntilLivePublishedOnAllServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, LiveVideo, diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts index c258414ce..9eb84fdec 100644 --- a/server/tests/api/moderation/abuses.ts +++ b/server/tests/api/moderation/abuses.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/moderation/blocklist-notification.ts b/server/tests/api/moderation/blocklist-notification.ts index 75b15c298..d1e2ea56e 100644 --- a/server/tests/api/moderation/blocklist-notification.ts +++ b/server/tests/api/moderation/blocklist-notification.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { UserNotificationType } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts index b3fd8ecac..b45460bb4 100644 --- a/server/tests/api/moderation/blocklist.ts +++ b/server/tests/api/moderation/blocklist.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { UserNotificationType } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/moderation/video-blacklist.ts b/server/tests/api/moderation/video-blacklist.ts index d5838191a..4e2887fa0 100644 --- a/server/tests/api/moderation/video-blacklist.ts +++ b/server/tests/api/moderation/video-blacklist.ts @@ -13,7 +13,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { UserAdminFlag, UserRole, VideoBlacklist, VideoBlacklistType } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/notifications/admin-notifications.ts b/server/tests/api/notifications/admin-notifications.ts index c00d4e257..18962a71e 100644 --- a/server/tests/api/notifications/admin-notifications.ts +++ b/server/tests/api/notifications/admin-notifications.ts @@ -12,7 +12,7 @@ import { PeerTubeServer, prepareNotificationsTest, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { PluginType, UserNotification, UserNotificationType } from '@shared/models' describe('Test admin notifications', function () { diff --git a/server/tests/api/notifications/comments-notifications.ts b/server/tests/api/notifications/comments-notifications.ts index 7cbb21397..919be4bca 100644 --- a/server/tests/api/notifications/comments-notifications.ts +++ b/server/tests/api/notifications/comments-notifications.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, prepareNotificationsTest, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { UserNotification } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts index 6d8e5359b..4da9d2684 100644 --- a/server/tests/api/notifications/moderation-notifications.ts +++ b/server/tests/api/notifications/moderation-notifications.ts @@ -23,7 +23,7 @@ import { prepareNotificationsTest, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { AbuseState, CustomConfig, UserNotification, UserRole, VideoPrivacy } from '@shared/models' describe('Test moderation notifications', function () { diff --git a/server/tests/api/notifications/notifications-api.ts b/server/tests/api/notifications/notifications-api.ts index a529a9bf7..aeb73350b 100644 --- a/server/tests/api/notifications/notifications-api.ts +++ b/server/tests/api/notifications/notifications-api.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, prepareNotificationsTest, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { UserNotification, UserNotificationSettingValue } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts index 6db0347cc..a2fcdf2ef 100644 --- a/server/tests/api/notifications/user-notifications.ts +++ b/server/tests/api/notifications/user-notifications.ts @@ -17,7 +17,7 @@ import { uploadRandomVideoOnServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { UserNotification, UserNotificationType, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/object-storage/live.ts b/server/tests/api/object-storage/live.ts index 3726a717b..2c341c139 100644 --- a/server/tests/api/object-storage/live.ts +++ b/server/tests/api/object-storage/live.ts @@ -18,7 +18,7 @@ import { waitJobs, waitUntilLivePublishedOnAllServers, waitUntilLiveSavedOnAllServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, LiveVideoCreate, VideoFile, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/object-storage/video-imports.ts b/server/tests/api/object-storage/video-imports.ts index 363fe3b5b..adca16e8f 100644 --- a/server/tests/api/object-storage/video-imports.ts +++ b/server/tests/api/object-storage/video-imports.ts @@ -14,7 +14,7 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts index 35a5f19ed..bf469015f 100644 --- a/server/tests/api/object-storage/videos.ts +++ b/server/tests/api/object-storage/videos.ts @@ -20,7 +20,7 @@ import { setAccessTokensToServers, waitJobs, webtorrentAdd -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/redundancy/manage-redundancy.ts b/server/tests/api/redundancy/manage-redundancy.ts index 5fd464ded..cbf3106bd 100644 --- a/server/tests/api/redundancy/manage-redundancy.ts +++ b/server/tests/api/redundancy/manage-redundancy.ts @@ -10,7 +10,7 @@ import { RedundancyCommand, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy, VideoRedundanciesTarget } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/redundancy/redundancy-constraints.ts b/server/tests/api/redundancy/redundancy-constraints.ts index 933a2c776..1a8d8183b 100644 --- a/server/tests/api/redundancy/redundancy-constraints.ts +++ b/server/tests/api/redundancy/redundancy-constraints.ts @@ -2,7 +2,7 @@ import 'mocha' import { expect } from 'chai' -import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { VideoPrivacy } from '@shared/models' describe('Test redundancy constraints', function () { diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts index b5929129a..556cfbc31 100644 --- a/server/tests/api/redundancy/redundancy.ts +++ b/server/tests/api/redundancy/redundancy.ts @@ -19,7 +19,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails, diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts index efcdb33dc..1f29f840a 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoChannel } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/search/search-activitypub-video-playlists.ts b/server/tests/api/search/search-activitypub-video-playlists.ts index 34b318268..550af8ed2 100644 --- a/server/tests/api/search/search-activitypub-video-playlists.ts +++ b/server/tests/api/search/search-activitypub-video-playlists.ts @@ -11,7 +11,7 @@ import { setDefaultVideoChannel, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts index a2e6e70fe..5aa3738c9 100644 --- a/server/tests/api/search/search-activitypub-videos.ts +++ b/server/tests/api/search/search-activitypub-videos.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/search/search-channels.ts b/server/tests/api/search/search-channels.ts index 67612537c..8a92def61 100644 --- a/server/tests/api/search/search-channels.ts +++ b/server/tests/api/search/search-channels.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, SearchCommand, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoChannel } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts index 1845c2069..f84d03345 100644 --- a/server/tests/api/search/search-index.ts +++ b/server/tests/api/search/search-index.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/server-commands' import { BooleanBothQuery, VideoChannelsSearchQuery, diff --git a/server/tests/api/search/search-playlists.ts b/server/tests/api/search/search-playlists.ts index 15aac029a..1e9c8d4bb 100644 --- a/server/tests/api/search/search-playlists.ts +++ b/server/tests/api/search/search-playlists.ts @@ -10,7 +10,7 @@ import { SearchCommand, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts index ad2a2fddc..bf2375ffa 100644 --- a/server/tests/api/search/search-videos.ts +++ b/server/tests/api/search/search-videos.ts @@ -12,7 +12,7 @@ import { setDefaultVideoChannel, stopFfmpeg, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts index 90a668edb..74bb96040 100644 --- a/server/tests/api/server/auto-follows.ts +++ b/server/tests/api/server/auto-follows.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts index 16cbcd5c3..1b81a6954 100644 --- a/server/tests/api/server/bulk.ts +++ b/server/tests/api/server/bulk.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/server/config-defaults.ts b/server/tests/api/server/config-defaults.ts index 117fc20d7..4ceda7de3 100644 --- a/server/tests/api/server/config-defaults.ts +++ b/server/tests/api/server/config-defaults.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoDetails, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index 96ec17b0f..2e6617a15 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts @@ -10,7 +10,7 @@ import { parallelTests, PeerTubeServer, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { CustomConfig, HttpStatusCode } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts index c555661ad..109251453 100644 --- a/server/tests/api/server/contact-form.ts +++ b/server/tests/api/server/contact-form.ts @@ -11,7 +11,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts index cd8d70341..6fa6053cb 100644 --- a/server/tests/api/server/email.ts +++ b/server/tests/api/server/email.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts index 471f5d8d0..0f3c138ad 100644 --- a/server/tests/api/server/follow-constraints.ts +++ b/server/tests/api/server/follow-constraints.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode, PeerTubeProblemDocument, ServerErrorCode } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/follows-moderation.ts b/server/tests/api/server/follows-moderation.ts index 921f51043..120bd7f88 100644 --- a/server/tests/api/server/follows-moderation.ts +++ b/server/tests/api/server/follows-moderation.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index c132d99ea..e128c36a5 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts @@ -12,7 +12,7 @@ import { setAccessTokensToServers, testCaptionFile, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoCreateResult, VideoPrivacy } from '@shared/models' import { completeVideoCheck } from '@server/tests/shared/video' diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index 2d059c0ed..b134e074b 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts @@ -11,7 +11,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, JobState, VideoCreateResult, VideoPrivacy } from '@shared/models' import { completeVideoCheck } from '@server/tests/shared/video' diff --git a/server/tests/api/server/homepage.ts b/server/tests/api/server/homepage.ts index cb3ba5677..552ee98cf 100644 --- a/server/tests/api/server/homepage.ts +++ b/server/tests/api/server/homepage.ts @@ -10,7 +10,7 @@ import { killallServers, PeerTubeServer, setAccessTokensToServers -} from '../../../../shared/extra-utils/index' +} from '../../../../shared/server-commands/index' const expect = chai.expect diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts index 5d946f5e8..5b38f6741 100644 --- a/server/tests/api/server/jobs.ts +++ b/server/tests/api/server/jobs.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts index 4fa13886e..697f10337 100644 --- a/server/tests/api/server/logs.ts +++ b/server/tests/api/server/logs.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/server/no-client.ts b/server/tests/api/server/no-client.ts index 1e0c95a3b..913907788 100644 --- a/server/tests/api/server/no-client.ts +++ b/server/tests/api/server/no-client.ts @@ -1,6 +1,6 @@ import 'mocha' import request from 'supertest' -import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Start and stop server without web client routes', function () { diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts index 5f9f4ffdd..fbcd89101 100644 --- a/server/tests/api/server/plugins.ts +++ b/server/tests/api/server/plugins.ts @@ -11,7 +11,7 @@ import { setAccessTokensToServers, testHelloWorldRegisteredSettings, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, PluginType } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/proxy.ts b/server/tests/api/server/proxy.ts index 29f3e10d8..626a0d860 100644 --- a/server/tests/api/server/proxy.ts +++ b/server/tests/api/server/proxy.ts @@ -11,8 +11,8 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' -import { MockProxy } from '@shared/extra-utils/mock-servers/mock-proxy' +} from '@shared/server-commands' +import { MockProxy } from '@shared/server-commands/mock-servers/mock-proxy' import { HttpStatusCode, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts index 484f88d67..fc9b88a6a 100644 --- a/server/tests/api/server/reverse-proxy.ts +++ b/server/tests/api/server/reverse-proxy.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import { expect } from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test application behind a reverse proxy', function () { diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts index 823630ae4..5fd2abda4 100644 --- a/server/tests/api/server/services.ts +++ b/server/tests/api/server/services.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands' import { Video, VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/slow-follows.ts b/server/tests/api/server/slow-follows.ts index 2bef0c9f2..5f24c351b 100644 --- a/server/tests/api/server/slow-follows.ts +++ b/server/tests/api/server/slow-follows.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { Job } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts index efc80463c..65ef4607b 100644 --- a/server/tests/api/server/stats.ts +++ b/server/tests/api/server/stats.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { ActivityType, VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/server/tracker.ts b/server/tests/api/server/tracker.ts index 30a9618b3..712bb485f 100644 --- a/server/tests/api/server/tracker.ts +++ b/server/tests/api/server/tracker.ts @@ -3,7 +3,7 @@ import 'mocha' import magnetUtil from 'magnet-uri' import WebTorrent from 'webtorrent' -import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' describe('Test tracker', function () { let server: PeerTubeServer diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts index d1d192238..190a19c38 100644 --- a/server/tests/api/users/user-subscriptions.ts +++ b/server/tests/api/users/user-subscriptions.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, SubscriptionsCommand, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts index d0ca82b07..e6699a059 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -14,7 +14,7 @@ import { setAccessTokensToServers, testImage, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { MyUser } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts index f54463359..9b23ba797 100644 --- a/server/tests/api/users/users-verification.ts +++ b/server/tests/api/users/users-verification.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index f00cbab5a..fc44a6acd 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -11,7 +11,7 @@ import { setAccessTokensToServers, testImage, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { AbuseState, HttpStatusCode, OAuth2ErrorCode, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/audio-only.ts b/server/tests/api/videos/audio-only.ts index f4b635bd5..4b27f2fbe 100644 --- a/server/tests/api/videos/audio-only.ts +++ b/server/tests/api/videos/audio-only.ts @@ -3,7 +3,7 @@ import 'mocha' import * as chai from 'chai' import { getAudioStream, getVideoStreamSize } from '@server/helpers/ffprobe-utils' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 9e7b39cfa..cb83fa0f0 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -18,7 +18,7 @@ import { wait, waitJobs, webtorrentAdd -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCommentThreadTree, VideoPrivacy } from '@shared/models' import { completeVideoCheck } from '@server/tests/shared/video' diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts index 1ba7cdbcc..0842817dc 100644 --- a/server/tests/api/videos/resumable-upload.ts +++ b/server/tests/api/videos/resumable-upload.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 100067f18..e5e12dd19 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, testImage, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { Video, VideoPrivacy } from '@shared/models' import { completeVideoCheck } from '@server/tests/shared/video' diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index 3bb0d131c..9f00312aa 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts @@ -12,7 +12,7 @@ import { testCaptionFile, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/videos/video-change-ownership.ts b/server/tests/api/videos/video-change-ownership.ts index d6665fe4e..6c229c6cf 100644 --- a/server/tests/api/videos/video-change-ownership.ts +++ b/server/tests/api/videos/video-change-ownership.ts @@ -12,7 +12,7 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index 6ab5faa07..2ac577a59 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -15,7 +15,7 @@ import { testImage, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { User, VideoChannel } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index 61ee54540..bb4f92a9b 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, testImage -} from '@shared/extra-utils' +} from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/videos/video-create-transcoding.ts b/server/tests/api/videos/video-create-transcoding.ts index c4627e0c1..e81f54714 100644 --- a/server/tests/api/videos/video-create-transcoding.ts +++ b/server/tests/api/videos/video-create-transcoding.ts @@ -14,7 +14,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-description.ts b/server/tests/api/videos/video-description.ts index d22b4ed96..23c55f728 100644 --- a/server/tests/api/videos/video-description.ts +++ b/server/tests/api/videos/video-description.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/api/videos/video-files.ts b/server/tests/api/videos/video-files.ts index fcb2ca2e4..0b5121740 100644 --- a/server/tests/api/videos/video-files.ts +++ b/server/tests/api/videos/video-files.ts @@ -2,7 +2,7 @@ import 'mocha' import { expect } from 'chai' -import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' +import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands' describe('Test videos files', function () { let servers: PeerTubeServer[] diff --git a/server/tests/api/videos/video-hls.ts b/server/tests/api/videos/video-hls.ts index a18c3d672..d050a7a7e 100644 --- a/server/tests/api/videos/video-hls.ts +++ b/server/tests/api/videos/video-hls.ts @@ -21,7 +21,7 @@ import { setAccessTokensToServers, waitJobs, webtorrentAdd -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoStreamingPlaylistType } from '@shared/models' import { DEFAULT_AUDIO_RESOLUTION } from '../../../initializers/constants' diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index b6168b54e..2518743f7 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -17,7 +17,7 @@ import { testCaptionFile, testImage, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy, VideoResolution } from '@shared/models' async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMagnet: string, idTorrent: string) { diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts index b5d183d62..99ea67a0f 100644 --- a/server/tests/api/videos/video-nsfw.ts +++ b/server/tests/api/videos/video-nsfw.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { BooleanBothQuery, CustomConfig, ResultList, Video, VideosOverview } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-playlist-thumbnails.ts b/server/tests/api/videos/video-playlist-thumbnails.ts index f0b2ca169..e6b6c34eb 100644 --- a/server/tests/api/videos/video-playlist-thumbnails.ts +++ b/server/tests/api/videos/video-playlist-thumbnails.ts @@ -11,7 +11,7 @@ import { setDefaultVideoChannel, testImage, waitJobs -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model' const expect = chai.expect diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts index f42aee2ff..6279f5cd0 100644 --- a/server/tests/api/videos/video-playlists.ts +++ b/server/tests/api/videos/video-playlists.ts @@ -14,7 +14,7 @@ import { testImage, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylist, diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts index 08b624ff3..13eb941ea 100644 --- a/server/tests/api/videos/video-privacy.ts +++ b/server/tests/api/videos/video-privacy.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoCreateResult, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts index 3f7738784..9408574ad 100644 --- a/server/tests/api/videos/video-schedule-update.ts +++ b/server/tests/api/videos/video-schedule-update.ts @@ -10,7 +10,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts index 7ed55b8e8..f4b0bc53a 100644 --- a/server/tests/api/videos/video-transcoder.ts +++ b/server/tests/api/videos/video-transcoder.ts @@ -16,7 +16,7 @@ import { setAccessTokensToServers, waitJobs, webtorrentAdd -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoState } from '@shared/models' import { canDoQuickTranscode, diff --git a/server/tests/api/videos/videos-common-filters.ts b/server/tests/api/videos/videos-common-filters.ts index ca5f42173..0254662c5 100644 --- a/server/tests/api/videos/videos-common-filters.ts +++ b/server/tests/api/videos/videos-common-filters.ts @@ -12,7 +12,7 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserRole, Video, VideoDetails, VideoInclude, VideoPrivacy } from '@shared/models' describe('Test videos filter', function () { diff --git a/server/tests/api/videos/videos-history.ts b/server/tests/api/videos/videos-history.ts index e4bc0bb3a..813fc4f45 100644 --- a/server/tests/api/videos/videos-history.ts +++ b/server/tests/api/videos/videos-history.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, setAccessTokensToServers, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, Video } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts index 70aa66549..08a4efb63 100644 --- a/server/tests/api/videos/videos-overview.ts +++ b/server/tests/api/videos/videos-overview.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, wait } from '@shared/server-commands' import { VideosOverview } from '@shared/models' const expect = chai.expect diff --git a/server/tests/api/videos/videos-views-cleaner.ts b/server/tests/api/videos/videos-views-cleaner.ts index 82268b1be..7f7597af4 100644 --- a/server/tests/api/videos/videos-views-cleaner.ts +++ b/server/tests/api/videos/videos-views-cleaner.ts @@ -11,7 +11,7 @@ import { setAccessTokensToServers, wait, waitJobs -} from '../../../../shared/extra-utils' +} from '../../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/cli/create-import-video-file-job.ts b/server/tests/cli/create-import-video-file-job.ts index c06b9550c..5973272e5 100644 --- a/server/tests/cli/create-import-video-file-job.ts +++ b/server/tests/cli/create-import-video-file-job.ts @@ -13,7 +13,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails, VideoFile, VideoInclude } from '@shared/models' const expect = chai.expect diff --git a/server/tests/cli/create-move-video-storage-job.ts b/server/tests/cli/create-move-video-storage-job.ts index b598c8359..8b66f24bf 100644 --- a/server/tests/cli/create-move-video-storage-job.ts +++ b/server/tests/cli/create-move-video-storage-job.ts @@ -13,7 +13,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails } from '@shared/models' async function checkFiles (origin: PeerTubeServer, video: VideoDetails, inObjectStorage: boolean) { diff --git a/server/tests/cli/create-transcoding-job.ts b/server/tests/cli/create-transcoding-job.ts index fb9c2584f..ea3428662 100644 --- a/server/tests/cli/create-transcoding-job.ts +++ b/server/tests/cli/create-transcoding-job.ts @@ -14,7 +14,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '../../../shared/extra-utils' +} from '../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts index 3ac440f84..72213473b 100644 --- a/server/tests/cli/peertube.ts +++ b/server/tests/cli/peertube.ts @@ -14,7 +14,7 @@ import { setAccessTokensToServers, testHelloWorldRegisteredSettings, waitJobs -} from '../../../shared/extra-utils' +} from '../../../shared/server-commands' describe('Test CLI wrapper', function () { let server: PeerTubeServer diff --git a/server/tests/cli/plugins.ts b/server/tests/cli/plugins.ts index 07c78cc89..d9cf9465c 100644 --- a/server/tests/cli/plugins.ts +++ b/server/tests/cli/plugins.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '../../../shared/extra-utils' +} from '../../../shared/server-commands' describe('Test plugin scripts', function () { let server: PeerTubeServer diff --git a/server/tests/cli/print-transcode-command.ts b/server/tests/cli/print-transcode-command.ts index 0b8629251..36c43c6df 100644 --- a/server/tests/cli/print-transcode-command.ts +++ b/server/tests/cli/print-transcode-command.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { buildAbsoluteFixturePath, CLICommand } from '@shared/extra-utils' +import { buildAbsoluteFixturePath, CLICommand } from '@shared/server-commands' import { VideoResolution } from '../../../shared/models/videos' const expect = chai.expect diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts index 4b4f75527..e0bc6a589 100644 --- a/server/tests/cli/prune-storage.ts +++ b/server/tests/cli/prune-storage.ts @@ -17,7 +17,7 @@ import { setDefaultVideoChannel, wait, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/cli/regenerate-thumbnails.ts b/server/tests/cli/regenerate-thumbnails.ts index 780c9b4bd..98d15272a 100644 --- a/server/tests/cli/regenerate-thumbnails.ts +++ b/server/tests/cli/regenerate-thumbnails.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '../../../shared/extra-utils' +} from '../../../shared/server-commands' async function testThumbnail (server: PeerTubeServer, videoId: number | string) { const video = await server.videos.get({ id: videoId }) diff --git a/server/tests/cli/reset-password.ts b/server/tests/cli/reset-password.ts index 4a02db35d..34dedb113 100644 --- a/server/tests/cli/reset-password.ts +++ b/server/tests/cli/reset-password.ts @@ -1,5 +1,5 @@ import 'mocha' -import { cleanupTests, CLICommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '../../../shared/extra-utils' +import { cleanupTests, CLICommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '../../../shared/server-commands' describe('Test reset password scripts', function () { let server: PeerTubeServer diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts index 43fbaec30..da89ff153 100644 --- a/server/tests/cli/update-host.ts +++ b/server/tests/cli/update-host.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' describe('Test update host scripts', function () { let server: PeerTubeServer diff --git a/server/tests/client.ts b/server/tests/client.ts index a91bec906..fe048d7ff 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts @@ -14,7 +14,7 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '../../shared/extra-utils' +} from '../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/external-plugins/auth-ldap.ts b/server/tests/external-plugins/auth-ldap.ts index acec69df5..326453a5f 100644 --- a/server/tests/external-plugins/auth-ldap.ts +++ b/server/tests/external-plugins/auth-ldap.ts @@ -2,7 +2,7 @@ import 'mocha' import { expect } from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Official plugin auth-ldap', function () { diff --git a/server/tests/external-plugins/auto-block-videos.ts b/server/tests/external-plugins/auto-block-videos.ts index 0eb4bda9a..2f75ad25b 100644 --- a/server/tests/external-plugins/auto-block-videos.ts +++ b/server/tests/external-plugins/auto-block-videos.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, setAccessTokensToServers, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { Video } from '@shared/models' async function check (server: PeerTubeServer, videoUUID: string, exists = true) { diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts index 271779dd4..bfa67e7ad 100644 --- a/server/tests/external-plugins/auto-mute.ts +++ b/server/tests/external-plugins/auto-mute.ts @@ -12,7 +12,7 @@ import { PeerTubeServer, setAccessTokensToServers, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Official plugin auto-mute', function () { diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts index a1c976fd3..bf030162e 100644 --- a/server/tests/feeds/feeds.ts +++ b/server/tests/feeds/feeds.ts @@ -12,7 +12,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' chai.use(require('chai-xml')) diff --git a/server/tests/helpers/image.ts b/server/tests/helpers/image.ts index 9fe9aa4cb..330139ee4 100644 --- a/server/tests/helpers/image.ts +++ b/server/tests/helpers/image.ts @@ -5,7 +5,7 @@ import { expect } from 'chai' import { readFile, remove } from 'fs-extra' import { join } from 'path' import { processImage } from '../../../server/helpers/image-utils' -import { buildAbsoluteFixturePath, root } from '../../../shared/extra-utils' +import { buildAbsoluteFixturePath, root } from '../../../shared/server-commands' async function checkBuffers (path1: string, path2: string, equals: boolean) { const [ buf1, buf2 ] = await Promise.all([ diff --git a/server/tests/helpers/request.ts b/server/tests/helpers/request.ts index 6edbf2a76..db0cca390 100644 --- a/server/tests/helpers/request.ts +++ b/server/tests/helpers/request.ts @@ -4,8 +4,8 @@ import 'mocha' import { expect } from 'chai' import { pathExists, remove } from 'fs-extra' import { join } from 'path' -import { Mock429 } from '@shared/extra-utils/mock-servers/mock-429' -import { FIXTURE_URLS, root, wait } from '../../../shared/extra-utils' +import { Mock429 } from '@shared/server-commands/mock-servers/mock-429' +import { FIXTURE_URLS, root, wait } from '../../../shared/server-commands' import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests' describe('Request helpers', function () { diff --git a/server/tests/misc-endpoints.ts b/server/tests/misc-endpoints.ts index 4968eef08..876546d89 100644 --- a/server/tests/misc-endpoints.ts +++ b/server/tests/misc-endpoints.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' import { HttpStatusCode, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/plugins/action-hooks.ts b/server/tests/plugins/action-hooks.ts index 4c1bc7d06..686926c17 100644 --- a/server/tests/plugins/action-hooks.ts +++ b/server/tests/plugins/action-hooks.ts @@ -9,7 +9,7 @@ import { PluginsCommand, setAccessTokensToServers, setDefaultVideoChannel -} from '@shared/extra-utils' +} from '@shared/server-commands' import { ServerHookName, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' describe('Test plugin action hooks', function () { diff --git a/server/tests/plugins/external-auth.ts b/server/tests/plugins/external-auth.ts index 25b25bfee..a4a3764f5 100644 --- a/server/tests/plugins/external-auth.ts +++ b/server/tests/plugins/external-auth.ts @@ -10,7 +10,7 @@ import { PluginsCommand, setAccessTokensToServers, wait -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, UserRole } from '@shared/models' async function loginExternal (options: { diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index ff2afc56b..a84edfac6 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts @@ -13,7 +13,7 @@ import { setAccessTokensToServers, setDefaultVideoChannel, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoDetails, VideoImportState, VideoPlaylist, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/plugins/html-injection.ts b/server/tests/plugins/html-injection.ts index 95c0cd687..9e10d3302 100644 --- a/server/tests/plugins/html-injection.ts +++ b/server/tests/plugins/html-injection.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '../../../shared/extra-utils' +} from '../../../shared/server-commands' const expect = chai.expect diff --git a/server/tests/plugins/id-and-pass-auth.ts b/server/tests/plugins/id-and-pass-auth.ts index fde0166f9..ea3b0f6ab 100644 --- a/server/tests/plugins/id-and-pass-auth.ts +++ b/server/tests/plugins/id-and-pass-auth.ts @@ -2,7 +2,7 @@ import 'mocha' import { expect } from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers, wait } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers, wait } from '@shared/server-commands' import { HttpStatusCode, UserRole } from '@shared/models' describe('Test id and pass auth plugins', function () { diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts index da84658bb..4ab4acd58 100644 --- a/server/tests/plugins/plugin-helpers.ts +++ b/server/tests/plugins/plugin-helpers.ts @@ -15,7 +15,7 @@ import { PluginsCommand, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, ThumbnailType } from '@shared/models' function postCommand (server: PeerTubeServer, command: string, bodyArg?: object) { diff --git a/server/tests/plugins/plugin-router.ts b/server/tests/plugins/plugin-router.ts index b1ac9e2fe..58629adc7 100644 --- a/server/tests/plugins/plugin-router.ts +++ b/server/tests/plugins/plugin-router.ts @@ -10,7 +10,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test plugin helpers', function () { diff --git a/server/tests/plugins/plugin-storage.ts b/server/tests/plugins/plugin-storage.ts index c0596819e..0bfc4fe28 100644 --- a/server/tests/plugins/plugin-storage.ts +++ b/server/tests/plugins/plugin-storage.ts @@ -11,7 +11,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test plugin storage', function () { diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts index 93637e3ce..5ab686472 100644 --- a/server/tests/plugins/plugin-transcoding.ts +++ b/server/tests/plugins/plugin-transcoding.ts @@ -12,7 +12,7 @@ import { setDefaultVideoChannel, testFfmpegStreamError, waitJobs -} from '@shared/extra-utils' +} from '@shared/server-commands' import { VideoPrivacy } from '@shared/models' async function createLiveWrapper (server: PeerTubeServer) { diff --git a/server/tests/plugins/plugin-unloading.ts b/server/tests/plugins/plugin-unloading.ts index 6bf2fda9b..a94b83695 100644 --- a/server/tests/plugins/plugin-unloading.ts +++ b/server/tests/plugins/plugin-unloading.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode } from '@shared/models' describe('Test plugins module unloading', function () { diff --git a/server/tests/plugins/translations.ts b/server/tests/plugins/translations.ts index 8b25c6b75..0b6e5793d 100644 --- a/server/tests/plugins/translations.ts +++ b/server/tests/plugins/translations.ts @@ -2,7 +2,7 @@ import 'mocha' import * as chai from 'chai' -import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers } from '@shared/extra-utils' +import { cleanupTests, createSingleServer, PeerTubeServer, PluginsCommand, setAccessTokensToServers } from '@shared/server-commands' const expect = chai.expect diff --git a/server/tests/plugins/video-constants.ts b/server/tests/plugins/video-constants.ts index 19cba6c2c..6dce6922f 100644 --- a/server/tests/plugins/video-constants.ts +++ b/server/tests/plugins/video-constants.ts @@ -9,7 +9,7 @@ import { PeerTubeServer, PluginsCommand, setAccessTokensToServers -} from '@shared/extra-utils' +} from '@shared/server-commands' import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models' const expect = chai.expect diff --git a/server/tests/shared/video.ts b/server/tests/shared/video.ts index 95b30b27c..cf923d4cd 100644 --- a/server/tests/shared/video.ts +++ b/server/tests/shared/video.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { dateIsValid, makeRawRequest, PeerTubeServer, testImage, webtorrentAdd } from '@shared/extra-utils' +import { dateIsValid, makeRawRequest, PeerTubeServer, testImage, webtorrentAdd } from '@shared/server-commands' import { expect } from 'chai' import { loadLanguages, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '@server/initializers/constants' import { getLowercaseExtension, uuidRegex } from '@shared/core-utils' diff --git a/server/tools/cli.ts b/server/tools/cli.ts index 7c763734f..00adcedeb 100644 --- a/server/tools/cli.ts +++ b/server/tools/cli.ts @@ -2,7 +2,7 @@ import { Command } from 'commander' import { Netrc } from 'netrc-parser' import { join } from 'path' import { createLogger, format, transports } from 'winston' -import { PeerTubeServer } from '@shared/extra-utils' +import { PeerTubeServer } from '@shared/server-commands' import { UserRole } from '@shared/models' import { VideoPrivacy } from '../../shared/models/videos' import { getAppNumber, isTestInstance } from '../helpers/core-utils' diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 223bf7f1b..8314551f6 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -15,7 +15,7 @@ import { getLogger, getServerCredentials } from './cli' -import { wait } from '@shared/extra-utils' +import { wait } from '@shared/server-commands' import { YoutubeDLCLI, YoutubeDLInfo, YoutubeDLInfoBuilder } from '@server/helpers/youtube-dl' import prompt = require('prompt') diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts index 4b3636d06..5710c5ab5 100644 --- a/shared/extra-utils/index.ts +++ b/shared/extra-utils/index.ts @@ -1,15 +1 @@ -export * from './bulk' -export * from './cli' -export * from './custom-pages' -export * from './feeds' -export * from './logs' -export * from './miscs' -export * from './mock-servers' -export * from './moderation' -export * from './overviews' -export * from './requests' -export * from './search' -export * from './server' -export * from './socket' -export * from './users' -export * from './videos' +export * from './ffprobe' diff --git a/shared/extra-utils/bulk/bulk-command.ts b/shared/server-commands/bulk/bulk-command.ts similarity index 100% rename from shared/extra-utils/bulk/bulk-command.ts rename to shared/server-commands/bulk/bulk-command.ts diff --git a/shared/extra-utils/bulk/index.ts b/shared/server-commands/bulk/index.ts similarity index 100% rename from shared/extra-utils/bulk/index.ts rename to shared/server-commands/bulk/index.ts diff --git a/shared/extra-utils/cli/cli-command.ts b/shared/server-commands/cli/cli-command.ts similarity index 100% rename from shared/extra-utils/cli/cli-command.ts rename to shared/server-commands/cli/cli-command.ts diff --git a/shared/extra-utils/cli/index.ts b/shared/server-commands/cli/index.ts similarity index 100% rename from shared/extra-utils/cli/index.ts rename to shared/server-commands/cli/index.ts diff --git a/shared/extra-utils/custom-pages/custom-pages-command.ts b/shared/server-commands/custom-pages/custom-pages-command.ts similarity index 100% rename from shared/extra-utils/custom-pages/custom-pages-command.ts rename to shared/server-commands/custom-pages/custom-pages-command.ts diff --git a/shared/extra-utils/custom-pages/index.ts b/shared/server-commands/custom-pages/index.ts similarity index 100% rename from shared/extra-utils/custom-pages/index.ts rename to shared/server-commands/custom-pages/index.ts diff --git a/shared/extra-utils/feeds/feeds-command.ts b/shared/server-commands/feeds/feeds-command.ts similarity index 100% rename from shared/extra-utils/feeds/feeds-command.ts rename to shared/server-commands/feeds/feeds-command.ts diff --git a/shared/extra-utils/feeds/index.ts b/shared/server-commands/feeds/index.ts similarity index 100% rename from shared/extra-utils/feeds/index.ts rename to shared/server-commands/feeds/index.ts diff --git a/shared/server-commands/index.ts b/shared/server-commands/index.ts new file mode 100644 index 000000000..4b3636d06 --- /dev/null +++ b/shared/server-commands/index.ts @@ -0,0 +1,15 @@ +export * from './bulk' +export * from './cli' +export * from './custom-pages' +export * from './feeds' +export * from './logs' +export * from './miscs' +export * from './mock-servers' +export * from './moderation' +export * from './overviews' +export * from './requests' +export * from './search' +export * from './server' +export * from './socket' +export * from './users' +export * from './videos' diff --git a/shared/extra-utils/logs/index.ts b/shared/server-commands/logs/index.ts similarity index 100% rename from shared/extra-utils/logs/index.ts rename to shared/server-commands/logs/index.ts diff --git a/shared/extra-utils/logs/logs-command.ts b/shared/server-commands/logs/logs-command.ts similarity index 100% rename from shared/extra-utils/logs/logs-command.ts rename to shared/server-commands/logs/logs-command.ts diff --git a/shared/extra-utils/miscs/checks.ts b/shared/server-commands/miscs/checks.ts similarity index 100% rename from shared/extra-utils/miscs/checks.ts rename to shared/server-commands/miscs/checks.ts diff --git a/shared/extra-utils/miscs/generate.ts b/shared/server-commands/miscs/generate.ts similarity index 100% rename from shared/extra-utils/miscs/generate.ts rename to shared/server-commands/miscs/generate.ts diff --git a/shared/extra-utils/miscs/index.ts b/shared/server-commands/miscs/index.ts similarity index 100% rename from shared/extra-utils/miscs/index.ts rename to shared/server-commands/miscs/index.ts diff --git a/shared/extra-utils/miscs/sql-command.ts b/shared/server-commands/miscs/sql-command.ts similarity index 100% rename from shared/extra-utils/miscs/sql-command.ts rename to shared/server-commands/miscs/sql-command.ts diff --git a/shared/extra-utils/miscs/tests.ts b/shared/server-commands/miscs/tests.ts similarity index 100% rename from shared/extra-utils/miscs/tests.ts rename to shared/server-commands/miscs/tests.ts diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/server-commands/miscs/webtorrent.ts similarity index 100% rename from shared/extra-utils/miscs/webtorrent.ts rename to shared/server-commands/miscs/webtorrent.ts diff --git a/shared/extra-utils/mock-servers/index.ts b/shared/server-commands/mock-servers/index.ts similarity index 100% rename from shared/extra-utils/mock-servers/index.ts rename to shared/server-commands/mock-servers/index.ts diff --git a/shared/extra-utils/mock-servers/mock-429.ts b/shared/server-commands/mock-servers/mock-429.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-429.ts rename to shared/server-commands/mock-servers/mock-429.ts diff --git a/shared/extra-utils/mock-servers/mock-email.ts b/shared/server-commands/mock-servers/mock-email.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-email.ts rename to shared/server-commands/mock-servers/mock-email.ts diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/server-commands/mock-servers/mock-instances-index.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-instances-index.ts rename to shared/server-commands/mock-servers/mock-instances-index.ts diff --git a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts b/shared/server-commands/mock-servers/mock-joinpeertube-versions.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts rename to shared/server-commands/mock-servers/mock-joinpeertube-versions.ts diff --git a/shared/extra-utils/mock-servers/mock-object-storage.ts b/shared/server-commands/mock-servers/mock-object-storage.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-object-storage.ts rename to shared/server-commands/mock-servers/mock-object-storage.ts diff --git a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts b/shared/server-commands/mock-servers/mock-plugin-blocklist.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-plugin-blocklist.ts rename to shared/server-commands/mock-servers/mock-plugin-blocklist.ts diff --git a/shared/extra-utils/mock-servers/mock-proxy.ts b/shared/server-commands/mock-servers/mock-proxy.ts similarity index 100% rename from shared/extra-utils/mock-servers/mock-proxy.ts rename to shared/server-commands/mock-servers/mock-proxy.ts diff --git a/shared/extra-utils/mock-servers/utils.ts b/shared/server-commands/mock-servers/utils.ts similarity index 100% rename from shared/extra-utils/mock-servers/utils.ts rename to shared/server-commands/mock-servers/utils.ts diff --git a/shared/extra-utils/moderation/abuses-command.ts b/shared/server-commands/moderation/abuses-command.ts similarity index 100% rename from shared/extra-utils/moderation/abuses-command.ts rename to shared/server-commands/moderation/abuses-command.ts diff --git a/shared/extra-utils/moderation/index.ts b/shared/server-commands/moderation/index.ts similarity index 100% rename from shared/extra-utils/moderation/index.ts rename to shared/server-commands/moderation/index.ts diff --git a/shared/extra-utils/overviews/index.ts b/shared/server-commands/overviews/index.ts similarity index 100% rename from shared/extra-utils/overviews/index.ts rename to shared/server-commands/overviews/index.ts diff --git a/shared/extra-utils/overviews/overviews-command.ts b/shared/server-commands/overviews/overviews-command.ts similarity index 100% rename from shared/extra-utils/overviews/overviews-command.ts rename to shared/server-commands/overviews/overviews-command.ts diff --git a/shared/extra-utils/requests/check-api-params.ts b/shared/server-commands/requests/check-api-params.ts similarity index 100% rename from shared/extra-utils/requests/check-api-params.ts rename to shared/server-commands/requests/check-api-params.ts diff --git a/shared/extra-utils/requests/index.ts b/shared/server-commands/requests/index.ts similarity index 100% rename from shared/extra-utils/requests/index.ts rename to shared/server-commands/requests/index.ts diff --git a/shared/extra-utils/requests/requests.ts b/shared/server-commands/requests/requests.ts similarity index 100% rename from shared/extra-utils/requests/requests.ts rename to shared/server-commands/requests/requests.ts diff --git a/shared/extra-utils/search/index.ts b/shared/server-commands/search/index.ts similarity index 100% rename from shared/extra-utils/search/index.ts rename to shared/server-commands/search/index.ts diff --git a/shared/extra-utils/search/search-command.ts b/shared/server-commands/search/search-command.ts similarity index 100% rename from shared/extra-utils/search/search-command.ts rename to shared/server-commands/search/search-command.ts diff --git a/shared/extra-utils/server/config-command.ts b/shared/server-commands/server/config-command.ts similarity index 100% rename from shared/extra-utils/server/config-command.ts rename to shared/server-commands/server/config-command.ts diff --git a/shared/extra-utils/server/contact-form-command.ts b/shared/server-commands/server/contact-form-command.ts similarity index 100% rename from shared/extra-utils/server/contact-form-command.ts rename to shared/server-commands/server/contact-form-command.ts diff --git a/shared/extra-utils/server/debug-command.ts b/shared/server-commands/server/debug-command.ts similarity index 100% rename from shared/extra-utils/server/debug-command.ts rename to shared/server-commands/server/debug-command.ts diff --git a/shared/extra-utils/server/directories.ts b/shared/server-commands/server/directories.ts similarity index 100% rename from shared/extra-utils/server/directories.ts rename to shared/server-commands/server/directories.ts diff --git a/shared/extra-utils/server/follows-command.ts b/shared/server-commands/server/follows-command.ts similarity index 100% rename from shared/extra-utils/server/follows-command.ts rename to shared/server-commands/server/follows-command.ts diff --git a/shared/extra-utils/server/follows.ts b/shared/server-commands/server/follows.ts similarity index 100% rename from shared/extra-utils/server/follows.ts rename to shared/server-commands/server/follows.ts diff --git a/shared/extra-utils/server/index.ts b/shared/server-commands/server/index.ts similarity index 100% rename from shared/extra-utils/server/index.ts rename to shared/server-commands/server/index.ts diff --git a/shared/extra-utils/server/jobs-command.ts b/shared/server-commands/server/jobs-command.ts similarity index 100% rename from shared/extra-utils/server/jobs-command.ts rename to shared/server-commands/server/jobs-command.ts diff --git a/shared/extra-utils/server/jobs.ts b/shared/server-commands/server/jobs.ts similarity index 100% rename from shared/extra-utils/server/jobs.ts rename to shared/server-commands/server/jobs.ts diff --git a/shared/extra-utils/server/object-storage-command.ts b/shared/server-commands/server/object-storage-command.ts similarity index 100% rename from shared/extra-utils/server/object-storage-command.ts rename to shared/server-commands/server/object-storage-command.ts diff --git a/shared/extra-utils/server/plugins-command.ts b/shared/server-commands/server/plugins-command.ts similarity index 100% rename from shared/extra-utils/server/plugins-command.ts rename to shared/server-commands/server/plugins-command.ts diff --git a/shared/extra-utils/server/plugins.ts b/shared/server-commands/server/plugins.ts similarity index 92% rename from shared/extra-utils/server/plugins.ts rename to shared/server-commands/server/plugins.ts index 0f5fabd5a..c6316898d 100644 --- a/shared/extra-utils/server/plugins.ts +++ b/shared/server-commands/server/plugins.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import { expect } from 'chai' -import { PeerTubeServer } from '../server/server' +import { PeerTubeServer } from './server' async function testHelloWorldRegisteredSettings (server: PeerTubeServer) { const body = await server.plugins.getRegisteredSettings({ npmName: 'peertube-plugin-hello-world' }) diff --git a/shared/extra-utils/server/redundancy-command.ts b/shared/server-commands/server/redundancy-command.ts similarity index 100% rename from shared/extra-utils/server/redundancy-command.ts rename to shared/server-commands/server/redundancy-command.ts diff --git a/shared/extra-utils/server/server.ts b/shared/server-commands/server/server.ts similarity index 100% rename from shared/extra-utils/server/server.ts rename to shared/server-commands/server/server.ts diff --git a/shared/extra-utils/server/servers-command.ts b/shared/server-commands/server/servers-command.ts similarity index 100% rename from shared/extra-utils/server/servers-command.ts rename to shared/server-commands/server/servers-command.ts diff --git a/shared/extra-utils/server/servers.ts b/shared/server-commands/server/servers.ts similarity index 100% rename from shared/extra-utils/server/servers.ts rename to shared/server-commands/server/servers.ts diff --git a/shared/extra-utils/server/stats-command.ts b/shared/server-commands/server/stats-command.ts similarity index 100% rename from shared/extra-utils/server/stats-command.ts rename to shared/server-commands/server/stats-command.ts diff --git a/shared/extra-utils/server/tracker.ts b/shared/server-commands/server/tracker.ts similarity index 100% rename from shared/extra-utils/server/tracker.ts rename to shared/server-commands/server/tracker.ts diff --git a/shared/extra-utils/shared/abstract-command.ts b/shared/server-commands/shared/abstract-command.ts similarity index 100% rename from shared/extra-utils/shared/abstract-command.ts rename to shared/server-commands/shared/abstract-command.ts diff --git a/shared/extra-utils/shared/index.ts b/shared/server-commands/shared/index.ts similarity index 100% rename from shared/extra-utils/shared/index.ts rename to shared/server-commands/shared/index.ts diff --git a/shared/extra-utils/socket/index.ts b/shared/server-commands/socket/index.ts similarity index 100% rename from shared/extra-utils/socket/index.ts rename to shared/server-commands/socket/index.ts diff --git a/shared/extra-utils/socket/socket-io-command.ts b/shared/server-commands/socket/socket-io-command.ts similarity index 100% rename from shared/extra-utils/socket/socket-io-command.ts rename to shared/server-commands/socket/socket-io-command.ts diff --git a/shared/extra-utils/users/accounts-command.ts b/shared/server-commands/users/accounts-command.ts similarity index 100% rename from shared/extra-utils/users/accounts-command.ts rename to shared/server-commands/users/accounts-command.ts diff --git a/shared/extra-utils/users/actors.ts b/shared/server-commands/users/actors.ts similarity index 100% rename from shared/extra-utils/users/actors.ts rename to shared/server-commands/users/actors.ts diff --git a/shared/extra-utils/users/blocklist-command.ts b/shared/server-commands/users/blocklist-command.ts similarity index 100% rename from shared/extra-utils/users/blocklist-command.ts rename to shared/server-commands/users/blocklist-command.ts diff --git a/shared/extra-utils/users/index.ts b/shared/server-commands/users/index.ts similarity index 100% rename from shared/extra-utils/users/index.ts rename to shared/server-commands/users/index.ts diff --git a/shared/extra-utils/users/login-command.ts b/shared/server-commands/users/login-command.ts similarity index 100% rename from shared/extra-utils/users/login-command.ts rename to shared/server-commands/users/login-command.ts diff --git a/shared/extra-utils/users/login.ts b/shared/server-commands/users/login.ts similarity index 100% rename from shared/extra-utils/users/login.ts rename to shared/server-commands/users/login.ts diff --git a/shared/extra-utils/users/notifications-command.ts b/shared/server-commands/users/notifications-command.ts similarity index 100% rename from shared/extra-utils/users/notifications-command.ts rename to shared/server-commands/users/notifications-command.ts diff --git a/shared/extra-utils/users/notifications.ts b/shared/server-commands/users/notifications.ts similarity index 100% rename from shared/extra-utils/users/notifications.ts rename to shared/server-commands/users/notifications.ts diff --git a/shared/extra-utils/users/subscriptions-command.ts b/shared/server-commands/users/subscriptions-command.ts similarity index 100% rename from shared/extra-utils/users/subscriptions-command.ts rename to shared/server-commands/users/subscriptions-command.ts diff --git a/shared/extra-utils/users/users-command.ts b/shared/server-commands/users/users-command.ts similarity index 100% rename from shared/extra-utils/users/users-command.ts rename to shared/server-commands/users/users-command.ts diff --git a/shared/extra-utils/videos/blacklist-command.ts b/shared/server-commands/videos/blacklist-command.ts similarity index 100% rename from shared/extra-utils/videos/blacklist-command.ts rename to shared/server-commands/videos/blacklist-command.ts diff --git a/shared/extra-utils/videos/captions-command.ts b/shared/server-commands/videos/captions-command.ts similarity index 100% rename from shared/extra-utils/videos/captions-command.ts rename to shared/server-commands/videos/captions-command.ts diff --git a/shared/extra-utils/videos/captions.ts b/shared/server-commands/videos/captions.ts similarity index 100% rename from shared/extra-utils/videos/captions.ts rename to shared/server-commands/videos/captions.ts diff --git a/shared/extra-utils/videos/change-ownership-command.ts b/shared/server-commands/videos/change-ownership-command.ts similarity index 100% rename from shared/extra-utils/videos/change-ownership-command.ts rename to shared/server-commands/videos/change-ownership-command.ts diff --git a/shared/extra-utils/videos/channels-command.ts b/shared/server-commands/videos/channels-command.ts similarity index 100% rename from shared/extra-utils/videos/channels-command.ts rename to shared/server-commands/videos/channels-command.ts diff --git a/shared/extra-utils/videos/channels.ts b/shared/server-commands/videos/channels.ts similarity index 100% rename from shared/extra-utils/videos/channels.ts rename to shared/server-commands/videos/channels.ts diff --git a/shared/extra-utils/videos/comments-command.ts b/shared/server-commands/videos/comments-command.ts similarity index 100% rename from shared/extra-utils/videos/comments-command.ts rename to shared/server-commands/videos/comments-command.ts diff --git a/shared/extra-utils/videos/history-command.ts b/shared/server-commands/videos/history-command.ts similarity index 100% rename from shared/extra-utils/videos/history-command.ts rename to shared/server-commands/videos/history-command.ts diff --git a/shared/extra-utils/videos/imports-command.ts b/shared/server-commands/videos/imports-command.ts similarity index 100% rename from shared/extra-utils/videos/imports-command.ts rename to shared/server-commands/videos/imports-command.ts diff --git a/shared/extra-utils/videos/index.ts b/shared/server-commands/videos/index.ts similarity index 100% rename from shared/extra-utils/videos/index.ts rename to shared/server-commands/videos/index.ts diff --git a/shared/extra-utils/videos/live-command.ts b/shared/server-commands/videos/live-command.ts similarity index 100% rename from shared/extra-utils/videos/live-command.ts rename to shared/server-commands/videos/live-command.ts diff --git a/shared/extra-utils/videos/live.ts b/shared/server-commands/videos/live.ts similarity index 100% rename from shared/extra-utils/videos/live.ts rename to shared/server-commands/videos/live.ts diff --git a/shared/extra-utils/videos/playlists-command.ts b/shared/server-commands/videos/playlists-command.ts similarity index 100% rename from shared/extra-utils/videos/playlists-command.ts rename to shared/server-commands/videos/playlists-command.ts diff --git a/shared/extra-utils/videos/playlists.ts b/shared/server-commands/videos/playlists.ts similarity index 100% rename from shared/extra-utils/videos/playlists.ts rename to shared/server-commands/videos/playlists.ts diff --git a/shared/extra-utils/videos/services-command.ts b/shared/server-commands/videos/services-command.ts similarity index 100% rename from shared/extra-utils/videos/services-command.ts rename to shared/server-commands/videos/services-command.ts diff --git a/shared/extra-utils/videos/streaming-playlists-command.ts b/shared/server-commands/videos/streaming-playlists-command.ts similarity index 100% rename from shared/extra-utils/videos/streaming-playlists-command.ts rename to shared/server-commands/videos/streaming-playlists-command.ts diff --git a/shared/extra-utils/videos/streaming-playlists.ts b/shared/server-commands/videos/streaming-playlists.ts similarity index 100% rename from shared/extra-utils/videos/streaming-playlists.ts rename to shared/server-commands/videos/streaming-playlists.ts diff --git a/shared/extra-utils/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts similarity index 100% rename from shared/extra-utils/videos/videos-command.ts rename to shared/server-commands/videos/videos-command.ts diff --git a/shared/extra-utils/videos/videos.ts b/shared/server-commands/videos/videos.ts similarity index 100% rename from shared/extra-utils/videos/videos.ts rename to shared/server-commands/videos/videos.ts diff --git a/shared/tsconfig.types.json b/shared/tsconfig.types.json index b01d12e53..73c1cae6c 100644 --- a/shared/tsconfig.types.json +++ b/shared/tsconfig.types.json @@ -5,5 +5,8 @@ "stripInternal": true, "removeComments": false, "emitDeclarationOnly": true - } + }, + "exclude": [ + "server-commands/" + ] } diff --git a/shared/typescript-utils/index.ts b/shared/typescript-utils/index.ts new file mode 100644 index 000000000..c9f6f047d --- /dev/null +++ b/shared/typescript-utils/index.ts @@ -0,0 +1 @@ +export * from './types' diff --git a/shared/typescript-utils/types.ts b/shared/typescript-utils/types.ts new file mode 100644 index 000000000..bd2a97b98 --- /dev/null +++ b/shared/typescript-utils/types.ts @@ -0,0 +1,45 @@ +/* eslint-disable @typescript-eslint/array-type */ + +export type FunctionPropertyNames = { + [K in keyof T]: T[K] extends Function ? K : never +}[keyof T] + +export type FunctionProperties = Pick> + +export type AttributesOnly = { + [K in keyof T]: T[K] extends Function ? never : T[K] +} + +export type PickWith = { + [P in KT]: T[P] extends V ? V : never +} + +export type PickWithOpt = { + [P in KT]?: T[P] extends V ? V : never +} + +// https://github.com/krzkaczor/ts-essentials Rocks! +export type DeepPartial = { + [P in keyof T]?: T[P] extends Array + ? Array> + : T[P] extends ReadonlyArray + ? ReadonlyArray> + : DeepPartial +} + +type Primitive = string | Function | number | boolean | Symbol | undefined | null +export type DeepOmitHelper = { + [P in K]: // extra level of indirection needed to trigger homomorhic behavior + T[P] extends infer TP // distribute over unions + ? TP extends Primitive + ? TP // leave primitives and functions alone + : TP extends any[] + ? DeepOmitArray // Array special handling + : DeepOmit + : never +} +export type DeepOmit = T extends Primitive ? T : DeepOmitHelper> + +export type DeepOmitArray = { + [P in keyof T]: DeepOmit +} -- 2.41.0