MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 06:13:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changes and fixes

Browse Source
This commit is contained in:
Natsumi
2021-11-01 18:59:37 +13:00
parent 83dbf0d50f
commit ead5cb3e4c
4 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
html/src/app.js
View File

@@ -1476,7 +1476,7 @@ speechSynthesis.getVoices();
ref,
props
});
if (this.debugDiff) {
if ($app.debugUserDiff) {
console.log('>', ref.displayName, props);
}
}
@@ -4153,7 +4153,7 @@ speechSynthesis.getVoices();
$app.data.debug = false;
$app.data.debugWebRequests = false;
$app.data.debugWebSocket = false;
$app.data.debugDiff = false;
$app.data.debugUserDiff = false;
$app.data.APILastOnline = new Map();
@@ -7466,11 +7466,6 @@ speechSynthesis.getVoices();
return true;
}
return false;
// case 'AvatarChange':
// if (String(row.name).toUpperCase().includes(value)) {
// return true;
// }
// return false;
case 'Event':
if (String(row.data).toUpperCase().includes(value)) {
return true;
@@ -7529,6 +7524,15 @@ speechSynthesis.getVoices();
$app.methods.addGameLog = function (entry) {
this.gameLogSessionTable.push(entry);
if (
entry.type === 'LocationDestination' ||
entry.type === 'AvatarChange' ||
(entry.userId === API.currentUser.id &&
(entry.type === 'OnPlayerJoined' ||
entry.type === 'OnPlayerLeft'))
) {
return;
}
if (
this.gameLogTable.filter.length > 0 &&
!this.gameLogTable.filter.includes(entry.type)
@@ -7538,14 +7542,6 @@ speechSynthesis.getVoices();
if (!this.gameLogSearch(entry)) {
return;
}
if (
entry.type === 'LocationDestination' ||
(entry.userId === API.currentUser.id &&
(entry.type === 'OnPlayerJoined' ||
entry.type === 'OnPlayerLeft'))
) {
return;
}
if (entry.type === 'VideoPlay') {
// event time can be before last gameLog entry
this.updateSharedFeed(true);
@@ -8244,7 +8240,7 @@ speechSynthesis.getVoices();
this.showUserDialog(ref.userId);
return;
}
if (!ref.displayname) {
if (!ref.displayName || ref.displayName.substring(0, 3) === 'ID:') {
return;
}
for (var ctx of API.cachedUsers.values()) {
@@ -8454,7 +8450,21 @@ speechSynthesis.getVoices();
if (!query) {
for (var ref of API.cachedAvatars.values()) {
if (ref.authorId === API.currentUser.id) {
avatars.push(ref);
switch (this.searchAvatarFilter) {
case 'all':
avatars.push(ref);
break;
case 'public':
if (ref.releaseStatus === 'public') {
avatars.push(ref);
}
break;
case 'private':
if (ref.releaseStatus === 'private') {
avatars.push(ref);
}
break;
}
}
}
} else {
@@ -9898,6 +9908,7 @@ speechSynthesis.getVoices();
};
$app.methods.vrInit = function () {
downloadProgressStateChange();
this.updateVRConfigVars();
this.updateVRLastLocation();
this.updateVrNowPlaying();
@@ -15086,7 +15097,7 @@ speechSynthesis.getVoices();
'VRCX_progressPieFilter',
this.progressPieFilter
);
this.updateVRConfigVars();
this.updateVRLastLocation();
};
$app.methods.showYouTubeApiDialog = function () {
@@ -16202,7 +16213,7 @@ speechSynthesis.getVoices();
this.debug ||
this.debugWebRequests ||
this.debugWebSocket ||
this.debugDiff
this.debugUserDiff
) {
return;
}

24
html/src/index.pug
View File

@@ -184,7 +184,7 @@ html
template(#tool)
div(style="margin:0 0 10px;display:flex;align-items:center")
el-select(v-model="gameLogTable.filter" @change="gameLogTableLookup" multiple clearable collapse-tags style="flex:1" placeholder="Filter")
el-option(v-once v-for="type in ['Location', 'OnPlayerJoined', 'OnPlayerLeft', 'PortalSpawn', 'AvatarChange', 'Event', 'VideoPlay']" :key="type" :label="type" :value="type")
el-option(v-once v-for="type in ['Location', 'OnPlayerJoined', 'OnPlayerLeft', 'PortalSpawn', 'Event', 'VideoPlay']" :key="type" :label="type" :value="type")
el-input(v-model="gameLogTable.search" placeholder="Search" @keyup.native.13="gameLogTableLookup" @change="gameLogTableLookup" clearable style="flex:none;width:150px;margin:0 10px")
//- el-tooltip(placement="bottom" content="Reload game log" :disabled="hideTooltips")
//- el-button(type="default" @click="resetGameLog" icon="el-icon-refresh" circle style="flex:none")
@@ -205,10 +205,6 @@ html
template(v-once #default="scope")
location(v-if="scope.row.type === 'Location'" :location="scope.row.location" :hint="scope.row.worldName")
location(v-else-if="scope.row.type === 'PortalSpawn'" :location="scope.row.instanceId" :hint="scope.row.worldName")
template(v-else-if="scope.row.type === 'AvatarChange'")
span.x-link(@click="showAvatarDialog(scope.row.avatarId)" v-text="scope.row.name")
template(v-if="scope.row.description && scope.row.name !== scope.row.description")
| - {{ scope.row.description }}
template(v-else-if="scope.row.type === 'Event'")
span(v-text="scope.row.data")
template(v-else-if="scope.row.type === 'VideoPlay'")
@@ -2049,15 +2045,6 @@ html
el-radio-button(label="VIP")
el-radio-button(label="Friends")
el-radio-button(label="Everyone")
.toggle-item
span.toggle-name Lobby Avatar Change
el-tooltip(placement="top" style="margin-left:5px" content="Requires '--log-debug-levels=\"API;NetworkData\"' steam launch option")
i.el-icon-warning
el-radio-group(v-model="sharedFeedFilters.noty.AvatarChange" size="mini")
el-radio-button(label="Off")
el-radio-button(label="VIP")
el-radio-button(label="Friends")
el-radio-button(label="Everyone")
.toggle-item
span.toggle-name Video Play
el-tooltip(placement="top" style="margin-left:5px" content="Requires VRCX YouTube API option enabled")
@@ -2214,15 +2201,6 @@ html
el-radio-button(label="VIP")
el-radio-button(label="Friends")
el-radio-button(label="Everyone")
.toggle-item
span.toggle-name Lobby Avatar Change
el-tooltip(placement="top" style="margin-left:5px" content="Requires '--log-debug-levels=\"API;NetworkData\"' steam launch option")
i.el-icon-warning
el-radio-group(v-model="sharedFeedFilters.wrist.AvatarChange" size="mini")
el-radio-button(label="Off")
el-radio-button(label="VIP")
el-radio-button(label="Friends")
el-radio-button(label="Everyone")
.toggle-item
span.toggle-name Video Play
el-tooltip(placement="top" style="margin-left:5px" content="Requires VRCX YouTube API option enabled")

4
html/src/vr.pug
View File

@@ -12,8 +12,8 @@ html
link(rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+Sans+JP|Noto+Sans+KR&display=swap")
link(rel="stylesheet" href="vr.css")
body
.x-app#x-app(class="x-app-type")
template(v-if="appType === '1'" :class="{ background: config && config.backgroundEnabled }")
.x-app#x-app(class="x-app-type" :class="{ background: appType === '1' && config && config.backgroundEnabled }")
template(v-if="appType === '1'")
.x-container(style="flex:1")
.x-friend-list(ref="list" style="color:#aaa")
template(v-if="config && config.minimalFeed")

4
html/src/vr.scss
View File

@@ -179,8 +179,8 @@ button {
font-family: 'Noto Sans JP', 'Noto Sans KR', 'Meiryo UI', 'Malgun Gothic',
'Segoe UI', sans-serif;
line-height: normal;
text-shadow: #000 0px 0px 1px, #000 0px 0px 1px, #000 0px 0px 1px,
#000 0px 0px 1px, #000 0px 0px 1px, #000 0px 0px 1px;
text-shadow: #000 0px 0px 2px, #000 0px 0px 2px, #000 0px 0px 2px,
#000 0px 0px 2px, #000 0px 0px 2px, #000 0px 0px 2px;
}
.x-app {