Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion websites/D/Disney+/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"url": "www.disneyplus.com",
"regExp": "^https?[:][/][/]([a-z0-9-]+[.])*(disneyplus|hotstar)[.]com[/]",
"version": "1.10.3",
"version": "1.11.0",
"logo": "https://cdn.rcd.gg/PreMiD/websites/D/Disney%2B/assets/logo.png",
"thumbnail": "https://cdn.rcd.gg/PreMiD/websites/D/Disney%2B/assets/thumbnail.png",
"color": "#233778",
Expand Down
27 changes: 14 additions & 13 deletions websites/D/Disney+/presence.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
import { ActivityType, Assets, getTimestamps, getTimestampsFromMedia, StatusDisplayType, timestampFromFormat } from 'premid'
import { ActivityType, Assets, getTimestamps, getTimestampsFromMedia, StatusDisplayType } from 'premid'

//* I think this is a browser bug because the custom element does not have any properties when accessing it directly...

let imageId: string | undefined
let title: string | undefined
let subtitle: string | undefined
let playheadPositionMs: number | undefined
let programDurationMs: number | undefined
window.addEventListener('message', (e) => {
if (e.data.type === 'pmd-receive-data')
({ imageId, title, subtitle } = e.data as { imageId?: string, title?: string, subtitle?: string })
({ imageId, title, subtitle, playheadPositionMs, programDurationMs } = e.data as { imageId?: string, title?: string, subtitle?: string, playheadPositionMs?: number, programDurationMs?: number })
})

const script = document.createElement('script')
script.textContent = `
setInterval(() => {
const metadata = document.querySelector("disney-web-player")?.mediaPlayer?.mediaPlaybackCriteria?.metadata;
const mediaPlayer = document.querySelector("disney-web-player")?.mediaPlayer;
const metadata = mediaPlayer?.mediaPlaybackCriteria?.metadata;
const images = metadata?.images_experience?.standard?.tile;
if (!images) return;
const timelineInfo = mediaPlayer?.timeline?.info;
const ratios = Object.keys(images);
const goal = 100;

const closest = ratios.reduce(function(prev, curr) {
return (Math.abs((100 / curr) - goal) < Math.abs((100 / prev) - goal) ? curr : prev);
});

window.postMessage({ type: "pmd-receive-data", imageId: images?.[closest]?.imageId, title: metadata?.title?.text, subtitle: metadata?.subtitle?.text }, "*");
window.postMessage({ type: "pmd-receive-data", imageId: images?.[closest]?.imageId, title: metadata?.title?.text, subtitle: metadata?.subtitle?.text, playheadPositionMs: timelineInfo?.playheadPositionMs, programDurationMs: timelineInfo?.programDurationMs }, "*");
}, 1000);
`
document.head.appendChild(script)
Expand Down Expand Up @@ -91,14 +95,11 @@ presence.on('UpdateData', async () => {
const { paused } = video

if (!paused) {
const allTime = document.querySelector('#app_body_content disney-web-player-ui progress-bar')?.shadowRoot?.querySelector('div[role="slider"]')?.getAttribute('aria-valuetext')?.split('of')[1]?.trim()
const remainingTime = document.querySelector('#app_body_content disney-web-player-ui time-remaining-indicator')?.shadowRoot?.querySelector('.time-remaining-indicator')?.textContent?.trim()
const timestamps = getTimestamps(
Number(timestampFromFormat(allTime ?? '') - timestampFromFormat(remainingTime ?? '')) ?? '00:00',
timestampFromFormat(allTime ?? '00:00'),
)
presenceData.startTimestamp = timestamps[0]
presenceData.endTimestamp = timestamps[1]
if (playheadPositionMs && programDurationMs) {
const timestamps = getTimestamps(playheadPositionMs / 1000, programDurationMs / 1000)
presenceData.startTimestamp = timestamps[0]
presenceData.endTimestamp = timestamps[1]
}
}
else {
presenceData.smallImageKey = Assets.Pause
Expand Down Expand Up @@ -299,5 +300,5 @@ presence.on('UpdateData', async () => {

if (presenceData.details)
presence.setActivity(presenceData)
else presence.setActivity()
else presence.clearActivity()
})
Loading