From 560a020b3250b1c0b5140df91d1fe87f7f8ef591 Mon Sep 17 00:00:00 2001 From: pypy Date: Wed, 26 May 2021 12:26:40 +0900 Subject: [PATCH] Revert "API renamed notification senderUsername to senderDisplayName" This reverts commit de8aee5bc05955c44cd4375c693ba657fbb0c5e4. --- html/src/app.js | 38 +++++++++++++++++++------------------- html/src/index.pug | 4 ++-- html/src/vr.js | 18 +++++++++--------- html/src/vr.pug | 10 +++++----- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/html/src/app.js b/html/src/app.js index a27e14f9..9fd39fb8 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -2051,7 +2051,7 @@ speechSynthesis.getVoices(); ref = { id: '', senderUserId: '', - senderDisplayName: '', + senderUsername: '', type: '', message: '', details: {}, @@ -4309,8 +4309,8 @@ speechSynthesis.getVoices(); var displayName = ''; if (feed.displayName) { displayName = feed.displayName; - } else if (feed.senderDisplayName) { - displayName = feed.senderDisplayName; + } else if (feed.senderUsername) { + displayName = feed.senderUsername; } 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.senderDisplayName} has invited you to ${noty.details.worldName}${message}`); + this.speak(`${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`); break; case 'requestInvite': - this.speak(`${noty.senderDisplayName} has requested an invite${message}`); + this.speak(`${noty.senderUsername} has requested an invite${message}`); break; case 'inviteResponse': - this.speak(`${noty.senderDisplayName} has responded to your invite${message}`); + this.speak(`${noty.senderUsername} has responded to your invite${message}`); break; case 'requestInviteResponse': - this.speak(`${noty.senderDisplayName} has responded to your invite request${message}`); + this.speak(`${noty.senderUsername} has responded to your invite request${message}`); break; case 'friendRequest': - this.speak(`${noty.senderDisplayName} has sent you a friend request`); + this.speak(`${noty.senderUsername} 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.senderDisplayName} has invited you to ${noty.details.worldName}${message}`, timeout, image); + AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`, timeout, image); break; case 'requestInvite': - AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has requested an invite${message}`, timeout, image); + AppApi.XSNotification('VRCX', `${noty.senderUsername} has requested an invite${message}`, timeout, image); break; case 'inviteResponse': - AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has responded to your invite${message}`, timeout, image); + AppApi.XSNotification('VRCX', `${noty.senderUsername} has responded to your invite${message}`, timeout, image); break; case 'requestInviteResponse': - AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has responded to your invite request${message}`, timeout, image); + AppApi.XSNotification('VRCX', `${noty.senderUsername} has responded to your invite request${message}`, timeout, image); break; case 'friendRequest': - AppApi.XSNotification('VRCX', `${noty.senderDisplayName} has sent you a friend request`, timeout, image); + AppApi.XSNotification('VRCX', `${noty.senderUsername} 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.senderDisplayName, `has invited you to ${noty.details.worldName}${message}`, image); + AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${noty.details.worldName}${message}`, image); break; case 'requestInvite': - AppApi.DesktopNotification(noty.senderDisplayName, `has requested an invite${message}`, image); + AppApi.DesktopNotification(noty.senderUsername, `has requested an invite${message}`, image); break; case 'inviteResponse': - AppApi.DesktopNotification(noty.senderDisplayName, `has responded to your invite${message}`, image); + AppApi.DesktopNotification(noty.senderUsername, `has responded to your invite${message}`, image); break; case 'requestInviteResponse': - AppApi.DesktopNotification(noty.senderDisplayName, `has responded to your invite request${message}`, image); + AppApi.DesktopNotification(noty.senderUsername, `has responded to your invite request${message}`, image); break; case 'friendRequest': - AppApi.DesktopNotification(noty.senderDisplayName, 'has sent you a friend request', image); + AppApi.DesktopNotification(noty.senderUsername, '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: 'senderDisplayName', + prop: 'senderUsername', value: '' } ], diff --git a/html/src/index.pug b/html/src/index.pug index cae63226..625e9870 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -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="senderDisplayName" width="150") + el-table-column(label="User" prop="senderUsername" width="150") template(v-once #default="scope") - span.x-link(v-text="scope.row.senderDisplayName" @click="showUserDialog(scope.row.senderUserId)") + span.x-link(v-text="scope.row.senderUsername" @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") diff --git a/html/src/vr.js b/html/src/vr.js index 5e20a562..383d3b22 100644 --- a/html/src/vr.js +++ b/html/src/vr.js @@ -782,8 +782,8 @@ speechSynthesis.getVoices(); var displayName = ''; if (feed.displayName) { displayName = feed.displayName; - } else if (feed.senderDisplayName) { - displayName = feed.senderDisplayName; + } else if (feed.senderUsername) { + displayName = feed.senderUsername; } 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.senderDisplayName) { - displayName = feed.senderDisplayName; + } else if (feed.senderUsername) { + displayName = feed.senderUsername; } else if (feed.sourceDisplayName) { displayName = feed.sourceDisplayName; } else if (feed.data) { @@ -911,19 +911,19 @@ speechSynthesis.getVoices(); text = `${noty.displayName} status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`; break; case 'invite': - text = `${noty.senderDisplayName} has invited you to ${noty.details.worldName} ${message}`; + text = `${noty.senderUsername} has invited you to ${noty.details.worldName} ${message}`; break; case 'requestInvite': - text = `${noty.senderDisplayName} has requested an invite ${message}`; + text = `${noty.senderUsername} has requested an invite ${message}`; break; case 'inviteResponse': - text = `${noty.senderDisplayName} has responded to your invite ${message}`; + text = `${noty.senderUsername} has responded to your invite ${message}`; break; case 'requestInviteResponse': - text = `${noty.senderDisplayName} has responded to your invite request ${message}`; + text = `${noty.senderUsername} has responded to your invite request ${message}`; break; case 'friendRequest': - text = `${noty.senderDisplayName} has sent you a friend request`; + text = `${noty.senderUsername} has sent you a friend request`; break; case 'Friend': text = `${noty.displayName} is now your friend`; diff --git a/html/src/vr.pug b/html/src/vr.pug index 8fd2a800..7c8c883c 100644 --- a/html/src/vr.pug +++ b/html/src/vr.pug @@ -62,27 +62,27 @@ html .detail span.extra span.time {{ feed.created_at | formatDate('HH:MI') }} - | 📨 #[span.name(v-text="feed.senderDisplayName")] #[location(:location="feed.details.worldId")] #[span(v-text="feed.details.inviteMessage")] + | 📨 #[span.name(v-text="feed.senderUsername")] #[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.senderDisplayName")] #[span(v-text="feed.details.requestMessage")] + | 📩 #[span.name(v-text="feed.senderUsername")] #[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.senderDisplayName")] #[span(v-text="feed.details.responseMessage")] + | 💬 #[span.name(v-text="feed.senderUsername")] #[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.senderDisplayName")] #[span(v-text="feed.details.responseMessage")] + | 💬 #[span.name(v-text="feed.senderUsername")] #[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.senderDisplayName")] + | 💚 #[span.name(v-text="feed.senderUsername")] div(v-else-if="feed.type === 'Friend'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") .detail span.extra