MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-11 19:03:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for empty location + add Active user state

Browse Source
This commit is contained in:
Natsumi
2021-05-22 16:25:28 +12:00
parent 6de718e994
commit c3d6b6f2fa
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
html/src/app.dark.scss
View File

@@ -318,6 +318,7 @@ button {
}
.x-friend-item > .avatar.active::after,
.x-friend-item > .avatar.online::after,
.x-friend-item > .avatar.joinme::after,
.x-friend-item > .avatar.askme::after,
.x-friend-item > .avatar.busy::after {

18
html/src/app.js
View File

@@ -5473,15 +5473,17 @@ speechSynthesis.getVoices();
if ((user.status !== 'active') && (id) && (id !== API.currentUser.id) &&
(!this.friendsGroup0_.filter(e => e.id === id).length > 0) &&
(!this.friendsGroup1_.filter(e => e.id === id).length > 0)) {
// Active
style.active = true;
} else if (user.location === 'offline') {
// Offline
style.offline = true;
} else if ((user.location === 'offline') ||
((user.state === 'active') && (user.location === 'private'))) {
// Offline
style.offline = true;
} else if (user.state === 'active') {
// Active
style.active = true;
} else if (user.status === 'active') {
// Online
style.active = true;
style.online = true;
} else if (user.status === 'join me') {
// Join Me
style.joinme = true;
@@ -5646,7 +5648,8 @@ speechSynthesis.getVoices();
}
if ((props.location) &&
(props.location[0] !== 'offline') &&
(props.location[1] !== 'offline')) {
(props.location[0] !== '') &&
((props.location[1] !== 'offline') && (props.location[0] !== 'private'))) {
$app.addFeed('GPS', ref, {
location: [
props.location[0],
@@ -11449,7 +11452,8 @@ speechSynthesis.getVoices();
if ((this.worldAutoCacheGPS === 'Always') ||
((this.worldAutoCacheGPS === 'Game Closed') && (!this.isGameRunning)) ||
((this.worldAutoCacheGPS === 'Game Running') && (this.isGameRunning))) {
if ((feed.location === 'offline') ||
if ((feed.location === '') ||
(feed.location === 'offline') ||
(feed.location === 'private') ||
((!this.worldAutoCacheGPSFilter) &&
(!API.cachedFavoritesByObjectId.has(feed.id)))) {

9
html/src/app.scss
View File

@@ -307,6 +307,7 @@ img.friends-list-avatar {
}
.x-friend-item > .avatar.active::after,
.x-friend-item > .avatar.online::after,
.x-friend-item > .avatar.joinme::after,
.x-friend-item > .avatar.askme::after,
.x-friend-item > .avatar.busy::after {
@@ -322,6 +323,10 @@ img.friends-list-avatar {
}
.x-friend-item > .avatar.active::after {
background: #dfca43;
}
.x-friend-item > .avatar.online::after {
background: #67c23a;
}
@@ -439,6 +444,10 @@ i.x-user-status {
}
i.x-user-status.active {
background: #dfca43;
}
i.x-user-status.online {
background: #67c23a;
}

7
html/src/index.pug
View File

@@ -119,7 +119,7 @@ html
template(v-else-if="scope.row.type === 'Status'")
el-tooltip(placement="top")
template(#content)
span(v-if="scope.row.status[1].status === 'active'") Online
span(v-if="scope.row.status[1].status === 'active'") Active
span(v-else-if="scope.row.status[1].status === 'join me'") Join Me
span(v-else-if="scope.row.status[1].status === 'ask me'") Ask Me
span(v-else-if="scope.row.status[1].status === 'busy'") Do Not Disturb
@@ -131,7 +131,7 @@ html
i.el-icon-right
el-tooltip(placement="top")
template(#content)
span(v-if="scope.row.status[0].status === 'active'") Online
span(v-if="scope.row.status[0].status === 'active'") Active
span(v-else-if="scope.row.status[0].status === 'join me'") Join Me
span(v-else-if="scope.row.status[0].status === 'ask me'") Ask Me
span(v-else-if="scope.row.status[0].status === 'busy'") Do Not Disturb
@@ -1001,7 +1001,8 @@ html
div
el-tooltip(v-if="userDialog.ref.status" placement="top")
template(#content)
span(v-if="userDialog.ref.location === 'offline'") Offline
span(v-if="userDialog.ref.state === 'active'") Active
span(v-else-if="userDialog.ref.location === 'offline'") Offline
span(v-else-if="userDialog.ref.status === 'active'") Online
span(v-else-if="userDialog.ref.status === 'join me'") Join Me
span(v-else-if="userDialog.ref.status === 'ask me'") Ask Me

5
html/src/vr.js
View File

@@ -980,9 +980,12 @@ speechSynthesis.getVoices();
if (user.location === 'offline') {
// Offline
style.offline = true;
} else if (user.state === 'active') {
// Active
style.active = true;
} else if (user.status === 'active') {
// Online
style.active = true;
style.online = true;
} else if (user.status === 'join me') {
// Join Me
style.joinme = true;