Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix model imports

Chocobozzz5c1cbcfcb1a9
diff --git a/packages/models/src/player/index.ts b/packages/models/src/player/index.ts
index 98537c80e7..186d0e0339 100644
--- a/packages/models/src/player/index.ts
+++ b/packages/models/src/player/index.ts
@@ -1,2 +1,4 @@
export * from './player-mode.type.js'
export * from './player-theme.type.js'
+export * from './player-settings.js'
+export * from './player-settings-update.js'
diff --git a/packages/models/src/videos/player-settings-update.ts b/packages/models/src/player/player-settings-update.ts
similarity index 100%
rename from packages/models/src/videos/player-settings-update.ts
rename to packages/models/src/player/player-settings-update.ts
diff --git a/packages/models/src/videos/player-settings.ts b/packages/models/src/player/player-settings.ts
similarity index 100%
rename from packages/models/src/videos/player-settings.ts
rename to packages/models/src/player/player-settings.ts
diff --git a/packages/models/src/videos/index.ts b/packages/models/src/videos/index.ts
index e71d90bd0f..dd581d797b 100644
--- a/packages/models/src/videos/index.ts
+++ b/packages/models/src/videos/index.ts
@@ -16,8 +16,6 @@ export * from './chapter/index.js'
export * from './nsfw-flag.enum.js'
export * from './nsfw-policy.type.js'
-export * from './player-settings.js'
-export * from './player-settings-update.js'
export * from './storyboard.model.js'
export * from './thumbnail.type.js'
diff --git a/packages/tests/src/api/videos/player-settings.ts b/packages/tests/src/api/videos/player-settings.ts
index 8dbe56de76..5eade803cd 100644
--- a/packages/tests/src/api/videos/player-settings.ts
+++ b/packages/tests/src/api/videos/player-settings.ts
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import { VideoCreateResult } from '@peertube/peertube-models'
import {
PeerTubeServer,
cleanupTests,
@@ -10,7 +11,6 @@ import {
waitJobs
} from '@peertube/peertube-server-commands'
import { expect } from 'chai'
-import { VideoCreateResult } from '../../../../models/src/videos/video-create-result.model.js'
describe('Test player settings', function () {
let servers: PeerTubeServer[]
diff --git a/packages/tests/src/api/videos/video-comments.ts b/packages/tests/src/api/videos/video-comments.ts
index c3a1e0b2ff..260d160f41 100644
--- a/packages/tests/src/api/videos/video-comments.ts
+++ b/packages/tests/src/api/videos/video-comments.ts
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+import { VideoCreateResult } from '@peertube/peertube-models'
import {
CommentsCommand,
PeerTubeServer,
@@ -13,7 +14,6 @@ import {
} from '@peertube/peertube-server-commands'
import { dateIsValid, testImage } from '@tests/shared/checks.js'
import { expect } from 'chai'
-import { VideoCreateResult } from '../../../../models/src/videos/video-create-result.model.js'
describe('Test video comments', function () {
let server: PeerTubeServer
diff --git a/server/core/lib/player-settings.ts b/server/core/lib/player-settings.ts
index 4fc868f8fa..8d4c985dfb 100644
--- a/server/core/lib/player-settings.ts
+++ b/server/core/lib/player-settings.ts
@@ -1,7 +1,7 @@
+import { PlayerChannelSettings, PlayerVideoSettings } from '@peertube/peertube-models'
import { retryTransactionWrapper } from '@server/helpers/database-utils.js'
import { sequelizeTypescript } from '@server/initializers/database.js'
import { PlayerSettingModel } from '@server/models/video/player-setting.js'
-import { PlayerChannelSettings, PlayerVideoSettings } from '../../../packages/models/src/videos/player-settings.js'
import { MChannelId, MVideoId } from '@server/types/models/index.js'
export async function upsertPlayerSettings (options: {