mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-11 19:03:51 +02:00
API renamed notification senderUsername to senderDisplayName
This commit is contained in:
Natsumi
@@ -2051,7 +2051,7 @@ speechSynthesis.getVoices();
|
||||
ref = {
|
||||
id: '',
|
||||
senderUserId: '',
|
||||
senderUsername: '',
|
||||
senderDisplayName: '',
|
||||
type: '',
|
||||
message: '',
|
||||
details: {},
|
||||
@@ -4309,8 +4309,8 @@ speechSynthesis.getVoices();
|
||||
var displayName = '';
|
||||
if (feed.displayName) {
|
||||
displayName = feed.displayName;
|
||||
} else if (feed.senderUsername) {
|
||||
displayName = feed.senderUsername;
|
||||
} else if (feed.senderDisplayName) {
|
||||
displayName = feed.senderDisplayName;
|
||||
} else if (feed.sourceDisplayName) {
|
||||
displayName = feed.sourceDisplayName;
|
||||
} else if (feed.data) {
|
||||
@@ -4442,19 +4442,19 @@ speechSynthesis.getVoices();
|
||||
this.speak(`${noty.displayName} status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`);
|
||||
break;
|
||||
case 'invite':
|
||||
this.speak(`${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`);
|
||||
this.speak(`${noty.senderDisplayName} has invited you to ${noty.details.worldName}${message}`);
|
||||
break;
|
||||
case 'requestInvite':
|
||||
this.speak(`${noty.senderUsername} has requested an invite${message}`);
|
||||
this.speak(`${noty.senderDisplayName} has requested an invite${message}`);
|
||||
break;
|
||||
case 'inviteResponse':
|
||||
this.speak(`${noty.senderUsername} has responded to your invite${message}`);
|
||||
this.speak(`${noty.senderDisplayName} has responded to your invite${message}`);
|
||||
break;
|
||||
case 'requestInviteResponse':
|
||||
this.speak(`${noty.senderUsername} has responded to your invite request${message}`);
|
||||
this.speak(`${noty.senderDisplayName} has responded to your invite request${message}`);
|
||||
break;
|
||||
case 'friendRequest':
|
||||
this.speak(`${noty.senderUsername} has sent you a friend request`);
|
||||
this.speak(`${noty.senderDisplayName} has sent you a friend request`);
|
||||
break;
|
||||
case 'Friend':
|
||||
this.speak(`${noty.displayName} is now your friend`);
|
||||
@@ -4519,19 +4519,19 @@ speechSynthesis.getVoices();
|
||||
AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`, timeout, image);
|
||||
break;
|
||||
case 'invite':
|
||||
AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`, timeout, image);
|
||||
AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has invited you to ${noty.details.worldName}${message}`, timeout, image);
|
||||
break;
|
||||
case 'requestInvite':
|
||||
AppApi.XSNotification('VRCX', `${noty.senderUsername} has requested an invite${message}`, timeout, image);
|
||||
AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has requested an invite${message}`, timeout, image);
|
||||
break;
|
||||
case 'inviteResponse':
|
||||
AppApi.XSNotification('VRCX', `${noty.senderUsername} has responded to your invite${message}`, timeout, image);
|
||||
AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has responded to your invite${message}`, timeout, image);
|
||||
break;
|
||||
case 'requestInviteResponse':
|
||||
AppApi.XSNotification('VRCX', `${noty.senderUsername} has responded to your invite request${message}`, timeout, image);
|
||||
AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has responded to your invite request${message}`, timeout, image);
|
||||
break;
|
||||
case 'friendRequest':
|
||||
AppApi.XSNotification('VRCX', `${noty.senderUsername} has sent you a friend request`, timeout, image);
|
||||
AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has sent you a friend request`, timeout, image);
|
||||
break;
|
||||
case 'Friend':
|
||||
AppApi.XSNotification('VRCX', `${noty.displayName} is now your friend`, timeout, image);
|
||||
@@ -4595,19 +4595,19 @@ speechSynthesis.getVoices();
|
||||
AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`, image);
|
||||
break;
|
||||
case 'invite':
|
||||
AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${noty.details.worldName}${message}`, image);
|
||||
AppApi.DesktopNotification(noty.senderDisplayName, `has invited you to ${noty.details.worldName}${message}`, image);
|
||||
break;
|
||||
case 'requestInvite':
|
||||
AppApi.DesktopNotification(noty.senderUsername, `has requested an invite${message}`, image);
|
||||
AppApi.DesktopNotification(noty.senderDisplayName, `has requested an invite${message}`, image);
|
||||
break;
|
||||
case 'inviteResponse':
|
||||
AppApi.DesktopNotification(noty.senderUsername, `has responded to your invite${message}`, image);
|
||||
AppApi.DesktopNotification(noty.senderDisplayName, `has responded to your invite${message}`, image);
|
||||
break;
|
||||
case 'requestInviteResponse':
|
||||
AppApi.DesktopNotification(noty.senderUsername, `has responded to your invite request${message}`, image);
|
||||
AppApi.DesktopNotification(noty.senderDisplayName, `has responded to your invite request${message}`, image);
|
||||
break;
|
||||
case 'friendRequest':
|
||||
AppApi.DesktopNotification(noty.senderUsername, 'has sent you a friend request', image);
|
||||
AppApi.DesktopNotification(noty.senderDisplayName, 'has sent you a friend request', image);
|
||||
break;
|
||||
case 'Friend':
|
||||
AppApi.DesktopNotification(noty.displayName, 'is now your friend', image);
|
||||
@@ -6872,7 +6872,7 @@ speechSynthesis.getVoices();
|
||||
filterFn: (row, filter) => filter.value.some((v) => v === row.type)
|
||||
},
|
||||
{
|
||||
prop: 'senderUsername',
|
||||
prop: 'senderDisplayName',
|
||||
value: ''
|
||||
}
|
||||
],
|
||||
|
||||
@@ -455,9 +455,9 @@ html
|
||||
span(v-text="API.parseInviteLocation(scope.row)")
|
||||
span.x-link(v-text="scope.row.type" @click="showWorldDialog(scope.row.details.worldId)")
|
||||
span(v-else v-text="scope.row.type")
|
||||
el-table-column(label="User" prop="senderUsername" width="150")
|
||||
el-table-column(label="User" prop="senderDisplayName" width="150")
|
||||
template(v-once #default="scope")
|
||||
span.x-link(v-text="scope.row.senderUsername" @click="showUserDialog(scope.row.senderUserId)")
|
||||
span.x-link(v-text="scope.row.senderDisplayName" @click="showUserDialog(scope.row.senderUserId)")
|
||||
el-table-column(label="Photo" width="100" prop="photo")
|
||||
template(v-once #default="scope")
|
||||
el-popover(v-if="scope.row.details.imageUrl" placement="right" width="500px" trigger="click")
|
||||
|
||||
@@ -782,8 +782,8 @@ speechSynthesis.getVoices();
|
||||
var displayName = '';
|
||||
if (feed.displayName) {
|
||||
displayName = feed.displayName;
|
||||
} else if (feed.senderUsername) {
|
||||
displayName = feed.senderUsername;
|
||||
} else if (feed.senderDisplayName) {
|
||||
displayName = feed.senderDisplayName;
|
||||
} else if (feed.sourceDisplayName) {
|
||||
displayName = feed.sourceDisplayName;
|
||||
} else if (feed.data) {
|
||||
@@ -853,8 +853,8 @@ speechSynthesis.getVoices();
|
||||
var displayName = '';
|
||||
if (feed.displayName) {
|
||||
displayName = feed.displayName;
|
||||
} else if (feed.senderUsername) {
|
||||
displayName = feed.senderUsername;
|
||||
} else if (feed.senderDisplayName) {
|
||||
displayName = feed.senderDisplayName;
|
||||
} else if (feed.sourceDisplayName) {
|
||||
displayName = feed.sourceDisplayName;
|
||||
} else if (feed.data) {
|
||||
@@ -911,19 +911,19 @@ speechSynthesis.getVoices();
|
||||
text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status[0].status}</i> ${noty.status[0].statusDescription}`;
|
||||
break;
|
||||
case 'invite':
|
||||
text = `<strong>${noty.senderUsername}</strong> has invited you to ${noty.details.worldName} ${message}`;
|
||||
text = `<strong>${noty.senderDisplayName}</strong> has invited you to ${noty.details.worldName} ${message}`;
|
||||
break;
|
||||
case 'requestInvite':
|
||||
text = `<strong>${noty.senderUsername}</strong> has requested an invite ${message}`;
|
||||
text = `<strong>${noty.senderDisplayName}</strong> has requested an invite ${message}`;
|
||||
break;
|
||||
case 'inviteResponse':
|
||||
text = `<strong>${noty.senderUsername}</strong> has responded to your invite ${message}`;
|
||||
text = `<strong>${noty.senderDisplayName}</strong> has responded to your invite ${message}`;
|
||||
break;
|
||||
case 'requestInviteResponse':
|
||||
text = `<strong>${noty.senderUsername}</strong> has responded to your invite request ${message}`;
|
||||
text = `<strong>${noty.senderDisplayName}</strong> has responded to your invite request ${message}`;
|
||||
break;
|
||||
case 'friendRequest':
|
||||
text = `<strong>${noty.senderUsername}</strong> has sent you a friend request`;
|
||||
text = `<strong>${noty.senderDisplayName}</strong> has sent you a friend request`;
|
||||
break;
|
||||
case 'Friend':
|
||||
text = `<strong>${noty.displayName}</strong> is now your friend`;
|
||||
|
||||
@@ -62,27 +62,27 @@ html
|
||||
.detail
|
||||
span.extra
|
||||
span.time {{ feed.created_at | formatDate('HH:MI') }}
|
||||
| 📨 #[span.name(v-text="feed.senderUsername")] #[location(:location="feed.details.worldId")] #[span(v-text="feed.details.inviteMessage")]
|
||||
| 📨 #[span.name(v-text="feed.senderDisplayName")] #[location(:location="feed.details.worldId")] #[span(v-text="feed.details.inviteMessage")]
|
||||
div(v-else-if="feed.type === 'requestInvite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
|
||||
.detail
|
||||
span.extra
|
||||
span.time {{ feed.created_at | formatDate('HH:MI') }}
|
||||
| 📩 #[span.name(v-text="feed.senderUsername")] #[span(v-text="feed.details.requestMessage")]
|
||||
| 📩 #[span.name(v-text="feed.senderDisplayName")] #[span(v-text="feed.details.requestMessage")]
|
||||
div(v-else-if="feed.type === 'inviteResponse'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
|
||||
.detail
|
||||
span.extra
|
||||
span.time {{ feed.created_at | formatDate('HH:MI') }}
|
||||
| 💬 #[span.name(v-text="feed.senderUsername")] #[span(v-text="feed.details.responseMessage")]
|
||||
| 💬 #[span.name(v-text="feed.senderDisplayName")] #[span(v-text="feed.details.responseMessage")]
|
||||
div(v-else-if="feed.type === 'requestInviteResponse'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
|
||||
.detail
|
||||
span.extra
|
||||
span.time {{ feed.created_at | formatDate('HH:MI') }}
|
||||
| 💬 #[span.name(v-text="feed.senderUsername")] #[span(v-text="feed.details.responseMessage")]
|
||||
| 💬 #[span.name(v-text="feed.senderDisplayName")] #[span(v-text="feed.details.responseMessage")]
|
||||
div(v-else-if="feed.type === 'friendRequest'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
|
||||
.detail
|
||||
span.extra
|
||||
span.time {{ feed.created_at | formatDate('HH:MI') }}
|
||||
| 💚 #[span.name(v-text="feed.senderUsername")]
|
||||
| 💚 #[span.name(v-text="feed.senderDisplayName")]
|
||||
div(v-else-if="feed.type === 'Friend'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
|
||||
.detail
|
||||
span.extra
|
||||
|
||||
Reference in New Issue
Block a user