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

Fix PR conflicts, moderation actions, export local favorites

Browse Source
This commit is contained in:
Natsumi
2024-12-12 16:03:51 +13:00
parent ef8931dd8c
commit 109753b3fd
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+14 -14
View File
@@ -10628,49 +10628,49 @@ speechSynthesis.getVoices();
userId userId
}); });
break; break;
case 'Unblock': case 'Moderation Unblock':
API.deletePlayerModeration({ API.deletePlayerModeration({
moderated: userId, moderated: userId,
type: 'block' type: 'block'
}); });
break; break;
case 'Block': case 'Moderation Block':
API.sendPlayerModeration({ API.sendPlayerModeration({
moderated: userId, moderated: userId,
type: 'block' type: 'block'
}); });
break; break;
case 'Unmute': case 'Moderation Unmute':
API.deletePlayerModeration({ API.deletePlayerModeration({
moderated: userId, moderated: userId,
type: 'mute' type: 'mute'
}); });
break; break;
case 'Mute': case 'Moderation Mute':
API.sendPlayerModeration({ API.sendPlayerModeration({
moderated: userId, moderated: userId,
type: 'mute' type: 'mute'
}); });
break; break;
case 'Enable Avatar Interaction': case 'Moderation Enable Avatar Interaction':
API.deletePlayerModeration({ API.deletePlayerModeration({
moderated: userId, moderated: userId,
type: 'interactOff' type: 'interactOff'
}); });
break; break;
case 'Disable Avatar Interaction': case 'Moderation Disable Avatar Interaction':
API.sendPlayerModeration({ API.sendPlayerModeration({
moderated: userId, moderated: userId,
type: 'interactOff' type: 'interactOff'
}); });
break; break;
case 'Unmute Chatbox': case 'Moderation Enable Chatbox':
API.deletePlayerModeration({ API.deletePlayerModeration({
moderated: userId, moderated: userId,
type: 'muteChat' type: 'muteChat'
}); });
break; break;
case 'Mute Chatbox': case 'Moderation Disable Chatbox':
API.sendPlayerModeration({ API.sendPlayerModeration({
moderated: userId, moderated: userId,
type: 'muteChat' type: 'muteChat'
@@ -19641,7 +19641,7 @@ speechSynthesis.getVoices();
function resText(ref) { function resText(ref) {
let resArr = []; let resArr = [];
propsForQuery.forEach((e) => { propsForQuery.forEach((e) => {
resArr.push(formatter(ref.ref?.[e])); resArr.push(formatter(ref?.[e]));
}); });
return resArr.join(','); return resArr.join(',');
} }
@@ -19658,7 +19658,7 @@ speechSynthesis.getVoices();
if (this.worldExportFavoriteGroup === group) { if (this.worldExportFavoriteGroup === group) {
$app.favoriteWorlds.forEach((ref) => { $app.favoriteWorlds.forEach((ref) => {
if (group.key === ref.groupKey) { if (group.key === ref.groupKey) {
lines.push(resText(ref)); lines.push(resText(ref.ref));
} }
}); });
} }
@@ -19676,7 +19676,7 @@ speechSynthesis.getVoices();
} else { } else {
// export all // export all
this.favoriteWorlds.forEach((ref) => { this.favoriteWorlds.forEach((ref) => {
lines.push(resText(ref)); lines.push(resText(ref.ref));
}); });
for (let i = 0; i < this.localWorldFavoritesList.length; ++i) { for (let i = 0; i < this.localWorldFavoritesList.length; ++i) {
const worldId = this.localWorldFavoritesList[i]; const worldId = this.localWorldFavoritesList[i];
@@ -19910,7 +19910,7 @@ speechSynthesis.getVoices();
function resText(ref) { function resText(ref) {
let resArr = []; let resArr = [];
propsForQuery.forEach((e) => { propsForQuery.forEach((e) => {
resArr.push(formatter(ref.ref?.[e])); resArr.push(formatter(ref?.[e]));
}); });
return resArr.join(','); return resArr.join(',');
} }
@@ -19930,7 +19930,7 @@ speechSynthesis.getVoices();
) { ) {
$app.favoriteAvatars.forEach((ref) => { $app.favoriteAvatars.forEach((ref) => {
if (group.key === ref.groupKey) { if (group.key === ref.groupKey) {
lines.push(resText(ref)); lines.push(resText(ref.ref));
} }
}); });
} }
@@ -19948,7 +19948,7 @@ speechSynthesis.getVoices();
} else { } else {
// export all // export all
this.favoriteAvatars.forEach((ref) => { this.favoriteAvatars.forEach((ref) => {
lines.push(resText(ref)); lines.push(resText(ref.ref));
}); });
for (let i = 0; i < this.localAvatarFavoritesList.length; ++i) { for (let i = 0; i < this.localAvatarFavoritesList.length; ++i) {
const avatarId = this.localAvatarFavoritesList[i]; const avatarId = this.localAvatarFavoritesList[i];
html/src/classes/apiRequestHandler.js
+3 -3
View File
@@ -165,7 +165,7 @@ export default class extends baseClass {
) { ) {
$app.$message({ $app.$message({
message: $t( message: $t(
'api.error.message.avatar_private_or_deleted' 'message.api_handler.avatar_private_or_deleted'
), ),
type: 'error' type: 'error'
}); });
@@ -254,12 +254,12 @@ export default class extends baseClass {
} }
if (typeof error !== 'undefined') { if (typeof error !== 'undefined') {
text.push( text.push(
`${$t('api.error.message.error_message')}${typeof error === 'string' ? error : JSON.stringify(error)}` `${$t('api.error.message.error_message')}: ${typeof error === 'string' ? error : JSON.stringify(error)}`
); );
} }
if (typeof endpoint !== 'undefined') { if (typeof endpoint !== 'undefined') {
text.push( text.push(
`${$t('api.error.message.endpoint')}"${typeof endpoint === 'string' ? endpoint : JSON.stringify(endpoint)}"` `${$t('api.error.message.endpoint')}: "${typeof endpoint === 'string' ? endpoint : JSON.stringify(endpoint)}"`
); );
} }
text = text.map((s) => $app.escapeTag(s)).join('<br>'); text = text.map((s) => $app.escapeTag(s)).join('<br>');
html/src/classes/gameLog.js
+1
View File
@@ -457,6 +457,7 @@ export default class extends baseClass {
!this.localFavoriteFriends.has(entry.userId) && !this.localFavoriteFriends.has(entry.userId) &&
(entry.type === 'OnPlayerJoined' || (entry.type === 'OnPlayerJoined' ||
entry.type === 'OnPlayerLeft' || entry.type === 'OnPlayerLeft' ||
entry.type === 'VideoPlay' ||
entry.type === 'PortalSpawn' || entry.type === 'PortalSpawn' ||
entry.type === 'External') entry.type === 'External')
) { ) {
html/src/localization/en/en.json
+3 -3
View File
@@ -1454,7 +1454,7 @@
"vrcx_updater": { "vrcx_updater": {
"failed": "Failed to check for update, {message}" "failed": "Failed to check for update, {message}"
}, },
"api_headler": { "api_handler": {
"avatar_private_or_deleted": "Avatar is private or deleted" "avatar_private_or_deleted": "Avatar is private or deleted"
}, },
"badge": { "badge": {
@@ -1924,8 +1924,8 @@
}, },
"error": { "error": {
"message": { "message": {
"error_message": "Error Message: ", "error_message": "Error Message",
"endpoint": "Endpoint: ", "endpoint": "Endpoint",
"missing_credentials": "Missing Credentials", "missing_credentials": "Missing Credentials",
"avatar_private_or_deleted": "Avatar private or deleted", "avatar_private_or_deleted": "Avatar private or deleted",
"vpn_in_use": "VRChat currently blocks most VPNs. Please disable any connected VPNs and try again.", "vpn_in_use": "VRChat currently blocks most VPNs. Please disable any connected VPNs and try again.",
html/src/localization/ja/en.json
+2 -2
View File
@@ -1907,8 +1907,8 @@
}, },
"error": { "error": {
"message": { "message": {
"error_message": "エラーメッセージ：", "error_message": "エラーメッセージ",
"endpoint": "エンドポイント：", "endpoint": "エンドポイント",
"missing_credentials": "認証情報不足", "missing_credentials": "認証情報不足",
"avatar_private_or_deleted": "アバターは非公開または削除されました", "avatar_private_or_deleted": "アバターは非公開または削除されました",
"vpn_in_use": "VRChatは現在ほとんどのVPNをブロックしています。接続中のVPNを無効にして、もう一度お試しください。", "vpn_in_use": "VRChatは現在ほとんどのVPNをブロックしています。接続中のVPNを無効にして、もう一度お試しください。",
html/src/localization/zh-CN/en.json
+2 -2
View File
@@ -1910,8 +1910,8 @@
}, },
"error": { "error": {
"message": { "message": {
"error_message": "错误信息：", "error_message": "错误信息",
"endpoint": "接口地址：", "endpoint": "接口地址",
"missing_credentials": "访问凭据缺失", "missing_credentials": "访问凭据缺失",
"avatar_private_or_deleted": "模型是私密的或已被删除", "avatar_private_or_deleted": "模型是私密的或已被删除",
"vpn_in_use": "VRChat 目前屏蔽了大多数的 VPN。请断开所有已连接的 VPN 后重试。", "vpn_in_use": "VRChat 目前屏蔽了大多数的 VPN。请断开所有已连接的 VPN 后重试。",