diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | assets/js/player.js | 2 | ||||
| -rw-r--r-- | src/invidious.cr | 9 | ||||
| -rw-r--r-- | src/invidious/comments.cr | 2 | ||||
| -rw-r--r-- | src/invidious/helpers/handlers.cr | 26 | ||||
| -rw-r--r-- | src/invidious/helpers/utils.cr | 2 |
6 files changed, 12 insertions, 32 deletions
@@ -115,6 +115,9 @@ $ psql invidious kemal < /home/invidious/invidious/config/sql/users.sql $ psql invidious kemal < /home/invidious/invidious/config/sql/session_ids.sql $ psql invidious kemal < /home/invidious/invidious/config/sql/nonces.sql $ psql invidious kemal < /home/invidious/invidious/config/sql/annotations.sql +$ psql invidious kemal < /home/invidious/invidious/config/sql/privacy.sql +$ psql invidious kemal < /home/invidious/invidious/config/sql/playlists.sql +$ psql invidious kemal < /home/invidious/invidious/config/sql/playlist_videos.sql $ exit ``` diff --git a/assets/js/player.js b/assets/js/player.js index 79788b1e..eecc0868 100644 --- a/assets/js/player.js +++ b/assets/js/player.js @@ -35,7 +35,7 @@ var shareOptions = { title: player_data.title, description: player_data.description, image: player_data.thumbnail, - embedCode: "<iframe id='ivplayer' type='text/html' width='640' height='360' src='" + embed_url + "' style='border:none;'></iframe>" + embedCode: "<iframe id='ivplayer' width='640' height='360' src='" + embed_url + "' style='border:none;'></iframe>" } var player = videojs('player', options); diff --git a/src/invidious.cr b/src/invidious.cr index f5fe4b3d..d2ff2a3d 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -28,8 +28,11 @@ require "protodec/utils" require "./invidious/helpers/*" require "./invidious/*" -CONFIG = Config.from_yaml(File.read("config/config.yml")) -HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32) +ENV_CONFIG_NAME = "INVIDIOUS_CONFIG" + +CONFIG_STR = ENV.has_key?(ENV_CONFIG_NAME) ? ENV.fetch(ENV_CONFIG_NAME) : File.read("config/config.yml") +CONFIG = Config.from_yaml(CONFIG_STR) +HMAC_KEY = CONFIG.hmac_key || Random::Secure.hex(32) PG_URL = URI.new( scheme: "postgres", @@ -57,7 +60,7 @@ REQUEST_HEADERS_WHITELIST = {"accept", "accept-encoding", "cache-control", "con RESPONSE_HEADERS_BLACKLIST = {"access-control-allow-origin", "alt-svc", "server"} HTTP_CHUNK_SIZE = 10485760 # ~10MB -CURRENT_BRANCH = {{ "#{`git branch | sed -n '/\* /s///p'`.strip}" }} +CURRENT_BRANCH = {{ "#{`git branch | sed -n '/* /s///p'`.strip}" }} CURRENT_COMMIT = {{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit`.strip}" }} CURRENT_VERSION = {{ "#{`git describe --tags --abbrev=0`.strip}" }} diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr index 9e4d3866..2938247a 100644 --- a/src/invidious/comments.cr +++ b/src/invidious/comments.cr @@ -347,7 +347,7 @@ def template_youtube_comments(comments, locale, thin_mode) END_HTML else html << <<-END_HTML - <iframe id='ivplayer' type='text/html' style='position:absolute;width:100%;height:100%;left:0;top:0' src='/embed/#{attachment["videoId"]?}?autoplay=0' style='border:none;'></iframe> + <iframe id='ivplayer' style='position:absolute;width:100%;height:100%;left:0;top:0' src='/embed/#{attachment["videoId"]?}?autoplay=0' style='border:none;'></iframe> END_HTML end diff --git a/src/invidious/helpers/handlers.cr b/src/invidious/helpers/handlers.cr index 456618cf..87b10bc9 100644 --- a/src/invidious/helpers/handlers.cr +++ b/src/invidious/helpers/handlers.cr @@ -212,29 +212,3 @@ class DenyFrame < Kemal::Handler call_next env end end - -# Temp fixes for https://github.com/crystal-lang/crystal/issues/7383 -class HTTP::UnknownLengthContent - def read_byte - ensure_send_continue - if @io.is_a?(OpenSSL::SSL::Socket::Client) - return if @io.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty? - end - @io.read_byte - end -end - -class HTTP::Client - private def handle_response(response) - if @socket.is_a?(OpenSSL::SSL::Socket::Client) && @host.ends_with?("googlevideo.com") - close unless response.keep_alive? || @socket.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty? - - if @socket.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty? - @socket = nil - end - else - close unless response.keep_alive? - end - response - end -end diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr index 6fcfa8d2..e43ae71d 100644 --- a/src/invidious/helpers/utils.cr +++ b/src/invidious/helpers/utils.cr @@ -315,7 +315,7 @@ def get_referer(env, fallback = "/", unroll = true) end referer = referer.full_path - referer = "/" + referer.lstrip("\/\\") + referer = "/" + referer.lstrip("/\\") if referer == env.request.path referer = fallback |