From bfc7a7613ce4f08df42ff7b9b3465b298b387cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Shadowsun=E2=84=A2?= Date: Tue, 22 Aug 2023 21:42:56 +0200 Subject: [PATCH] Revert "Use Github Pages instead of Cloudflare Pages" This reverts commit 465888b8a34bd052513a8ef578787694388fb1c4. --- .../cinema_modded/gamemode/modules/theater/cl_components.lua | 2 +- .../cinema_modded/gamemode/modules/theater/cl_init.lua | 2 +- .../gamemode/modules/theater/services/sh_soundcloud.lua | 2 +- .../gamemode/modules/theater/services/sh_youtube.lua | 2 +- .../cinema_modded/gamemode/modules/theater/sh_commands.lua | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_components.lua b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_components.lua index df3d8ff..9645dcb 100644 --- a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_components.lua +++ b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_components.lua @@ -57,7 +57,7 @@ hook.Add("PreVideoLoad", "ShowDependencyWarning", function(Video) if reason then if WarningSet then return true end - panel:OpenURL( GetConVar( "cinema_url" ):GetString() .. "screen/" ) -- Fallback to idle screen + panel:OpenURL( GetConVar( "cinema_url" ):GetString() ) -- Fallback to idle screen warning.Set( translations:Format("Dependency_Missing_Line1"), diff --git a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_init.lua b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_init.lua index 584974c..d22252b 100644 --- a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_init.lua +++ b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/cl_init.lua @@ -391,7 +391,7 @@ function LoadVideo( Video ) if not Video then return end - local theaterUrl = GetConVar( "cinema_url" ):GetString() .. "screen/" + local theaterUrl = GetConVar( "cinema_url" ):GetString() local panel = ActivePanel() if not IsValid( panel ) then diff --git a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_soundcloud.lua b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_soundcloud.lua index a42f578..8c74c17 100644 --- a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_soundcloud.lua +++ b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_soundcloud.lua @@ -23,7 +23,7 @@ function SERVICE:Match( url ) end if (CLIENT) then - local PLAYER_URL = GetConVar("cinema_url"):GetString() .. "screen/soundcloud.html?url=https://soundcloud.com/%s/%s" + local PLAYER_URL = GetConVar("cinema_url"):GetString() .. "soundcloud.html?url=https://soundcloud.com/%s/%s" function SERVICE:LoadProvider( Video, panel ) diff --git a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_youtube.lua b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_youtube.lua index a9b867a..f15d68d 100644 --- a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_youtube.lua +++ b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/services/sh_youtube.lua @@ -6,7 +6,7 @@ SERVICE.IsTimed = true SERVICE.Dependency = DEPENDENCY_PARTIAL local METADATA_URL = "https://www.youtube.com/watch?v=%s" -local THEATER_URL = GetConVar("cinema_url"):GetString() .. "screen/youtube.html?v=%s" +local THEATER_URL = GetConVar("cinema_url"):GetString() .. "youtube.html?v=%s" function SERVICE:Match( url ) return url.host and url.host:match("youtu.?be[.com]?") diff --git a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/sh_commands.lua b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/sh_commands.lua index 5fd80d6..b8acd55 100644 --- a/workshop/gamemodes/cinema_modded/gamemode/modules/theater/sh_commands.lua +++ b/workshop/gamemodes/cinema_modded/gamemode/modules/theater/sh_commands.lua @@ -1,4 +1,4 @@ -CreateConVar( "cinema_url", "https://purrcoding.github.io/cinema/", FCVAR_REPLICATED, "Cinema url to load on theater screens." ) +CreateConVar( "cinema_url", "https://gmod-cinema.pages.dev/cinema/", FCVAR_REPLICATED, "Cinema url to load on theater screens." ) CreateConVar( "cinema_queue_mode", 1, { FCVAR_ARCHIVE, FCVAR_DONTRECORD, FCVAR_REPLICATED }, "1 = Videos may be voted up or down\n2 = Videos are played in the order they're requested" ) if CLIENT then