From ae4ee362608e99410eb8632d20d7eaf0d556ed60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Thu, 5 Aug 2021 17:12:53 +0200 Subject: [PATCH] Use HTTPS --- README.md | 4 ++-- addon.txt | 4 ++-- html/app/request.html | 12 ++++++------ html/app/vimeo.html | 2 +- html/package.json | 2 +- lua/mediaplayer/config/client.lua | 4 ++-- lua/mediaplayer/controls/dhtmlcontrols.lua | 2 +- lua/mediaplayer/services/audiofile/cl_init.lua | 2 +- lua/mediaplayer/services/googledrive/init.lua | 2 +- lua/mediaplayer/services/soundcloud/init.lua | 6 +++--- lua/mediaplayer/services/twitch/cl_init.lua | 2 +- lua/mediaplayer/services/twitchstream/cl_init.lua | 2 +- lua/mediaplayer/services/vimeo/init.lua | 2 +- lua/mediaplayer/services/vimeo/shared.lua | 2 +- lua/mediaplayer/services/youtube/init.lua | 2 +- lua/mediaplayer/services/youtube/shared.lua | 8 ++++---- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index b2788984..b760b1c7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Media Player ============ -![Preview](http://images.akamai.steamusercontent.com/ugc/403430334757512796/4EFCE2D358BCAF42389E36B62CB11E9849842E07/) +![Preview](https://images.akamai.steamusercontent.com/ugc/403430334757512796/4EFCE2D358BCAF42389E36B62CB11E9849842E07/) Media Player is an addon for Garry's Mod which features several media streaming services able to be played synchronously in multiplayer. @@ -11,4 +11,4 @@ Place the contents of this GitHub repository into a new addon folder within your If you'd only like to use the addon and not modify the source code, you can subscribe to the item on Steam Workshop: -[![Steam Workshop](http://www.pixeltailgames.com/elevator/images/workshop_button.png)](http://steamcommunity.com/sharedfiles/filedetails/?id=546392647) +[![Steam Workshop](https://www.pixeltailgames.com/elevator/images/workshop_button.png)](https://steamcommunity.com/sharedfiles/filedetails/?id=546392647) diff --git a/addon.txt b/addon.txt index 4ba5652f..a6762b29 100644 --- a/addon.txt +++ b/addon.txt @@ -4,7 +4,7 @@ "version" "1.0.0" "author_name" "Samuel Maddock" "author_email" "sam@samuelmaddock.com" - "author_url" "http://samuelmaddock.com" - "info" "http://github.com/samuelmaddock/gm-mediaplayer" + "author_url" "https://samuelmaddock.com" + "info" "https://github.com/samuelmaddock/gm-mediaplayer" "override" "0" } diff --git a/html/app/request.html b/html/app/request.html index 54bd3353..996e358d 100644 --- a/html/app/request.html +++ b/html/app/request.html @@ -23,28 +23,28 @@

Share media from one of the selected services

    SHOUTcast Share media from one of the selected services onmouseover="hoverService();">  Videos 1 and volume/100 or volume diff --git a/lua/mediaplayer/services/googledrive/init.lua b/lua/mediaplayer/services/googledrive/init.lua index db01aef6..f5aadcee 100644 --- a/lua/mediaplayer/services/googledrive/init.lua +++ b/lua/mediaplayer/services/googledrive/init.lua @@ -5,7 +5,7 @@ local TableLookup = MediaPlayerUtils.TableLookup -- TODO: -- https://video.google.com/get_player?wmode=opaque&ps=docs&partnerid=30&docid=0B9Kudw3An4Hnci1VZ0pwcHhJc00&enablejsapi=1 --- http://stackoverflow.com/questions/17779197/google-drive-embed-no-iframe +-- https://stackoverflow.com/questions/17779197/google-drive-embed-no-iframe -- https://developers.google.com/drive/v2/reference/files/get local APIKey = MediaPlayer.GetConfigValue('google.api_key') diff --git a/lua/mediaplayer/services/soundcloud/init.lua b/lua/mediaplayer/services/soundcloud/init.lua index a110e2df..9497208b 100644 --- a/lua/mediaplayer/services/soundcloud/init.lua +++ b/lua/mediaplayer/services/soundcloud/init.lua @@ -5,9 +5,9 @@ local urllib = url local ClientId = MediaPlayer.GetConfigValue('soundcloud.client_id') --- http://developers.soundcloud.com/docs/api/reference +-- https://developers.soundcloud.com/docs/api/reference local MetadataUrl = { - resolve = "http://api.soundcloud.com/resolve.json?url=%s&client_id=" .. ClientId, + resolve = "https://api.soundcloud.com/resolve.json?url=%s&client_id=" .. ClientId, tracks = "" } @@ -36,7 +36,7 @@ local function OnReceiveMetadata( self, callback, body ) thumbnail = string.Replace( thumbnail, 'large', 't500x500' ) end - -- http://developers.soundcloud.com/docs/api/reference#tracks + -- https://developers.soundcloud.com/docs/api/reference#tracks local metadata = {} metadata.title = (resp.title or "[Unknown title]") .. " - " .. artist metadata.duration = math.ceil(tonumber(resp.duration) / 1000) -- responds in ms diff --git a/lua/mediaplayer/services/twitch/cl_init.lua b/lua/mediaplayer/services/twitch/cl_init.lua index 926c6d8a..d24338f7 100644 --- a/lua/mediaplayer/services/twitch/cl_init.lua +++ b/lua/mediaplayer/services/twitch/cl_init.lua @@ -2,7 +2,7 @@ include "shared.lua" DEFINE_BASECLASS( "mp_service_browser" ) -local TwitchUrl = "http://www.twitch.tv/%s/%s/%s/popout" +local TwitchUrl = "https://www.twitch.tv/%s/%s/%s/popout" --- -- Approximate amount of time it takes for the Twitch video player to load upon diff --git a/lua/mediaplayer/services/twitchstream/cl_init.lua b/lua/mediaplayer/services/twitchstream/cl_init.lua index cb7e5d1a..c1cdab6d 100644 --- a/lua/mediaplayer/services/twitchstream/cl_init.lua +++ b/lua/mediaplayer/services/twitchstream/cl_init.lua @@ -4,7 +4,7 @@ local htmlBaseUrl = MediaPlayer.GetConfigValue('html.base_url') DEFINE_BASECLASS( "mp_service_browser" ) -local TwitchUrl = "http://www.twitch.tv/%s/popout" +local TwitchUrl = "https://www.twitch.tv/%s/popout" local JS_Play = "if(window.MediaPlayer) MediaPlayer.play();" local JS_Pause = "if(window.MediaPlayer) MediaPlayer.pause();" diff --git a/lua/mediaplayer/services/vimeo/init.lua b/lua/mediaplayer/services/vimeo/init.lua index 16819368..1c92671f 100644 --- a/lua/mediaplayer/services/vimeo/init.lua +++ b/lua/mediaplayer/services/vimeo/init.lua @@ -1,7 +1,7 @@ AddCSLuaFile "shared.lua" include "shared.lua" -local MetadataUrl = "http://vimeo.com/api/v2/video/%s.json" +local MetadataUrl = "https://vimeo.com/api/v2/video/%s.json" local function OnReceiveMetadata( self, callback, body ) diff --git a/lua/mediaplayer/services/vimeo/shared.lua b/lua/mediaplayer/services/vimeo/shared.lua index 9d51855f..1898223a 100644 --- a/lua/mediaplayer/services/vimeo/shared.lua +++ b/lua/mediaplayer/services/vimeo/shared.lua @@ -26,7 +26,7 @@ function SERVICE:GetVimeoVideoId() local url = self.urlinfo - -- http://www.vimeo.com/(videoId) + -- https://www.vimeo.com/(videoId) videoId = string.match(url.path, "^/(%d+)") self.videoId = videoId diff --git a/lua/mediaplayer/services/youtube/init.lua b/lua/mediaplayer/services/youtube/init.lua index 7662f53f..899b44c7 100644 --- a/lua/mediaplayer/services/youtube/init.lua +++ b/lua/mediaplayer/services/youtube/init.lua @@ -7,7 +7,7 @@ local TableLookup = MediaPlayerUtils.TableLookup -- Helper function for converting ISO 8601 time strings; this is the formatting -- used for duration specified in the YouTube v3 API. -- --- http://stackoverflow.com/a/22149575/1490006 +-- https://stackoverflow.com/a/22149575/1490006 -- local function convertISO8601Time( duration ) local a = {} diff --git a/lua/mediaplayer/services/youtube/shared.lua b/lua/mediaplayer/services/youtube/shared.lua index 6cdb0597..e1db0309 100644 --- a/lua/mediaplayer/services/youtube/shared.lua +++ b/lua/mediaplayer/services/youtube/shared.lua @@ -50,19 +50,19 @@ function SERVICE:GetYouTubeVideoId() local url = self.urlinfo - -- http://www.youtube.com/watch?v=(videoId) + -- https://www.youtube.com/watch?v=(videoId) if url.query and url.query.v then videoId = url.query.v - -- http://www.youtube.com/v/(videoId) + -- https://www.youtube.com/v/(videoId) elseif url.path and string.match(url.path, "^/v/([%a%d-_]+)") then videoId = string.match(url.path, "^/v/([%a%d-_]+)") - -- http://youtube.googleapis.com/v/(videoId) + -- https://youtube.googleapis.com/v/(videoId) elseif url.path and string.match(url.path, "^/v/([%a%d-_]+)") then videoId = string.match(url.path, "^/v/([%a%d-_]+)") - -- http://youtu.be/(videoId) + -- https://youtu.be/(videoId) elseif string.match(url.host, "youtu.be") and url.path and string.match(url.path, "^/([%a%d-_]+)$") and ( (not url.query) or #url.query == 0 ) then -- short url