From 9038e1c3a7fcf37c58aba16d13b017eea5e90e4c Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Wed, 6 Jul 2022 14:54:30 +1200
Subject: [PATCH] Companion 1.1.3 update

---
 html/src/app.js    | 29 +++++++++++++++++------------
 html/src/index.pug | 25 ++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/html/src/app.js b/html/src/app.js
index b69cb3a6..e7413ea6 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -8986,6 +8986,8 @@ speechSynthesis.getVoices();
                 this.parsePhotonPortalSpawn(datetime, instanceId, ref1);
             }
             return;
+        } else if (eventData.EventName === '_SendOnSpawn') {
+            return;
         } else if (eventData.EventType > 34) {
             var entry = {
                 created_at: datetime,
@@ -12646,10 +12648,13 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.promptMaxTableSizeDialog = function () {
-        this.$prompt('Enter a number', 'Max Table Size', {
-            distinguishCancelAndClose: true,
-            confirmButtonText: 'Save',
-            cancelButtonText: 'Cancel',
+        this.$prompt(
+            'Larger table sizes may impact RAM usage and performance (default: 1000)',
+            'Max Table Size',
+            {
+                distinguishCancelAndClose: true,
+                confirmButtonText: 'Save',
+                cancelButtonText: 'Cancel',
             inputValue: this.maxTableSize,
             inputPattern: /\d+$/,
             inputErrorMessage: 'Valid number is required',
@@ -12660,12 +12665,13 @@ speechSynthesis.getVoices();
                         'VRCX_maxTableSize',
                         this.maxTableSize
                     );
-                    database.setmaxTableSize(this.maxTableSize);
-                    this.feedTableLookup();
-                    this.gameLogTableLookup();
+                        database.setmaxTableSize(this.maxTableSize);
+                        this.feedTableLookup();
+                        this.gameLogTableLookup();
+                    }
                 }
             }
-        });
+        );
     };
 
     $app.methods.setTablePageSize = function (pageSize) {
@@ -12710,7 +12716,7 @@ speechSynthesis.getVoices();
 
     $app.methods.promptAutoClearVRCXCacheFrequency = function () {
         this.$prompt(
-            'Enter amount of hours (default: 24, disabled: 0)',
+            'Enter amount of hours, larger values may impact RAM usage and performance (default: 24, disabled: 0)',
             'Clear VRCX Cache Timer',
             {
                 distinguishCancelAndClose: true,
@@ -18925,15 +18931,14 @@ speechSynthesis.getVoices();
                 for (var [id, dt] of Object.entries(data.Event7List)) {
                     this.photonEvent7List.set(parseInt(id, 10), dt);
                 }
-                // this.photonLastEvent7List = Date.parse(data.dt);
-                this.photonLastEvent7List = Date.now();
+                this.photonLastEvent7List = Date.parse(data.dt);
                 break;
             case 'Ping':
                 if (!this.photonLoggingEnabled) {
                     this.photonLoggingEnabled = true;
                     configRepository.setBool('VRCX_photonLoggingEnabled', true);
                 }
-                if (!this.companionUpdateReminder && data.version < '1.1.1') {
+                if (!this.companionUpdateReminder && data.version < '1.1.3') {
                     // check version
                     this.promptCompanionUpdateReminder();
                 }
diff --git a/html/src/index.pug b/html/src/index.pug
index cf41aaaa..c0b50a22 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -253,7 +253,7 @@ html
                                             span.x-link(v-text="scope.row.displayName" @click="lookupUser(scope.row)" style="padding-right:10px")
                                     el-table-column(label="Event" prop="text")
                                         template(v-once #default="scope")
-                                            span(v-if="scope.row.avatar")
+                                            span(v-if="scope.row.type === 'AvatarChange'")
                                                 span ChangeAvatar  
                                                 span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)")
                                                 | &nbsp;
@@ -261,6 +261,29 @@ html
                                                 span.avatar-info-own(v-else-if="scope.row.avatar.releaseStatus === 'private'") (Private)
                                                 template(v-if="scope.row.avatar.description && scope.row.avatar.name !== scope.row.avatar.description")
                                                     |  - {{ scope.row.avatar.description }}
+                                            template(v-else-if="scope.row.type === 'ChangeStatus'")
+                                                span ChangeStatus
+                                                template(v-if="scope.row.status !== scope.row.previousStatus")
+                                                    el-tooltip(placement="top")
+                                                        template(#content)
+                                                            span(v-if="scope.row.previousStatus === 'active'") Active
+                                                            span(v-else-if="scope.row.previousStatus === 'join me'") Join Me
+                                                            span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me
+                                                            span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb
+                                                            span(v-else) Offline
+                                                        i.x-user-status(:class="statusClass(scope.row.previousStatus)" style="margin-left:10px")
+                                                    span
+                                                        i.el-icon-right
+                                                    el-tooltip(placement="top")
+                                                        template(#content)
+                                                            span(v-if="scope.row.status === 'active'") Active
+                                                            span(v-else-if="scope.row.status === 'join me'") Join Me
+                                                            span(v-else-if="scope.row.status === 'ask me'") Ask Me
+                                                            span(v-else-if="scope.row.status === 'busy'") Do Not Disturb
+                                                            span(v-else) Offline
+                                                        i.x-user-status(:class="statusClass(scope.row.status)")
+                                                span(v-if="scope.row.statusDescription !== scope.row.previousStatusDescription" v-text="scope.row.statusDescription" style="margin-left:10px")
+                                            span(v-else-if="scope.row.color === 'yellow'" v-text="scope.row.text" style="color:yellow")
                                             span(v-else v-text="scope.row.text")
 
             //- feed