Skip to content

Add support for hms timestamp in query string #6012

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

Merged
FreeTubeBot merged 2 commits into from
Oct 30, 2024
Merged

Add support for hms timestamp in query string #6012

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
711bfcc
Add support for hms timestamp in query string
ChunkyProgrammer Oct 29, 2024
eb760f4
undo change in index.js
ChunkyProgrammer Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,28 @@ function runApp() {
}

if (params.has('timestamp')) {
newParams.set('t', params.get('timestamp'))
let timestamp = params.get('timestamp')
if (timestamp && (timestamp.includes('h') || timestamp.includes('m') || timestamp.includes('s'))) {
if (timestamp && (timestamp.includes('h') || timestamp.includes('m') || timestamp.includes('s'))) {
const { seconds, minutes, hours } = timestamp.match(/(?:(?<hours>(\d+))h)?(?:(?<minutes>(\d+))m)?(?:(?<seconds>(\d+))s)?/).groups
let time = 0

if (seconds) {
time += Number(seconds)
}

if (minutes) {
time += 60 * Number(minutes)
}

if (hours) {
time += 3600 * Number(hours)
}

timestamp = time
}
}
newParams.set('t', timestamp)
hasParams = true
}

Expand Down
21 changes: 20 additions & 1 deletion src/renderer/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,26 @@ export function getVideoParamsFromUrl(url) {

function extractParams(videoId) {
paramsObject.videoId = videoId
paramsObject.timestamp = urlObject.searchParams.get('t')
let timestamp = urlObject.searchParams.get('t')
if (timestamp && (timestamp.includes('h') || timestamp.includes('m') || timestamp.includes('s'))) {
const { seconds, minutes, hours } = timestamp.match(/(?:(?<hours>(\d+))h)?(?:(?<minutes>(\d+))m)?(?:(?<seconds>(\d+))s)?/).groups
let time = 0

if (seconds) {
time += Number(seconds)
}

if (minutes) {
time += 60 * Number(minutes)
}

if (hours) {
time += 3600 * Number(hours)
}

timestamp = time
}
paramsObject.timestamp = timestamp
}

const extractors = [
Expand Down