Fix PR conflicts, moderation actions, export local favorites

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

View File

@@ -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>');

View File

@@ -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')
) {