diff --git a/admin/package.json b/admin/package.json index 9812427..bc7ad9e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-admin", - "version": "1.7.14", + "version": "1.7.15", "private": true, "devDependencies": { "@ant-design/icons": "^4.2.2", diff --git a/app/package-lock.json b/app/package-lock.json index 80b60c3..45f2e81 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "watch-party-crx", - "version": "1.7.14", + "version": "1.7.15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/app/package.json b/app/package.json index 164dbe0..b6c74e1 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-crx", - "version": "1.7.14", + "version": "1.7.15", "private": true, "dependencies": {}, "scripts": { diff --git a/app/public/background.js b/app/public/background.js index cee4d28..01894dd 100644 --- a/app/public/background.js +++ b/app/public/background.js @@ -26,7 +26,7 @@ try { console.info("CHROME ENV"); } -const APP_VERSION = "1.7.14"; +const APP_VERSION = "1.7.15"; const firebaseConfig = { apiKey: "AIzaSyCJLuYpzXLDRmu2ttzFuSGmYcpFxqToWFU", diff --git a/app/public/manifest.json b/app/public/manifest.json index 349cf50..f0e29d9 100644 --- a/app/public/manifest.json +++ b/app/public/manifest.json @@ -1,7 +1,7 @@ { "name": "Watch Party", "short_name": "WP", - "version": "1.7.14", + "version": "1.7.15", "description": "Watch streamed content together.", "background": { "page": "background.html" diff --git a/app/src/App.js b/app/src/App.js index 653863a..809120b 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -32,7 +32,7 @@ import { } from "./Api"; import Tutorial from "./Tutorial"; -const APP_VERSION = "1.7.14"; +const APP_VERSION = "1.7.15"; const darkTheme = createMuiTheme({ palette: { diff --git a/app/src/VideoListener.js b/app/src/VideoListener.js index 4e71951..f41d357 100644 --- a/app/src/VideoListener.js +++ b/app/src/VideoListener.js @@ -234,14 +234,12 @@ export default class VideoListener { const nS = this.nameSelectors[this.video.source]; switch (this.video.source) { case PLAYER_SOURCE.NETFLIX: - var nshow = document.querySelector(nS.show).innerHTML || ""; - var nepisode = ""; - if (document.querySelectorAll(nS.episode)) { - document - .querySelectorAll(nS.episode) - .forEach((el) => (nepisode += el.innerHTML + " ")); - } - return nshow === "" && nepisode === "" ? null : nshow + "\n" + nepisode; + var n = document.querySelector(nS.show).childNodes; + var s = ""; + n.forEach((v) => { + s += (v.wholeText || v.innerText) + "\n"; + }); + return s; case PLAYER_SOURCE.DISNEY: this.video.element.parentElement.click(); await this.timeout(200); diff --git a/app/src/index.js b/app/src/index.js index 9ba41bb..d076018 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -24,14 +24,13 @@ const PartyWrapper = document.createElement("div"); PartyWrapper.id = "party_wrapper"; document.body.appendChild(PartyWrapper); -document.addEventListener( +window.addEventListener( "keydown", (ev) => { - if (ev.code === "KeyF") { - if (ev.target.tagName !== "INPUT" && ev.target.tagName !== "TEXTAREA") { - ev.stopImmediatePropagation(); - ev.stopPropagation(); - } + ev.stopImmediatePropagation(); + ev.stopPropagation(); + if (ev.target.tagName === "INPUT" || ev.target.tagName === "TEXTAREA") { + document.querySelector('.chat-message-box').dispatchEvent(ev); } }, { capture: true } @@ -50,20 +49,10 @@ head.appendChild(link); switch (getPlayerSource()) { case PLAYER_SOURCE.NETFLIX: document.body.classList.add("netflix"); + break; case PLAYER_SOURCE.HULU: - document.addEventListener( - "keydown", - (ev) => { - if (ev.target.tagName !== "INPUT" || ev.target.tagName !== "TEXTAREA") { - ev.stopImmediatePropagation(); - ev.stopPropagation(); - } else { - ev.target.focus(); - } - }, - { capture: true } - ); + document.body.classList.add("hulu"); break; case PLAYER_SOURCE.AMAZON: @@ -107,31 +96,11 @@ switch (getPlayerSource()) { }, { capture: true } ); - window.addEventListener( - "keydown", - (ev) => { - if (ev.target.tagName === "INPUT" || ev.target.tagName === "TEXTAREA") { - ev.target.focus(); - } - ev.stopImmediatePropagation(); - ev.stopPropagation(); - }, - { capture: true } - ); + break; case PLAYER_SOURCE.PEACOCK: document.body.classList.add("peacock"); - window.addEventListener( - "keydown", - (ev) => { - if (ev.target.tagName === "INPUT" || ev.target.tagName === "TEXTAREA") { - ev.target.focus(); - } - ev.stopImmediatePropagation(); - ev.stopPropagation(); - }, - { capture: true } - ); + break; case PLAYER_SOURCE.GOOGLEPLAY: document.body.classList.add("googleplay"); @@ -170,31 +139,8 @@ switch (getPlayerSource()) { break; case PLAYER_SOURCE.PARAMOUNTPLUS: document.body.classList.add("paramountplus"); - window.addEventListener( - "keydown", - (ev) => { - if (ev.target.tagName === "INPUT" || ev.target.tagName === "TEXTAREA") { - ev.target.focus(); - } - ev.stopImmediatePropagation(); - ev.stopPropagation(); - }, - { capture: true } - ); break; case PLAYER_SOURCE.STARZ: - document.addEventListener( - "keydown", - (ev) => { - if (ev.target.tagName !== "INPUT" || ev.target.tagName !== "TEXTAREA") { - ev.stopImmediatePropagation(); - ev.stopPropagation(); - } else { - ev.target.focus(); - } - }, - { capture: true } - ); document.body.classList.add("starz"); break; case PLAYER_SOURCE.LOCAL: diff --git a/functions/package.json b/functions/package.json index 6e8c0b1..bba5809 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-api", - "version": "1.7.14", + "version": "1.7.15", "description": "Cloud Functions for Watch Party", "scripts": { "lint": "eslint .", diff --git a/package.json b/package.json index 6b8e7a9..3dbf5a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "watch-party", - "version": "1.7.14", + "version": "1.7.15", "description": "Watch Party", "scripts": { "start": "firebase emulators:start", diff --git a/website/changes/index.html b/website/changes/index.html index 1073d37..457c9cf 100644 --- a/website/changes/index.html +++ b/website/changes/index.html @@ -286,6 +286,9 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. v1.7.14 + v1.7.15