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

Add world name to online event if instance isn't private

Browse Source
This commit is contained in:
Natsumi
2021-10-18 01:14:45 +13:00
parent 48ef9457a9
commit 5a7d02cc94
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
html/src/app.js
View File

@@ -4883,7 +4883,14 @@ speechSynthesis.getVoices();
); );
break; break;
case 'Online': case 'Online':
this.speak(`${noty.displayName} has logged in`); var locationName = '';
if (noty.worldName) {
locationName = ` to ${this.displayLocation(
noty.location,
noty.worldName
)}`;
}
this.speak(`${noty.displayName} has logged in${locationName}`);
break; break;
case 'Offline': case 'Offline':
this.speak(`${noty.displayName} has logged out`); this.speak(`${noty.displayName} has logged out`);
@@ -5016,9 +5023,16 @@ speechSynthesis.getVoices();
); );
break; break;
case 'Online': case 'Online':
var locationName = '';
if (noty.worldName) {
locationName = ` to ${this.displayLocation(
noty.location,
noty.worldName
)}`;
}
AppApi.XSNotification( AppApi.XSNotification(
'VRCX', 'VRCX',
`${noty.displayName} has logged in`, `${noty.displayName} has logged in${locationName}`,
timeout, timeout,
image image
); );
@@ -5215,9 +5229,16 @@ speechSynthesis.getVoices();
); );
break; break;
case 'Online': case 'Online':
var locationName = '';
if (noty.worldName) {
locationName = ` to ${this.displayLocation(
noty.location,
noty.worldName
)}`;
}
AppApi.DesktopNotification( AppApi.DesktopNotification(
noty.displayName, noty.displayName,
'has logged in', `has logged in${locationName}`,
image image
); );
break; break;

9
html/src/vr.js
View File

@@ -368,7 +368,14 @@ import configRepository from './repository/config.js';
)}`; )}`;
break; break;
case 'Online': case 'Online':
text = `<strong>${noty.displayName}</strong> has logged in`; var locationName = '';
if (noty.worldName) {
locationName = ` to ${this.displayLocation(
noty.location,
noty.worldName
)}`;
}
text = `<strong>${noty.displayName}</strong> has logged in${locationName}`;
break; break;
case 'Offline': case 'Offline':
text = `<strong>${noty.displayName}</strong> has logged out`; text = `<strong>${noty.displayName}</strong> has logged out`;

16
html/src/vr.pug
View File

@@ -31,7 +31,9 @@ html
.detail .detail
span.extra span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }} span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.displayName")] ✔ | #[span.name(v-text="feed.displayName")] ✔
template(v-if="feed.worldName")
| #[location(:location="feed.location" :hint="feed.worldName")]
div(v-else-if="feed.type === 'Status'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") div(v-else-if="feed.type === 'Status'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail .detail
span.extra span.extra
@@ -122,9 +124,9 @@ html
.detail .detail
span.extra span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }} span.time {{ feed.created_at | formatDate('HH:MI') }}
| ✨ #[span.name(v-text="feed.displayName")] | ✨ #[span.name(v-text="feed.displayName")]
template(v-if="feed.worldName") template(v-if="feed.worldName")
| #[location(:location="feed.instanceId" :hint="feed.worldName")] | #[location(:location="feed.instanceId" :hint="feed.worldName")]
div(v-else-if="feed.type === 'AvatarChange'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") div(v-else-if="feed.type === 'AvatarChange'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail .detail
span.extra span.extra
@@ -178,7 +180,9 @@ html
.detail .detail
span.extra span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }} span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.displayName")] has logged in | #[span.name(v-text="feed.displayName")] has logged in
template(v-if="feed.worldName")
| to #[location(:location="feed.location" :hint="feed.worldName")]
div(v-else-if="feed.type === 'Status'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") div(v-else-if="feed.type === 'Status'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail .detail
span.extra span.extra
@@ -268,9 +272,9 @@ html
.detail .detail
span.extra span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }} span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.displayName")] has spawned a portal | #[span.name(v-text="feed.displayName")] has spawned a portal
template(v-if="feed.worldName") template(v-if="feed.worldName")
| to #[location(:location="feed.instanceId" :hint="feed.worldName")] | to #[location(:location="feed.instanceId" :hint="feed.worldName")]
div(v-else-if="feed.type === 'AvatarChange'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") div(v-else-if="feed.type === 'AvatarChange'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail .detail
span.extra span.extra