diff --git a/html/src/app.js b/html/src/app.js index a871ecd1..4ee5a686 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -11640,7 +11640,8 @@ speechSynthesis.getVoices(); name: this.lastLocation.name, playerList: Array.from(this.lastLocation.playerList.values()), friendList: Array.from(this.lastLocation.friendList.values()), - progressPie + progressPie, + onlineFor: API.currentUser.$online_for }; var json = JSON.stringify(lastLocation); AppApi.ExecuteVrFeedFunction('lastLocationUpdate', json); diff --git a/html/src/vr.js b/html/src/vr.js index 96028683..d3304dbb 100644 --- a/html/src/vr.js +++ b/html/src/vr.js @@ -178,9 +178,11 @@ Vue.component('marquee-text', MarqueeText); name: '', playerList: [], friendList: [], - progressPie: false + progressPie: false, + onlineFor: 0 }, lastLocationTimer: '', + onlineForTimer: '', wristFeed: [], devices: [] }, @@ -337,12 +339,19 @@ Vue.component('marquee-text', MarqueeText); var cpuUsage = await AppApi.CpuUsage(); this.cpuUsage = cpuUsage.toFixed(0); } - - this.lastLocationTimer = ''; if (this.lastLocation.date !== 0) { this.lastLocationTimer = timeToText( Date.now() - this.lastLocation.date ); + } else { + this.lastLocationTimer = ''; + } + if (this.lastLocation.onlineForTimer !== 0) { + this.onlineForTimer = timeToText( + Date.now() - this.lastLocation.onlineFor + ); + } else { + this.onlineForTimer = ''; } if (!this.config.hideDevicesFromFeed) { diff --git a/html/src/vr.pug b/html/src/vr.pug index f94b3732..1669e608 100644 --- a/html/src/vr.pug +++ b/html/src/vr.pug @@ -404,7 +404,7 @@ html template(v-else-if="downloadProgress > 0") span(style="display:inline-block;margin-right:5px") {{ downloadProgress }}% template(v-if="lastLocation.date !== 0") - span(style="float:right") {{ lastLocationTimer }} + span(style="float:right") {{ lastLocationTimer }} / {{ onlineForTimer }} span(style="display:inline-block") {{ lastLocation.playerList.length }} span(style="display:inline-block;font-weight:bold") {{ lastLocation.friendList.length !== 0 ? `‎‎‎‎‎‎‎‎‏‏‎ ‎(${lastLocation.friendList.length})` : ''}} span(v-if="photonLobbyBotSize > 0 && lastLocation.playerList.length > 0" style="display:inline-block;color:red;margin-left:5px") {{ photonLobbyBotSize }} @@ -414,7 +414,7 @@ html template(v-else-if="downloadProgress > 0") span(style="display:inline-block;margin-right:5px") Downloading: {{ downloadProgress }}% template(v-if="lastLocation.date !== 0") - span(style="float:right") Timer: {{ lastLocationTimer }} + span(style="float:right") Timer: {{ lastLocationTimer }} / {{ onlineForTimer }} span(style="display:inline-block") Players: {{ lastLocation.playerList.length }} span(style="display:inline-block;font-weight:bold") {{ lastLocation.friendList.length !== 0 ? `‎‎‎‎‎‎‎‎‏‏‎ ‎(${lastLocation.friendList.length})` : ''}} span(v-if="photonLobbyBotSize > 0 && lastLocation.playerList.length > 0" style="display:inline-block;color:red;margin-left:5px") {{ photonLobbyBotSize }} diff --git a/html/src/vr.scss b/html/src/vr.scss index 0e39c0f4..89e2d7fd 100644 --- a/html/src/vr.scss +++ b/html/src/vr.scss @@ -205,7 +205,7 @@ button { position: relative; flex: none; padding: 10px; - overflow: hidden auto; + overflow: hidden; } .x-containerbottom {