mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-21 07:43:50 +02:00
Fix PR conflicts, moderation actions, export local favorites
This commit is contained in:
@@ -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'
|
||||
});
|
||||
@@ -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>');
|
||||
|
||||
@@ -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')
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user