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.

Sign up for GitHub

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

Jump to bottom

FIX: Allow to use %h%m%s for youtube t param #22299

Merged
merged 5 commits into from Jul 3, 2023
Merged

FIX: Allow to use %h%m%s for youtube t param #22299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b479f19
FIX: Allow to use `%h%m%s` for youtube `t` param
jancernik Jun 27, 2023
9db872d
Merge branch 'discourse:main' into lazy-videos-youtube-t-param
jancernik Jun 27, 2023
65704d8
Update plugins/discourse-lazy-videos/lib/lazy-videos/lazy_youtube.rb
jancernik Jun 28, 2023
bf104bd
Convert time to seconds for embed url
jancernik Jun 28, 2023
88d8962
toString
jancernik Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-iframe.js
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@ export default class LazyVideo extends Component {
switch (this.args.providerName) {
case "youtube":
let url = `https://www.youtube.com/embed/${this.args.videoId}?autoplay=1`;
if (this.args.startTime > 0) {
url += `&start=${this.args.startTime}`;
if (this.args.startTime) {
url += `&start=${this.convertToSeconds(this.args.startTime)}`;
}
return url;
case "vimeo":
Expand All @@ -17,4 +17,18 @@ export default class LazyVideo extends Component {
return `https://www.tiktok.com/embed/v2/${this.args.videoId}`;
}
}

convertToSeconds(time) {
const match = time.toString().match(/(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?/);
const [hours, minutes, seconds] = match.slice(1);

if (hours || minutes || seconds) {
const h = parseInt(hours, 10) || 0;
const m = parseInt(minutes, 10) || 0;
const s = parseInt(seconds, 10) || 0;

return h * 3600 + m * 60 + s;
}
return time;
}
}
2 changes: 1 addition & 1 deletion plugins/discourse-lazy-videos/assets/javascripts/lib/lazy-video-attributes.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ export default function getVideoAttributes(cooked) {
const thumbnail = img?.getAttribute("src");
const dominantColor = img?.dataset?.dominantColor;
const title = cooked.dataset.videoTitle;
const startTime = cooked.dataset.videoStartTime || 0;
const startTime = cooked.dataset.videoStartTime;
const providerName = cooked.dataset.providerName;
const id = cooked.dataset.videoId;

Expand Down
5 changes: 3 additions & 2 deletions plugins/discourse-lazy-videos/lib/lazy-videos/lazy_youtube.rb
View file
Open in desktop
Expand Up @@ -21,15 +21,16 @@ def to_html
end

escaped_title = ERB::Util.html_escape(video_title)
escaped_start_time = ERB::Util.html_escape(params["t"] || 0)
escaped_start_time = ERB::Util.html_escape(params["t"])
t_param = "&t=#{escaped_start_time}" if escaped_start_time.present?

<<~HTML
<div class="youtube-onebox lazy-video-container"
data-video-id="#{video_id}"
data-video-title="#{escaped_title}"
data-video-start-time="#{escaped_start_time}"
data-provider-name="youtube">
<a href="https://www.youtube.com/watch?v=#{video_id}" target="_blank">
<a href="https://www.youtube.com/watch?v=#{video_id}#{t_param}" target="_blank">
<img class="youtube-thumbnail"
src="#{thumbnail_url}"
title="#{escaped_title}">
Expand Down