diff --git a/admin/package.json b/admin/package.json index 6c920c2..a07781d 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-admin", - "version": "1.7.10", + "version": "1.7.11", "private": true, "devDependencies": { "@ant-design/icons": "^4.2.2", diff --git a/app/package.json b/app/package.json index 0deb9ef..5a16680 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-crx", - "version": "1.7.10", + "version": "1.7.11", "private": true, "dependencies": {}, "scripts": { diff --git a/app/public/background.js b/app/public/background.js index 8494c29..e63833d 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.10"; +const APP_VERSION = "1.7.11"; const firebaseConfig = { apiKey: "AIzaSyCJLuYpzXLDRmu2ttzFuSGmYcpFxqToWFU", diff --git a/app/public/manifest.json b/app/public/manifest.json index 9991234..b942e97 100644 --- a/app/public/manifest.json +++ b/app/public/manifest.json @@ -1,7 +1,7 @@ { "name": "Watch Party", "short_name": "WP", - "version": "1.7.10", + "version": "1.7.11", "description": "Watch streamed content together.", "background": { "page": "background.html" @@ -47,6 +47,8 @@ "https://*.airtelxstream.in/*", "https://*.vimeo.com/*", "https://*.dailymotion.com/*", + "https://*.imdb.com/tv/*", + "https://*.paramountplus.com/*", "https://api.giphy.com/*", "https://*.voxeet.com/*" ], @@ -89,7 +91,9 @@ "https://*.hotstar.com/*", "https://*.airtelxstream.in/*", "https://*.vimeo.com/*", - "https://*.dailymotion.com/*" + "https://*.dailymotion.com/*", + "https://*.imdb.com/tv/*", + "https://*.paramountplus.com/*" ], "run_at": "document_idle", "js": ["/static/js/content.js"], diff --git a/app/src/Api.js b/app/src/Api.js index 16b28c9..ed74ceb 100644 --- a/app/src/Api.js +++ b/app/src/Api.js @@ -43,6 +43,8 @@ export const PLAYER_SOURCE = { AIRTEL: "airtelxstream.", VIMEO: "vimeo.", DAILYMOTION: "dailymotion.", + IMDB: "imdb.", + PARAMOUNTPLUS: "paramountplus.", LOCAL: "localhost", }; @@ -52,6 +54,7 @@ export const getPlayerSource = () => { if (HREF.includes(PLAYER_SOURCE.HULU)) return PLAYER_SOURCE.HULU; if (HREF.includes(PLAYER_SOURCE.AMAZON)) return PLAYER_SOURCE.AMAZON; if (HREF.includes(PLAYER_SOURCE.PRIMEVIDEO)) return PLAYER_SOURCE.AMAZON; + if (HREF.includes(PLAYER_SOURCE.IMDB)) return PLAYER_SOURCE.AMAZON; if (HREF.includes(PLAYER_SOURCE.DISNEY)) return PLAYER_SOURCE.DISNEY; if (HREF.includes(PLAYER_SOURCE.YOUTUBE)) return PLAYER_SOURCE.YOUTUBE; if (HREF.includes(PLAYER_SOURCE.HBONOW)) return PLAYER_SOURCE.HBONOW; @@ -71,6 +74,7 @@ export const getPlayerSource = () => { if (HREF.includes(PLAYER_SOURCE.VIMEO)) return PLAYER_SOURCE.VIMEO; if (HREF.includes(PLAYER_SOURCE.DAILYMOTION)) return PLAYER_SOURCE.DAILYMOTION; + if (HREF.includes(PLAYER_SOURCE.PARAMOUNTPLUS)) return PLAYER_SOURCE.PARAMOUNTPLUS; if (HREF.includes(PLAYER_SOURCE.LOCAL)) return PLAYER_SOURCE.LOCAL; }; diff --git a/app/src/App.js b/app/src/App.js index 7dae62f..0958e48 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.10"; +const APP_VERSION = "1.7.11"; const darkTheme = createMuiTheme({ palette: { diff --git a/app/src/Chat.js b/app/src/Chat.js index 3eff975..f606ff1 100644 --- a/app/src/Chat.js +++ b/app/src/Chat.js @@ -1036,8 +1036,8 @@ export default class Chat extends Component { title={ onCall ? usingVideo - ? "Stop Video" - : "Start Video" + ? "Video is On" + : "Video is Off" : "Join Video Call" } > @@ -1047,9 +1047,9 @@ export default class Chat extends Component { ? () => this.handleVideo() : () => this.handlePhoneCall(true) } - color={usingVideo ? "primary" : "secondary"} + color={((onCall && usingVideo) || !onCall) ? "secondary" : "primary"} > - {usingVideo ? : } + {((onCall && usingVideo) || !onCall)? : } )} @@ -1071,18 +1071,7 @@ export default class Chat extends Component { )} {!gif && !newMessage && onCall && !muted ? ( - - - - - - ) : !gif && !newMessage && onCall && muted ? ( - + + ) : !gif && !newMessage && onCall && muted ? ( + + + + + ) : null} { var newVideoElement = document.querySelector(vS); if ( diff --git a/app/src/index.css b/app/src/index.css index be762bd..7706fc7 100644 --- a/app/src/index.css +++ b/app/src/index.css @@ -365,6 +365,17 @@ body.visible.hbo body.visible.hbo > div.default > div:nth-child(2) > div > div > div > div { width: 100%; } +/* IMDB FIXES */ +body.visible.imdb-tv { + max-width: var(--body-width) !important; +} +body.visible.imdb-tv .freedive-video-container .freedive-video-modal.modal__open { + max-width: var(--body-width); +} +/* PARAMOUNT FIXES */ +body.visible.paramountplus header { + max-width: var(--body-width); +} #party-loading { position: absolute; diff --git a/app/src/index.js b/app/src/index.js index fd32649..ab38ccf 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -57,6 +57,9 @@ switch (getPlayerSource()) { document.body.classList.add("hulu"); break; case PLAYER_SOURCE.AMAZON: + if (window.location.href.includes(PLAYER_SOURCE.IMDB)) { + document.body.classList.add("imdb-tv"); + } document.body.classList.add("amazon-prime"); break; case PLAYER_SOURCE.DISNEY: @@ -152,6 +155,9 @@ switch (getPlayerSource()) { document.body.classList.add("dailymotion"); document.querySelector("html").style.fontSize = "10px"; break; + case PLAYER_SOURCE.PARAMOUNTPLUS: + document.body.classList.add("paramountplus"); + break; case PLAYER_SOURCE.LOCAL: document.body.classList.add("local"); break; diff --git a/assets/logos/ImdbTv.png b/assets/logos/ImdbTv.png new file mode 100644 index 0000000..c5ab695 Binary files /dev/null and b/assets/logos/ImdbTv.png differ diff --git a/assets/logos/ImdbTvWhite.png b/assets/logos/ImdbTvWhite.png new file mode 100644 index 0000000..8bf10fe Binary files /dev/null and b/assets/logos/ImdbTvWhite.png differ diff --git a/assets/logos/ParamountPlusColor.png b/assets/logos/ParamountPlusColor.png new file mode 100644 index 0000000..652b1a2 Binary files /dev/null and b/assets/logos/ParamountPlusColor.png differ diff --git a/assets/logos/ParamountPlusWhite.png b/assets/logos/ParamountPlusWhite.png new file mode 100644 index 0000000..a7a576f Binary files /dev/null and b/assets/logos/ParamountPlusWhite.png differ diff --git a/functions/package-lock.json b/functions/package-lock.json index 0a7583b..f55c685 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -1,6 +1,6 @@ { "name": "watch-party-api", - "version": "1.7.10", + "version": "1.7.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/functions/package.json b/functions/package.json index 9e1bb8d..0ef53d4 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-api", - "version": "1.7.10", + "version": "1.7.11", "description": "Cloud Functions for Watch Party", "scripts": { "lint": "eslint .", diff --git a/package.json b/package.json index b258d1d..98efffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "watch-party", - "version": "1.7.10", + "version": "1.7.11", "description": "Watch Party", "scripts": { "start": "firebase emulators:start", diff --git a/website/copyright/index.html b/website/copyright/index.html index 2b3f81e..2afec21 100644 --- a/website/copyright/index.html +++ b/website/copyright/index.html @@ -252,6 +252,13 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. Dailymotion logo is a trademark and intellectual property of Dailymotion.

+

+ IMDB TV logo is a trademark and intellectual property of + IMDb.com, Inc. +

+

+ Paramount + logo is a trademark and intellectual property of ViacomCBS. +

Google Chrome logo is a trademark and intellectual property of Google, Inc. diff --git a/website/index.html b/website/index.html index 75c1213..ee59882 100644 --- a/website/index.html +++ b/website/index.html @@ -244,6 +244,8 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.

+
+
diff --git a/website/media/logos/ImdbTvColor.webp b/website/media/logos/ImdbTvColor.webp new file mode 100644 index 0000000..46085c8 Binary files /dev/null and b/website/media/logos/ImdbTvColor.webp differ diff --git a/website/media/logos/ImdbTvWhite.webp b/website/media/logos/ImdbTvWhite.webp new file mode 100644 index 0000000..2651c7b Binary files /dev/null and b/website/media/logos/ImdbTvWhite.webp differ diff --git a/website/media/logos/ParamountPlusColor.webp b/website/media/logos/ParamountPlusColor.webp new file mode 100644 index 0000000..5d08959 Binary files /dev/null and b/website/media/logos/ParamountPlusColor.webp differ diff --git a/website/media/logos/ParamountPlusWhite.webp b/website/media/logos/ParamountPlusWhite.webp new file mode 100644 index 0000000..fe9e16e Binary files /dev/null and b/website/media/logos/ParamountPlusWhite.webp differ diff --git a/website/styles/variables-dark.css b/website/styles/variables-dark.css index 7c80db3..46d0fd8 100644 --- a/website/styles/variables-dark.css +++ b/website/styles/variables-dark.css @@ -69,3 +69,9 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. .card-grid .support-card#airtel { background-image: url('/media/logos/AirtelWhite.webp'); } +.card-grid .support-card#imdb { + background-image: url('/media/logos/ImdbTvWhite.webp'); +} +.card-grid .support-card#paramount { + background-image: url('/media/logos/ParamountPlusWhite.webp'); +} diff --git a/website/styles/variables.css b/website/styles/variables.css index e56ddbb..bda589c 100644 --- a/website/styles/variables.css +++ b/website/styles/variables.css @@ -74,3 +74,9 @@ AMITABH, AND MAY NOT BE COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. .card-grid .support-card#dailymotion { background-image: url('/media/logos/Dailymotion.webp'); } +.card-grid .support-card#imdb { + background-image: url('/media/logos/ImdbTvColor.webp'); +} +.card-grid .support-card#paramount { + background-image: url('/media/logos/ParamountPlusColor.webp'); +} diff --git a/website/welcome/index.html b/website/welcome/index.html index c87b55a..9fb91dd 100644 --- a/website/welcome/index.html +++ b/website/welcome/index.html @@ -303,6 +303,8 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. id="dailymotion" class="support-card" > + +