diff --git a/assets/css/player.css b/assets/css/player.css index a821b85e..1d3c846c 100644 --- a/assets/css/player.css +++ b/assets/css/player.css @@ -264,21 +264,16 @@ video.video-js { } -.video-js div.channel-watermark-container { +.video-js div.channel-watermark { background-color: transparent !important; } -.channel-watermark-container { +.channel-watermark { margin: 0 35px; opacity: 0.7; transition: opacity .25s cubic-bezier(0,0,.2,1); } -.channel-watermark-container:hover { +.channel-watermark:hover { opacity: 1 } - -.channel-watermark { - width: 40px; - height: 40px; -} diff --git a/assets/js/player.js b/assets/js/player.js index 76ff2bd0..6085fe21 100644 --- a/assets/js/player.js +++ b/assets/js/player.js @@ -766,7 +766,7 @@ if (location.pathname.startsWith('/embed/')) { // Channel watermark if (video_data.watermark && video_data.preferences.show_channel_watermark) { - const watermark_html = ``; + const watermark_html = ``; player.overlay({ overlays: [ @@ -776,7 +776,7 @@ if (video_data.watermark && video_data.preferences.show_channel_watermark) { end: Math.round(parseInt(video_data.watermark.endTimeMs) / 1000), align: 'bottom-right', showBackground: false, - class: "channel-watermark-container" + class: "channel-watermark" }, ] }); diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr index e2d45c2c..95ea82f0 100644 --- a/src/invidious/videos/parser.cr +++ b/src/invidious/videos/parser.cr @@ -381,10 +381,14 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any # Channel watermark # Annotations is different from legacy annotations if watermark = player_response.dig?("annotations", 0, "playerAnnotationsExpandedRenderer", "featuredChannel") + watermark_thumbnail = watermark["watermark"]["thumbnails"][0] + watermark_data = { - "startTimeMs" => watermark["startTimeMs"], - "endTimeMs" => watermark["endTimeMs"], - "thumbnailUrl" => JSON::Any.new(URI.parse(watermark["watermark"]["thumbnails"][0]["url"].as_s).request_target), + "startTimeMs" => watermark["startTimeMs"], + "endTimeMs" => watermark["endTimeMs"], + "thumbnailWidth" => watermark_thumbnail["width"], + "thumbnailHeight" => watermark_thumbnail["height"], + "thumbnailUrl" => JSON::Any.new(URI.parse(watermark_thumbnail["url"].as_s).request_target), } else watermark_data = {} of String => JSON::Any