MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 14:56:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Instance type in invite notification, small fixes

Browse Source
This commit is contained in:
Natsumi
2021-08-06 02:32:44 +12:00
parent e8a64af18c
commit 97a1e57259
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+9 -6
View File
@@ -4563,7 +4563,7 @@ speechSynthesis.getVoices();
this.speak(`${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`); this.speak(`${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`);
break; break;
case 'invite': case 'invite':
this.speak(`${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`); this.speak(`${noty.senderUsername} has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`);
break; break;
case 'requestInvite': case 'requestInvite':
this.speak(`${noty.senderUsername} has requested an invite${message}`); this.speak(`${noty.senderUsername} has requested an invite${message}`);
@@ -4640,7 +4640,7 @@ speechSynthesis.getVoices();
AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`, timeout, image); AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`, timeout, image);
break; break;
case 'invite': case 'invite':
AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`, timeout, image); AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`, timeout, image);
break; break;
case 'requestInvite': case 'requestInvite':
AppApi.XSNotification('VRCX', `${noty.senderUsername} has requested an invite${message}`, timeout, image); AppApi.XSNotification('VRCX', `${noty.senderUsername} has requested an invite${message}`, timeout, image);
@@ -4716,7 +4716,7 @@ speechSynthesis.getVoices();
AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status} ${noty.statusDescription}`, image); AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status} ${noty.statusDescription}`, image);
break; break;
case 'invite': case 'invite':
AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${noty.details.worldName}${message}`, image); AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`, image);
break; break;
case 'requestInvite': case 'requestInvite':
AppApi.DesktopNotification(noty.senderUsername, `has requested an invite${message}`, image); AppApi.DesktopNotification(noty.senderUsername, `has requested an invite${message}`, image);
@@ -5969,12 +5969,15 @@ speechSynthesis.getVoices();
} else if (user.userId) { } else if (user.userId) {
id = user.userId; id = user.userId;
} }
if ((!user.isFriend) && (id) && (id !== API.currentUser.id)) { if ((id) && (id === API.currentUser.id)) {
return this.statusClass(user.status);
}
if (!user.isFriend) {
return; return;
} }
//temp fix //temp fix
if ((user.status !== 'active') && (user.location === 'private') && (user.state === '') && if ((user.status !== 'active') && (user.location === 'private') && (user.state === '') &&
(id) && (id !== API.currentUser.id) && (id) &&
(!API.currentUser.onlineFriends.includes(id))) { (!API.currentUser.onlineFriends.includes(id))) {
if (API.currentUser.activeFriends.includes(id)) { if (API.currentUser.activeFriends.includes(id)) {
// Active // Active
@@ -12729,7 +12732,7 @@ speechSynthesis.getVoices();
return; return;
case -11: case -11:
this.$message({ this.$message({
message: 'VRChat can\'t be located', message: 'Delete \'data.unity3d\' file from AssetBundleCacher_Data folder',
type: 'error' type: 'error'
}); });
this.downloadCurrent = {}; this.downloadCurrent = {};
html/src/vr.js
+8 -5
View File
@@ -877,18 +877,21 @@ speechSynthesis.getVoices();
} }
var bias = new Date(Date.now() - 60000).toJSON(); var bias = new Date(Date.now() - 60000).toJSON();
var noty = {}; var noty = {};
var messageList = [ 'inviteMessage', 'requestMessage', 'responseMessage' ]; var messageList = ['inviteMessage', 'requestMessage', 'responseMessage'];
for (var i = 0; i < notyToPlay.length; i++) { for (var i = 0; i < notyToPlay.length; i++) {
noty = notyToPlay[i]; noty = notyToPlay[i];
if (noty.created_at < bias) { if (noty.created_at < bias) {
continue; continue;
} }
var message = ''; var message = '';
for (i = 0; i < messageList.length; i++) { for (var k = 0; k < messageList.length; k++) {
if (typeof noty.details !== 'undefined' && typeof noty.details[messageList[i]] !== 'undefined') { if (typeof noty.details !== 'undefined' && typeof noty.details[messageList[k]] !== 'undefined') {
message = noty.details[messageList[i]]; message = noty.details[messageList[k]];
} }
} }
if (message) {
message = `, ${message}`;
}
if ((this.config.overlayNotifications) && (!this.isGameNoVR) && (this.isGameRunning)) { if ((this.config.overlayNotifications) && (!this.isGameNoVR) && (this.isGameRunning)) {
var text = ''; var text = '';
switch (noty.type) { switch (noty.type) {
@@ -914,7 +917,7 @@ speechSynthesis.getVoices();
text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status}</i> ${noty.statusDescription}`; text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status}</i> ${noty.statusDescription}`;
break; break;
case 'invite': case 'invite':
text = `<strong>${noty.senderUsername}</strong> has invited you to ${noty.details.worldName} ${message}`; text = `<strong>${noty.senderUsername}</strong> has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`;
break; break;
case 'requestInvite': case 'requestInvite':
text = `<strong>${noty.senderUsername}</strong> has requested an invite ${message}`; text = `<strong>${noty.senderUsername}</strong> has requested an invite ${message}`;