Skip to content

Refactor presence handling for video playback states #11182

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

Open
Andrey2077t wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor presence handling for video playback states #11182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 36 additions & 21 deletions websites/Y/YouTube Music/presence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,11 @@ const state = new PresenceState()
function attachVideoListeners(videoElement: HTMLMediaElement) {
if (state.videoListenerAttached)
return

const updateTimestamps = () => {
state.mediaTimestamps = updateSongTimestamps(state.dataGetter)
}

videoElement.addEventListener('seeked', updateTimestamps)
videoElement.addEventListener('play', updateTimestamps)

state.videoListenerAttached = true
}

Expand All @@ -44,7 +41,6 @@ presence.on('UpdateData', async () => {
const { pathname, search, href } = document.location
const settings = await getSettings(presence)
const strings = await presence.getStrings(stringMap)

const mediaData = state.dataGetter.getMediaData()
const watchID = state.dataGetter.getWatchId()
const repeatMode = state.dataGetter.getRepeatMode()
Expand All @@ -61,7 +57,19 @@ presence.on('UpdateData', async () => {
return presence.clearActivity()
}

let presenceData: PresenceData = {}
if (!videoElement) {
if (settings.showBrowsing) {
if (state.oldPath !== pathname) {
state.oldPath = pathname
state.startTimestamp = Math.floor(Date.now() / 1000)
}
return presence.setActivity(
createBrowsingPresence(pathname, search, href, state.startTimestamp, strings, settings.privacyMode),
)
}
state.prevTitleAuthor = ''
return presence.clearActivity()
}

if (['playing', 'paused'].includes(mediaData.playbackState)) {
if (settings.privacyMode) {
Expand All @@ -72,8 +80,9 @@ presence.on('UpdateData', async () => {
})
}

if (!mediaData.title || Number.isNaN(videoElement?.duration ?? Number.NaN)) {
return
if (!mediaData.title || Number.isNaN(videoElement.duration)) {
state.prevTitleAuthor = ''
return presence.clearActivity()
}

const currentTimeText = document
Expand All @@ -91,30 +100,36 @@ presence.on('UpdateData', async () => {
state.mediaTimestamps = updateSongTimestamps(state.dataGetter)

if (state.mediaTimestamps[0] === state.mediaTimestamps[1]) {
return
state.prevTitleAuthor = ''
return presence.clearActivity()
}

state.prevTitleAuthor = currentMediaIdentifier
}

presenceData = createListeningPresence(
mediaData,
state.dataGetter,
settings,
watchID,
repeatMode,
state.mediaTimestamps,
strings,
return presence.setActivity(
createListeningPresence(
mediaData,
state.dataGetter,
settings,
watchID,
repeatMode,
state.mediaTimestamps,
strings,
),
)
}
else if (settings.showBrowsing) {

state.prevTitleAuthor = ''

if (settings.showBrowsing) {
if (state.oldPath !== pathname) {
state.oldPath = pathname
state.startTimestamp = Math.floor(Date.now() / 1000)
}

presenceData = createBrowsingPresence(pathname, search, href, state.startTimestamp, strings, settings.privacyMode)
return presence.setActivity(
createBrowsingPresence(pathname, search, href, state.startTimestamp, strings, settings.privacyMode),
)
}

presence.setActivity(presenceData)
return presence.clearActivity()
})
Loading