Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

temporarily remove broken dailymotion support #1670

Merged
merged 1 commit into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/src/components/AddPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 0 additions & 10 deletions client/src/components/AddPreviewHelper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@
@link-click="setAddPreviewText"
/>
</li>
<li>
<ProcessedText
:text="
$t('add-preview.platforms.dailymotion-videos', {
url: 'https://dailymotion.com/video/x31i1so',
})
"
@link-click="setAddPreviewText"
/>
</li>
<li>
<ProcessedText
:text="
Expand Down
114 changes: 0 additions & 114 deletions client/src/components/players/DailymotionPlayer.vue

This file was deleted.

18 changes: 1 addition & 17 deletions client/src/components/players/OmniPlayer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@
@buffering="onBuffering"
@error="onError"
/>
<DailymotionPlayer
v-else-if="!!source && source.service == 'dailymotion'"
ref="player"
:video-id="source.id"
class="player"
@apiready="onApiReady"
@playing="onPlaying"
@paused="onPaused"
@ready="onReady"
@buffering="onBuffering"
@error="onError"
/>
<GoogleDrivePlayer
v-else-if="!!source && source.service == 'googledrive'"
ref="player"
Expand Down Expand Up @@ -148,7 +136,6 @@ const emit = defineEmits(["apiready", "playing", "paused", "ready", "buffering",

const YoutubePlayer = defineAsyncComponent(() => 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"));
Expand Down Expand Up @@ -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);
}
}
Expand Down
3 changes: 1 addition & 2 deletions client/src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
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.",

Check warning on line 33 in client/src/locales/de.ts

View check run for this annotation

Codecov / codecov/patch

client/src/locales/de.ts#L33

Added line #L33 was not covered by tests
link: "Unterstützung für weitere Plattformen ist geplant",
},
features: {
Expand Down Expand Up @@ -165,7 +165,6 @@
"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}",
Expand Down
3 changes: 1 addition & 2 deletions client/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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}",
Expand Down
3 changes: 1 addition & 2 deletions client/src/locales/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
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",

Check warning on line 45 in client/src/locales/es.ts

View check run for this annotation

Codecov / codecov/patch

client/src/locales/es.ts#L45

Added line #L45 was not covered by tests
link: "hay más en camino",
},
features: {
Expand Down Expand Up @@ -185,7 +185,6 @@
"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}",
Expand Down
3 changes: 1 addition & 2 deletions client/src/locales/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
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, ...",

Check warning on line 34 in client/src/locales/fr.ts

View check run for this annotation

Codecov / codecov/patch

client/src/locales/fr.ts#L34

Added line #L34 was not covered by tests
link: "d'autres sources arrivent bientôt",
},
features: {
Expand Down Expand Up @@ -173,7 +173,6 @@
"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}",
Expand Down
3 changes: 1 addition & 2 deletions client/src/locales/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
name: "OpenTogetherTube",
text1: " - платформа для синхронизированного просмотра видео в реальном времени.\nОна проста в использовании и не требует регистрации. Просто создайте комнату, добавьте видео и\nпригласите Ваших друзей. БУМ! Вы готовы смотреть видео со своими друзьями до 3 часов ночи.",
text2: "Оригинальный TogetherTube был любим за его простой интерфейс,\nи за то, как легко было сразу начать просмотр.\nOpenTogetherTube стремится быть таким же простым, продолжая совершенствоваться.",
text3: "На данный момент Вы можете смотреть онлайн видео со своими друзьями с Youtube, Vimeo, Dailymotion, с прямых ссылок на видео в формате .mp4, и в ближайшее время их будет",
text3: "На данный момент Вы можете смотреть онлайн видео со своими друзьями с Youtube, Vimeo, с прямых ссылок на видео в формате .mp4, и в ближайшее время их будет",

Check warning on line 32 in client/src/locales/ru.ts

View check run for this annotation

Codecov / codecov/patch

client/src/locales/ru.ts#L32

Added line #L32 was not covered by tests
link: "ещё больше.",
},
features: {
Expand Down Expand Up @@ -186,7 +186,6 @@
"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}",
Expand Down
1 change: 0 additions & 1 deletion common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export const USERNAME_LENGTH_MAX = 48;
export const ALL_VIDEO_SERVICES = [
"youtube",
"vimeo",
"dailymotion",
"direct",
"hls",
"dash",
Expand Down
2 changes: 0 additions & 2 deletions common/queueexport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
4 changes: 0 additions & 4 deletions server/infoextractor.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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) {
Expand Down
62 changes: 0 additions & 62 deletions server/services/dailymotion.ts

This file was deleted.

2 changes: 1 addition & 1 deletion server/storage/cachedvideo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function getVideoInfoFields(service?: string): (keyof VideoMetadata)[] {
continue;
}
// eslint-disable-next-line array-bracket-newline
if (["youtube", "vimeo", "dailymotion"].includes(service ?? "") && column === "mime") {
if (["youtube", "vimeo"].includes(service ?? "") && column === "mime") {
continue;
}
if (service === "googledrive" && column === "description") {
Expand Down
Loading
Loading