diff --git a/client/src/components/AddPreview.vue b/client/src/components/AddPreview.vue index f9ee38b8f..944364e22 100644 --- a/client/src/components/AddPreview.vue +++ b/client/src/components/AddPreview.vue @@ -125,7 +125,6 @@ const testVideos = import.meta.env.DEV ["test youtube w/ captions", "https://www.youtube.com/watch?v=xco0qjszPHQ"], ["test vimeo 0", "https://vimeo.com/94338566"], ["test vimeo 1", "https://vimeo.com/239423699"], - ["test dailymotion 0", "https://www.dailymotion.com/video/x6hkywd"], [ "test direct 0", "https://test-videos.co.uk/vids/bigbuckbunny/mp4/h264/360/Big_Buck_Bunny_360_10s_1MB.mp4", diff --git a/client/src/components/AddPreviewHelper.vue b/client/src/components/AddPreviewHelper.vue index 78ee3c8e0..d50333e91 100644 --- a/client/src/components/AddPreviewHelper.vue +++ b/client/src/components/AddPreviewHelper.vue @@ -23,16 +23,6 @@ @link-click="setAddPreviewText" /> -
  • - -
  • -
    - - - - diff --git a/client/src/components/players/OmniPlayer.vue b/client/src/components/players/OmniPlayer.vue index 23e3612c7..c89c736ea 100644 --- a/client/src/components/players/OmniPlayer.vue +++ b/client/src/components/players/OmniPlayer.vue @@ -47,18 +47,6 @@ @buffering="onBuffering" @error="onError" /> - import("./YoutubePlayer.vue")); const VimeoPlayer = defineAsyncComponent(() => import("./VimeoPlayer.vue")); -const DailymotionPlayer = defineAsyncComponent(() => import("./DailymotionPlayer.vue")); const GoogleDrivePlayer = defineAsyncComponent(() => import("./GoogleDrivePlayer.vue")); const PlyrPlayer = defineAsyncComponent(() => import("./PlyrPlayer.vue")); const PeertubePlayer = defineAsyncComponent(() => import("./PeertubePlayer.vue")); @@ -250,10 +237,7 @@ function onReady() { } function hackReadyEdgeCase() { - if ( - props.source && - (props.source.service === "youtube" || props.source.service === "dailymotion") - ) { + if (props.source && props.source.service === "youtube") { store.commit("PLAYBACK_STATUS", PlayerStatus.ready); } } diff --git a/client/src/locales/de.ts b/client/src/locales/de.ts index 18cd564f5..ffdcedafe 100644 --- a/client/src/locales/de.ts +++ b/client/src/locales/de.ts @@ -30,7 +30,7 @@ export default { name: "OpenTogetherTube", text1: "ist eine Plattform zur Echtzeit-Videosynchronisation. Es ist einfach zu bedienen und erfordert keine Anmeldung. Erstelle einfach einen Raum, füge Videos hinzu und lade deine Freunde ein. Zack, fertig! Du bist nun startklar um mit deinen Freunden bis 3 Uhr nachts Videos zu gucken.", text2: "Das ursprüngliche TogetherTube wurde für seine einfache Benutzeroberfläche geliebt und dafür, wie einfach es war, sofort mit dem Ansehen von Videos zu beginnen. OpenTogetherTube hat sich zum Ziel gesetzt, genauso einfach zu sein und es darüber hinaus noch besser zu machen.", - text3: "Derzeit können Sie mit Ihren Freunden Online-Videos von Youtube, Vimeo, Dailymotion und direkte Links zu .mp4-Videos ansehen.", + text3: "Derzeit können Sie mit Ihren Freunden Online-Videos von Youtube, Vimeo, und direkte Links zu .mp4-Videos ansehen.", link: "Unterstützung für weitere Plattformen ist geplant", }, features: { @@ -165,7 +165,6 @@ export default { "platforms": { "youtube-videos": "Youtube-Videos: {url}", "vimeo-videos": "Vimeo-Videos: {url}", - "dailymotion-videos": "Dailymotion-Videos: {url}", "any-mp4-videos": "Alle öffentlichen .mp4-Videos: {url}", "youtube-playlists": "Youtube-Wiedergabelisten: {url}", "youtube-channels": "Youtube-Kanäle: {url}", diff --git a/client/src/locales/en.ts b/client/src/locales/en.ts index ad4d9005c..e069398d5 100644 --- a/client/src/locales/en.ts +++ b/client/src/locales/en.ts @@ -54,7 +54,7 @@ export default { name: "OpenTogetherTube", text1: "is a real-time video synchronization platform.\nIt's easy to use and has no sign up required. Just create a room, add videos and\ninvite your friends. BOOM! You're ready to binge videos with your friends until 3AM.", text2: "The original TogetherTube was loved for it's simple interface,\nand how easy it was to start watching videos right away.\nOpenTogetherTube aims to be just as easy, and then improve on\ntop of that to make it even better.", - text3: "Currently, you can watch online videos with your friends from Youtube, Vimeo, Dailymotion, direct links to .mp4 videos, and", + text3: "Currently, you can watch online videos with your friends from Youtube, Vimeo, direct links to .mp4 videos, and", link: "more are on the way", }, features: { @@ -197,7 +197,6 @@ export default { "platforms": { "youtube-videos": "Youtube videos: {url}", "vimeo-videos": "Vimeo videos: {url}", - "dailymotion-videos": "Dailymotion videos: {url}", "any-mp4-videos": "Any public .mp4 videos: {url}", "youtube-playlists": "Youtube playlists: {url}", "youtube-channels": "Youtube channels: {url}", diff --git a/client/src/locales/es.ts b/client/src/locales/es.ts index e0f1b62f6..990af2466 100644 --- a/client/src/locales/es.ts +++ b/client/src/locales/es.ts @@ -42,7 +42,7 @@ export default { name: "OpenTogetherTube", text1: "Es una plataforma de sincronizacion de videos en tiempo real.\nEs fácil para usar y no tienes que inscribirte. Simplemente crea un sala, agrega videos y\ninvita a tus amigos. BOOM! Estás listo para disfrutar de videos con tus amigos hasta las 3 de la mañana", text2: "El TogetherTube original fue amado por su interfaz simple,\ny lo fácil que fue empezar a ver vídeos de inmediato.\nOpenTogetherTube pretende ser igual de fácil de usar y luego mejoralo\npara hacerlo aún mejor.", - text3: "Actualmente, puedes ver videos en línea con tus amigos de Youtube, Vimeo, Dailymotion, enlaces directos a videos .mp4 y", + text3: "Actualmente, puedes ver videos en línea con tus amigos de Youtube, Vimeo, enlaces directos a videos .mp4 y", link: "hay más en camino", }, features: { @@ -185,7 +185,6 @@ export default { "platforms": { "youtube-videos": "Vídeos de Youtube: {url}", "vimeo-videos": "Vídeos de Vimeo: {url}", - "dailymotion-videos": "Vídeos de Dailymotion: {url}", "any-mp4-videos": "Cualquier video público .mp4: {url}", "youtube-playlists": "Listas de reproducción de youtube: {url}", "youtube-channels": "Canales de Youtube: {url}", diff --git a/client/src/locales/fr.ts b/client/src/locales/fr.ts index ae17b3349..af49586ba 100644 --- a/client/src/locales/fr.ts +++ b/client/src/locales/fr.ts @@ -31,7 +31,7 @@ export default { name: "OpenTogetherTube", text1: "Plateforme de synchronisation de vidéo en temps réel. Facile d'utilisation et sans connexion. Créer simplement une salle, ajoute une vidéo et invite t'es amis. BOOM! Tu es prêt pour regarder des vidéos avec t'es potes jusqu'à 3h du mat.", text2: "Le TogetherTube original est aimé pour son interface très simpliste, et sa rapidité pour lancer des vidéos. OpenTogetherTube vise à être tout aussi simple et à s'améliorer pour qu'il devienne encore meilleur au fil du temps.", - text3: "Actuellement, vous pouvez regarder des vidéos depuis : Youtube, Vimeo, Dailymotion, liens directs vers des vidéos .mp4, ...", + text3: "Actuellement, vous pouvez regarder des vidéos depuis : Youtube, Vimeo, liens directs vers des vidéos .mp4, ...", link: "d'autres sources arrivent bientôt", }, features: { @@ -173,7 +173,6 @@ export default { "platforms": { "youtube-videos": "Des vidéos Youtube: {url}", "vimeo-videos": "Des vidéos Vimeo: {url}", - "dailymotion-videos": "Des vidéos Dailymotion: {url}", "any-mp4-videos": "Toutes les vidéos .mp4 publiques: {url}", "youtube-playlists": "Les playlists Youtube: {url}", "youtube-channels": "Les chaînes Youtube: {url}", diff --git a/client/src/locales/ru.ts b/client/src/locales/ru.ts index d173f18a9..f142f3868 100644 --- a/client/src/locales/ru.ts +++ b/client/src/locales/ru.ts @@ -29,7 +29,7 @@ export default { name: "OpenTogetherTube", text1: " - платформа для синхронизированного просмотра видео в реальном времени.\nОна проста в использовании и не требует регистрации. Просто создайте комнату, добавьте видео и\nпригласите Ваших друзей. БУМ! Вы готовы смотреть видео со своими друзьями до 3 часов ночи.", text2: "Оригинальный TogetherTube был любим за его простой интерфейс,\nи за то, как легко было сразу начать просмотр.\nOpenTogetherTube стремится быть таким же простым, продолжая совершенствоваться.", - text3: "На данный момент Вы можете смотреть онлайн видео со своими друзьями с Youtube, Vimeo, Dailymotion, с прямых ссылок на видео в формате .mp4, и в ближайшее время их будет", + text3: "На данный момент Вы можете смотреть онлайн видео со своими друзьями с Youtube, Vimeo, с прямых ссылок на видео в формате .mp4, и в ближайшее время их будет", link: "ещё больше.", }, features: { @@ -186,7 +186,6 @@ export default { "platforms": { "youtube-videos": "YouTube видео: {url}", "vimeo-videos": "Vimeo видео: {url}", - "dailymotion-videos": "Dailymotion видео: {url}", "any-mp4-videos": "Общедоступные .mp4 видео: {url}", "youtube-playlists": "YouTube плейлисты: {url}", "youtube-channels": "YouTube каналы: {url}", diff --git a/common/constants.ts b/common/constants.ts index 08939fb83..19e02a2df 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -6,7 +6,6 @@ export const USERNAME_LENGTH_MAX = 48; export const ALL_VIDEO_SERVICES = [ "youtube", "vimeo", - "dailymotion", "direct", "hls", "dash", diff --git a/common/queueexport.ts b/common/queueexport.ts index 37ad300e5..4f518a584 100644 --- a/common/queueexport.ts +++ b/common/queueexport.ts @@ -10,8 +10,6 @@ export function buildUrlForQueueItem(item: QueueItem): string { return `https://youtu.be/${item.id}`; case "vimeo": return `https://vimeo.com/${item.id}`; - case "dailymotion": - return `https://dailymotion.com/video/${item.id}`; case "direct": return item.id; case "hls": diff --git a/server/infoextractor.ts b/server/infoextractor.ts index a44bddb34..a30840bba 100644 --- a/server/infoextractor.ts +++ b/server/infoextractor.ts @@ -1,6 +1,5 @@ import { URL } from "url"; import _ from "lodash"; -import DailyMotionAdapter from "./services/dailymotion"; import GoogleDriveAdapter from "./services/googledrive"; import VimeoAdapter from "./services/vimeo"; import YouTubeAdapter from "./services/youtube"; @@ -57,9 +56,6 @@ export async function initExtractor() { if (enabled.includes("vimeo")) { adapters.push(new VimeoAdapter()); } - if (enabled.includes("dailymotion")) { - adapters.push(new DailyMotionAdapter()); - } if (enabled.includes("googledrive")) { const apiKey = conf.get("info_extractor.google_drive.api_key"); if (!apiKey) { diff --git a/server/services/dailymotion.ts b/server/services/dailymotion.ts deleted file mode 100644 index c6f5f792e..000000000 --- a/server/services/dailymotion.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { URL } from "url"; -import axios from "axios"; -import { ServiceAdapter } from "../serviceadapter"; -import { InvalidVideoIdException } from "../exceptions"; -import { Video } from "ott-common/models/video"; - -export default class DailyMotionAdapter extends ServiceAdapter { - api = axios.create({ - baseURL: "https://api.dailymotion.com", - }); - - get serviceId(): "dailymotion" { - return "dailymotion"; - } - - get isCacheSafe(): boolean { - return false; - } - - canHandleURL(link: string): boolean { - const url = new URL(link); - - return ( - (url.host.endsWith("dailymotion.com") && - (url.pathname.startsWith("/video/") || url.pathname.startsWith("/embed/video/"))) || - (url.host.endsWith("dai.ly") && url.pathname.length > 1) - ); - } - - // eslint-disable-next-line @typescript-eslint/no-unused-vars - isCollectionURL(link: string): boolean { - return false; - } - - getVideoId(link: string): string { - const url = new URL(link); - return url.pathname.split("/").slice(-1)[0].trim(); - } - - async fetchVideoInfo(videoId: string): Promise