From 178c5220d92f3f5866c0311fbe3d01918a10f6fb Mon Sep 17 00:00:00 2001
From: Ayushya Amitabh <ayushyamitabh@gmail.com>
Date: Sun, 31 May 2020 22:32:11 -0400
Subject: [PATCH] v1.3.1-beta/patch pause on send

---
 app/package.json         | 2 +-
 app/public/manifest.json | 2 +-
 app/src/Chat.js          | 3 ++-
 app/src/VideoListener.js | 4 ++--
 functions/package.json   | 2 +-
 package.json             | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/package.json b/app/package.json
index c578d4f..072c08c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watch-party-crx",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "dependencies": {
     "@giphy/js-fetch-api": "^1.5.8",
diff --git a/app/public/manifest.json b/app/public/manifest.json
index 6a57357..477b011 100644
--- a/app/public/manifest.json
+++ b/app/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Watch Party",
   "short_name": "WP",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Watch streamed content together.",
   "background": {
     "page": "popup.html"
diff --git a/app/src/Chat.js b/app/src/Chat.js
index f9e7b33..34fee48 100644
--- a/app/src/Chat.js
+++ b/app/src/Chat.js
@@ -111,7 +111,8 @@ export default class Chat extends Component {
         return;
       }
       this.setState(response);
-      if (response.player) this.mVideoListener.doUpdate(response.player);
+      if (response.player && this.state.player !== response.player)
+        this.mVideoListener.doUpdate(response.player);
       const pcc = document.querySelector('.thread-container');
       if (pcc) pcc.scrollTop = pcc.scrollHeight;
     });
diff --git a/app/src/VideoListener.js b/app/src/VideoListener.js
index ff250cd..3561710 100644
--- a/app/src/VideoListener.js
+++ b/app/src/VideoListener.js
@@ -1,4 +1,4 @@
-import { PLAYER_STATUS, getPlayerSource, PLAYER_SOURCE } from './Api';
+import { PLAYER_STATUS, getPlayerSource, PLAYER_SOURCE, LocalData } from './Api';
 
 const templateListener = (video) => console.log('MISSING VIDEO LISTENER');
 
@@ -49,7 +49,7 @@ export default class VideoListener {
     if (
       this.isUpdating === false &&
       serverPlayer.showName === this.video.showName &&
-      serverPlayer.updatedBy !== window.localStorage.getItem('watchPartyUserUid')
+      serverPlayer.updatedBy !== LocalData().userUid
     ) {
       this.isUpdating = true;
       if (this.video.element) {
diff --git a/functions/package.json b/functions/package.json
index a48fdfd..88930cf 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watch-party-api",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Cloud Functions for Watch Party",
   "scripts": {
     "lint": "eslint .",
diff --git a/package.json b/package.json
index 4aa0610..ae69c9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "watch-party",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Watch Party",
   "scripts": {
     "start": "firebase emulators:start",