From 13013c06601dd6a6eb2645b2fae7b18d0fdbf545 Mon Sep 17 00:00:00 2001 From: Ayushya Amitabh Date: Tue, 29 Mar 2022 23:09:52 -0400 Subject: [PATCH] v1.7.17/release --- admin/package.json | 2 +- app/package.json | 2 +- app/public/background.html | 2 +- app/public/background.js | 4 +- app/public/index.html | 2 +- app/public/manifest.json | 2 +- app/public/popup.html | 2 +- app/public/popup.js | 2 +- app/src/Api.js | 2 +- app/src/App.js | 4 +- app/src/CallManager.js | 2 +- app/src/Chat.js | 34 ++- app/src/Create.js | 2 +- app/src/Inactive.js | 2 +- app/src/Loading.js | 2 +- app/src/Thread.css | 2 +- app/src/Thread.js | 2 +- app/src/VideoListener.js | 92 +------ app/src/index.css | 7 +- app/src/index.js | 2 +- functions/package.json | 2 +- package.json | 2 +- website/404.html | 4 +- website/changes/index.html | 7 +- website/changes/v1.5.2/index.html | 4 +- website/changes/v1.6.0/index.html | 4 +- website/changes/v1.6.1/index.html | 4 +- website/changes/v1.6.2/index.html | 4 +- website/changes/v1.6.3/index.html | 4 +- website/changes/v1.6.4/index.html | 4 +- website/changes/v1.6.5/index.html | 4 +- website/changes/v1.6.6/index.html | 4 +- website/changes/v1.6.7/index.html | 4 +- website/changes/v1.7.0/index.html | 4 +- website/changes/v1.7.1/index.html | 4 +- website/changes/v1.7.10/index.html | 4 +- website/changes/v1.7.11/index.html | 4 +- website/changes/v1.7.12/index.html | 4 +- website/changes/v1.7.13/index.html | 4 +- website/changes/v1.7.14/index.html | 4 +- website/changes/v1.7.15/index.html | 4 +- website/changes/v1.7.16/index.html | 4 +- website/changes/v1.7.17/index.html | 373 +++++++++++++++++++++++++++++ website/changes/v1.7.2/index.html | 4 +- website/changes/v1.7.3/index.html | 4 +- website/changes/v1.7.4/index.html | 4 +- website/changes/v1.7.5/index.html | 4 +- website/changes/v1.7.6/index.html | 4 +- website/changes/v1.7.7/index.html | 4 +- website/changes/v1.7.8/index.html | 4 +- website/changes/v1.7.9/index.html | 4 +- website/copyright/index.html | 6 +- website/donate/index.html | 4 +- website/donate/thanks.html | 4 +- website/index.html | 4 +- website/privacy/index.html | 4 +- website/referrer/index.html | 4 +- website/styles/extralarge.css | 2 +- website/styles/extrasmall.css | 2 +- website/styles/large.css | 2 +- website/styles/medium.css | 2 +- website/styles/small.css | 2 +- website/styles/variables-dark.css | 2 +- website/styles/variables.css | 2 +- website/welcome/index.html | 4 +- 65 files changed, 526 insertions(+), 181 deletions(-) create mode 100644 website/changes/v1.7.17/index.html diff --git a/admin/package.json b/admin/package.json index 61563e4..eb3bcea 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-admin", - "version": "1.7.16", + "version": "1.7.17", "private": true, "devDependencies": { "@ant-design/icons": "^4.2.2", diff --git a/app/package.json b/app/package.json index 6148a47..0bbb21a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-crx", - "version": "1.7.16", + "version": "1.7.17", "private": true, "dependencies": {}, "scripts": { diff --git a/app/public/background.html b/app/public/background.html index 35c01c5..1dcca92 100644 --- a/app/public/background.html +++ b/app/public/background.html @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/public/background.js b/app/public/background.js index aaeb47d..0f63886 100644 --- a/app/public/background.js +++ b/app/public/background.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -26,7 +26,7 @@ try { console.info("CHROME ENV"); } -const APP_VERSION = "1.7.16"; +const APP_VERSION = "1.7.17"; const firebaseConfig = { apiKey: "AIzaSyCJLuYpzXLDRmu2ttzFuSGmYcpFxqToWFU", diff --git a/app/public/index.html b/app/public/index.html index 325a73e..f6867c6 100644 --- a/app/public/index.html +++ b/app/public/index.html @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/public/manifest.json b/app/public/manifest.json index 34a1a2e..bec5ff0 100644 --- a/app/public/manifest.json +++ b/app/public/manifest.json @@ -1,7 +1,7 @@ { "name": "Watch Party", "short_name": "WP", - "version": "1.7.16", + "version": "1.7.17", "description": "Watch streamed content together.", "background": { "page": "background.html" diff --git a/app/public/popup.html b/app/public/popup.html index 4d9ca70..3585c78 100644 --- a/app/public/popup.html +++ b/app/public/popup.html @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/public/popup.js b/app/public/popup.js index ab27e37..5120b4c 100644 --- a/app/public/popup.js +++ b/app/public/popup.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Api.js b/app/src/Api.js index 52ef8f6..ab17636 100644 --- a/app/src/Api.js +++ b/app/src/Api.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/App.js b/app/src/App.js index c58157d..008ca0b 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -32,7 +32,7 @@ import { } from "./Api"; import Tutorial from "./Tutorial"; -const APP_VERSION = "1.7.16"; +const APP_VERSION = "1.7.17"; const darkTheme = createMuiTheme({ palette: { diff --git a/app/src/CallManager.js b/app/src/CallManager.js index d6624cb..d68afb1 100644 --- a/app/src/CallManager.js +++ b/app/src/CallManager.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Chat.js b/app/src/Chat.js index 89f5098..b2b5ee6 100644 --- a/app/src/Chat.js +++ b/app/src/Chat.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -123,6 +123,7 @@ export default class Chat extends Component { videoInputs: [], selectedVideoInput: "", minimized: false, + hideVideoContainer: LocalData().hideVideoContainer || false, }; this.port = null; this.gifClick = this.gifClick.bind(this); @@ -152,6 +153,7 @@ export default class Chat extends Component { this.callEventListener, this.props.notify ); + this.updateHideVideoContainer = this.updateHideVideoContainer.bind(this); } componentDidMount() { // EVENT CAPTURE FOR ENTER TO SEND @@ -256,6 +258,7 @@ export default class Chat extends Component { // DONE WITH MOUNTING TASKS this.props.updateLoading(false); + this.updateHideVideoContainer(); setInterval(() => { if ( @@ -577,6 +580,12 @@ export default class Chat extends Component { const { usingVideo } = this.state; this.mCallManager.toggleVideo(!usingVideo); } + updateHideVideoContainer() { + const hideVideoContainer = !this.state.hideVideoContainer; + document.documentElement.style.setProperty('--video-container-pos', hideVideoContainer ? 'relative' : 'fixed'); + updateLocalData({ hideVideoContainer }); + this.setState({ hideVideoContainer }); + } render() { const { admin, @@ -605,6 +614,7 @@ export default class Chat extends Component { videoInputs, selectedVideoInput, minimized, + hideVideoContainer } = this.state; const { status } = this.props; const { callEnabled } = status; @@ -820,6 +830,28 @@ export default class Chat extends Component { } labelPlacement="end" /> + + } + label={ + + Hide Video Container when sidebar is collapsed +
+ + {hideVideoContainer + ? "Video containers will be hidden" + : "Video containers will be shown"} + + + } + labelPlacement="end" + /> , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Inactive.js b/app/src/Inactive.js index 159345e..99febb5 100644 --- a/app/src/Inactive.js +++ b/app/src/Inactive.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Loading.js b/app/src/Loading.js index 9863512..7fdbd78 100644 --- a/app/src/Loading.js +++ b/app/src/Loading.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Thread.css b/app/src/Thread.css index d6a33c9..d7ac1eb 100644 --- a/app/src/Thread.css +++ b/app/src/Thread.css @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/Thread.js b/app/src/Thread.js index b29fc5e..d5cb396 100644 --- a/app/src/Thread.js +++ b/app/src/Thread.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/app/src/VideoListener.js b/app/src/VideoListener.js index f41d357..8e78507 100644 --- a/app/src/VideoListener.js +++ b/app/src/VideoListener.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -85,7 +85,6 @@ export default class VideoListener { // REMOVE LISTENER BEFORE SYNCING switch (this.video.source) { case PLAYER_SOURCE.CRUNCHYROLL: - case PLAYER_SOURCE.FUNIMATION: case PLAYER_SOURCE.STARZ: window.removeEventListener("watchParty", this.crunchyRollListener); break; @@ -144,7 +143,6 @@ export default class VideoListener { await this.timeout(500); break; case PLAYER_SOURCE.CRUNCHYROLL: - case PLAYER_SOURCE.FUNIMATION: case PLAYER_SOURCE.ROOSTERTEETH: case PLAYER_SOURCE.STARZ: window.postMessage( @@ -163,7 +161,6 @@ export default class VideoListener { // TOGGLE PLAYER STATUS if ( PLAYER_SOURCE.CRUNCHYROLL === this.video.source || - PLAYER_SOURCE.FUNIMATION === this.video.source || PLAYER_SOURCE.ROOSTERTEETH === this.video.source || PLAYER_SOURCE.STARZ === this.video.source ) { @@ -211,7 +208,6 @@ export default class VideoListener { // RE-ADD LISTENERS FOR FUTURE SYNC switch (this.video.source) { case PLAYER_SOURCE.CRUNCHYROLL: - case PLAYER_SOURCE.FUNIMATION: case PLAYER_SOURCE.STARZ: window.addEventListener("watchParty", this.crunchyRollListener); break; @@ -234,7 +230,7 @@ export default class VideoListener { const nS = this.nameSelectors[this.video.source]; switch (this.video.source) { case PLAYER_SOURCE.NETFLIX: - var n = document.querySelector(nS.show).childNodes; + var n = document.querySelector(nS.show).childNodes || []; var s = ""; n.forEach((v) => { s += (v.wholeText || v.innerText) + "\n"; @@ -250,6 +246,16 @@ export default class VideoListener { ? document.querySelector(nS.episode).innerHTML : ""; return dshow === "" && depisode === "" ? null : dshow + "\n" + depisode; + case PLAYER_SOURCE.FUNIMATION: + try { + const element = window.location.pathname.replaceAll('/v/', '').split('/').map(v => v.split('-').map(w => w[0].toUpperCase() + w.substring(1)).join(' ')); + console.log(element); + const show = element[0] || ''; + const episode = element[1] || ''; + return show === "" && episode === "" ? null : show + "\n" + episode; + } catch (err) { + return null; + } case PLAYER_SOURCE.APPLE: const appleTvPlayer = document.querySelector("apple-tv-plus-player"); if (appleTvPlayer) { @@ -344,7 +350,6 @@ export default class VideoListener { }); switch (this.video.source) { case PLAYER_SOURCE.CRUNCHYROLL: - case PLAYER_SOURCE.FUNIMATION: case PLAYER_SOURCE.STARZ: window.postMessage( JSON.stringify({ @@ -440,61 +445,6 @@ export default class VideoListener { }, 1000); break; case PLAYER_SOURCE.CRUNCHYROLL: - var sendToWatchPartyApp = function (pS, pT) { - var customWatchPartyEvent = new CustomEvent("watchParty", { - detail: { - watchPartyDirection: "TO_APP", - type: "WATCH_PARTY_PLAYER_UPDATE", - status: pS, - time: pT, - }, - }); - window.dispatchEvent(customWatchPartyEvent); - }, - watchPartyGetTimeAndSend = function (pS) { - if (window.VILOS_PLAYERJS) { - window.VILOS_PLAYERJS.getCurrentTime(function (pT) { - sendToWatchPartyApp(pS, pT); - }); - } - }, - watchPartySendPlaying = function () { - watchPartyGetTimeAndSend("PLAYING"); - }, - watchPartySendPaused = function () { - watchPartyGetTimeAndSend("PAUSED"); - }, - watchPartyInteraction = function (e) { - if (e.source === window) { - const data = JSON.parse(e.data); - if (data.watchPartyDirection === "TO_SCRIPT") { - if (data.type === "WATCH_PARTY_ADD_LISTENERS") { - if (window.VILOS_PLAYERJS) { - window.VILOS_PLAYERJS.on( - "play", - watchPartySendPlaying, - "player.js" - ); - window.VILOS_PLAYERJS.on( - "pause", - watchPartySendPaused, - "player.js" - ); - } - } else if (data.type === "WATCH_PARTY_SEEK") { - if (window.VILOS_PLAYERJS) { - window.VILOS_PLAYERJS.setCurrentTime(data.time); - } - } else if (data.type === "WATCH_PARTY_STATUS") { - if (window.VILOS_PLAYERJS) { - if (data.status === "PAUSED") window.VILOS_PLAYERJS.pause(); - if (data.status === "PLAYING") window.VILOS_PLAYERJS.play(); - } - } - } - } - }; - window.addEventListener("message", watchPartyInteraction); const crunchyRollInject = `var sendToWatchPartyApp = function(pS, pT) { var customWatchPartyEvent = new CustomEvent('watchParty', { detail: { watchPartyDirection: 'TO_APP', type: 'WATCH_PARTY_PLAYER_UPDATE', status: pS, time: pT } }); window.dispatchEvent(customWatchPartyEvent); }, watchPartyGetTimeAndSend = function(pS) { if (window.VILOS_PLAYERJS) { window.VILOS_PLAYERJS.getCurrentTime(function(pT) { sendToWatchPartyApp(pS, pT); }); } }, watchPartySendPlaying = function() { watchPartyGetTimeAndSend('PLAYING'); }, watchPartySendPaused = function() { watchPartyGetTimeAndSend('PAUSED'); }, watchPartyInteraction = function(e) { if (e.source === window) { const data = JSON.parse(e.data); if (data.watchPartyDirection === 'TO_SCRIPT') { if (data.type === 'WATCH_PARTY_ADD_LISTENERS') { if (window.VILOS_PLAYERJS) { window.VILOS_PLAYERJS.on('play', watchPartySendPlaying, 'player.js'); window.VILOS_PLAYERJS.on('pause', watchPartySendPaused, 'player.js'); } } else if (data.type === 'WATCH_PARTY_SEEK') { if (window.VILOS_PLAYERJS) { window.VILOS_PLAYERJS.setCurrentTime(data.time); } } else if (data.type === 'WATCH_PARTY_STATUS') { if (window.VILOS_PLAYERJS) { if (data.status === 'PAUSED') window.VILOS_PLAYERJS.pause(); if (data.status === 'PLAYING') window.VILOS_PLAYERJS.play(); } } } } }; window.addEventListener("message", watchPartyInteraction);`; const crunchyRollInjectScript = document.createElement("script"); crunchyRollInjectScript.text = crunchyRollInject; @@ -544,22 +494,6 @@ export default class VideoListener { } }, 1000); break; - case PLAYER_SOURCE.FUNIMATION: - const funimationInject = `var sendToWatchPartyApp=function(pS,pT){var customWatchPartyEvent=new CustomEvent('watchParty',{detail:{watchPartyDirection:'TO_APP',type:'WATCH_PARTY_PLAYER_UPDATE',status:pS,time:pT}});window.dispatchEvent(customWatchPartyEvent)},watchPartyGetTimeAndSend=function(pS){const playerIframe=document.querySelector('${vS}');if(playerIframe){const player=playerIframe.contentWindow.document.querySelector('video');if(player){sendToWatchPartyApp(pS,player.currentTime)}}},watchPartySendPlaying=function(){watchPartyGetTimeAndSend('PLAYING')},watchPartySendPaused=function(){watchPartyGetTimeAndSend('PAUSED')},watchPartyAddListeners=function(){const playerIframe=document.querySelector('${vS}');if(playerIframe){const player=playerIframe.contentWindow.document.querySelector('video');if(player&&player.currentTime>0&&player.paused===false&&player.ended===false){player.parentNode.player.on('playing',watchPartySendPlaying);player.parentNode.player.on('pause',watchPartySendPaused);clearInterval(watchPartyAddListeners)}}},watchPartyInteraction=function(e){const data=JSON.parse(e.data);const playerIframe=document.querySelector('${vS}');if(playerIframe){const player=playerIframe.contentWindow.document.querySelector('video');if(player){if(data.watchPartyDirection==='TO_SCRIPT'){if(data.type==='WATCH_PARTY_ADD_LISTENERS'){player.addEventListener('playing',watchPartySendPlaying);player.addEventListener('pause',watchPartySendPaused)}else if(data.type==='WATCH_PARTY_SEEK'){const playerNode=playerIframe.contentWindow.document.querySelector('#brightcove-player');if(playerNode){playerNode.player.currentTime(data.time)}}else if(data.type==='WATCH_PARTY_STATUS'){if(data.status==='PAUSED')player.pause();if(data.status==='PLAYING')player.play()}}}else{setInterval(watchPartyAddListeners,1000)}}else{setInterval(watchPartyAddListeners,1000)}};window.addEventListener("message",watchPartyInteraction);`; - const funimationInjectScript = document.createElement("script"); - funimationInjectScript.text = funimationInject; - document.head.appendChild(funimationInjectScript); - setInterval(() => { - const fif = document.querySelector(vS); - if ( - fif !== null && - fif !== undefined && - (this.video.element !== fif || this.video.element === null) - ) { - this.firstTimeSync(fif); - } - }, 1000); - break; case PLAYER_SOURCE.ROOSTERTEETH: const roosterTeethInject = `var watchPartyInteraction=function(e){const data=JSON.parse(e.data);const player=document.querySelector('${vS}');if(player){const playerNode=player.parentNode;if(playerNode.player){if(data.watchPartyDirection==='TO_SCRIPT'){if(data.type==='WATCH_PARTY_SEEK'){playerNode.player.currentTime(data.time);}else if(data.type==='WATCH_PARTY_STATUS'){if(data.status==='PAUSED')player.pause();if(data.status==='PLAYING')player.play()}}}}};window.addEventListener("message",watchPartyInteraction);`; const roosterTeethInjectScript = document.createElement("script"); @@ -601,6 +535,7 @@ export default class VideoListener { case PLAYER_SOURCE.DAILYMOTION: case PLAYER_SOURCE.PARAMOUNTPLUS: case PLAYER_SOURCE.YOUTUBETV: + case PLAYER_SOURCE.FUNIMATION: setInterval(() => { var newVideoElement = document.querySelector(vS); if ( @@ -620,7 +555,6 @@ export default class VideoListener { end() { switch (this.video.source) { case PLAYER_SOURCE.CRUNCHYROLL: - case PLAYER_SOURCE.FUNIMATION: window.removeEventListener("watchParty", this.crunchyRollListener); break; default: diff --git a/app/src/index.css b/app/src/index.css index c57aa10..4e7cef6 100644 --- a/app/src/index.css +++ b/app/src/index.css @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -20,6 +20,7 @@ HBO Now and HBO Max logos are trademark and intellectual property of WarnerMedia --party-width: 425px; --neg-party-width: -425px; --body-width: calc(100% - var(--party-width)); + --video-container-pos: fixed; } body { margin: 0 !important; @@ -64,6 +65,8 @@ body.visible #party-width-dragger { display: block; } + +body.funimation.visible .vjs-control-bar, /* FUNIMATION */ body.netflix.visible .AkiraPlayer, /* NETFLIX */ body.hulu.visible .Player__container,/* HULU */ body.amazon-prime.visible #dv-web-player.dv-player-fullscreen, /* AMAZON PRIME */ @@ -1143,7 +1146,7 @@ button.giphy-list-item { } .vxt-video-container { - position: fixed; + position: var(--video-container-pos); overflow-x: hidden; overflow-y: auto; top: 10px; diff --git a/app/src/index.js b/app/src/index.js index d7e7336..a643bd3 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -2,7 +2,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE diff --git a/functions/package.json b/functions/package.json index 6e877c4..b2d5ffb 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-api", - "version": "1.7.16", + "version": "1.7.17", "description": "Cloud Functions for Watch Party", "scripts": { "lint": "eslint .", diff --git a/package.json b/package.json index d6687f9..37609aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "watch-party", - "version": "1.7.16", + "version": "1.7.17", "description": "Watch Party", "scripts": { "start": "firebase emulators:start", diff --git a/website/404.html b/website/404.html index bb95a5a..4229720 100644 --- a/website/404.html +++ b/website/404.html @@ -3,7 +3,7 @@ Copyright (C) Ayushya Amitabh - All Rights Reserved Unauthorized copying of this file, via any medium is strictly prohibited Proprietary and confidential -Written by Ayushya Amitabh , 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -255,7 +255,7 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
LEGAL & OTHER
- © 2020 - 2021, Ayushya Amitabh + © 2020 - 2022, Ayushya Amitabh Copyright Privacy Policy, 2020 - 2021 +Written by Ayushya Amitabh , 2020 - 2022 https://www.chromewatchparty.com/copyright ========================================================================= ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, UNLESS OTHERWISE @@ -292,6 +292,9 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. v1.7.16 + v1.7.17