Skip to content

Commit

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

0 comments on commit 7e0e4e5

Please sign in to comment.