diff --git a/locales/index.d.ts b/locales/index.d.ts
index 65e8096403..39feda5075 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10214,6 +10214,10 @@ export interface Locale extends ILocale {
* Approved
*/
"approve": string;
+ /**
+ * Declined
+ */
+ "decline": string;
/**
* Set remote instance as NSFW
*/
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 37a9cc83e7..2e5c820054 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -93,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0-only
: @{{ log.info.flashUserUsername }}
: @{{ log.info.postUserUsername }}
-
+
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index e564600ef1..ee8bfe322c 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2609,6 +2609,12 @@ type ModerationLog = {
} | {
type: 'deleteUserAnnouncement';
info: ModerationLogPayloads['deleteUserAnnouncement'];
+} | {
+ type: 'setRemoteInstanceNSFW';
+ info: ModerationLogPayloads['setRemoteInstanceNSFW'];
+} | {
+ type: 'unsetRemoteInstanceNSFW';
+ info: ModerationLogPayloads['unsetRemoteInstanceNSFW'];
} | {
type: 'resetPassword';
info: ModerationLogPayloads['resetPassword'];
@@ -2618,6 +2624,12 @@ type ModerationLog = {
} | {
type: 'unsuspendRemoteInstance';
info: ModerationLogPayloads['unsuspendRemoteInstance'];
+} | {
+ type: 'rejectRemoteInstanceReports';
+ info: ModerationLogPayloads['rejectRemoteInstanceReports'];
+} | {
+ type: 'acceptRemoteInstanceReports';
+ info: ModerationLogPayloads['acceptRemoteInstanceReports'];
} | {
type: 'updateRemoteInstanceNote';
info: ModerationLogPayloads['updateRemoteInstanceNote'];
@@ -2696,7 +2708,7 @@ type ModerationLog = {
});
// @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost"];
// @public (undocumented)
type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index 1d4950ceea..fcb19be303 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -125,6 +125,7 @@ export const moderationLogTypes = [
'updateServerSettings',
'suspend',
'approve',
+ 'decline',
'unsuspend',
'updateUserNote',
'addCustomEmoji',
@@ -146,8 +147,12 @@ export const moderationLogTypes = [
'deleteGlobalAnnouncement',
'deleteUserAnnouncement',
'resetPassword',
+ 'setRemoteInstanceNSFW',
+ 'unsetRemoteInstanceNSFW',
'suspendRemoteInstance',
'unsuspendRemoteInstance',
+ 'rejectRemoteInstanceReports',
+ 'acceptRemoteInstanceReports',
'updateRemoteInstanceNote',
'markSensitiveDriveFile',
'unmarkSensitiveDriveFile',
@@ -187,7 +192,14 @@ export const reversiUpdateKeys = [
export type ReversiUpdateKey = typeof reversiUpdateKeys[number];
-type AvatarDecoration = UserLite['avatarDecorations'][number];
+interface AvatarDecoration {
+ id: string;
+ updatedAt: string | null;
+ url: string;
+ name: string;
+ description: string;
+ roleIdsThatCanBeUsedThisDecoration: string[];
+}
type ReceivedAbuseReport = {
reportId: AbuseReportNotificationRecipient['id'];
@@ -323,6 +335,14 @@ export type ModerationLogPayloads = {
userUsername: string;
userHost: string | null;
};
+ setRemoteInstanceNSFW: {
+ id: string;
+ host: string;
+ };
+ unsetRemoteInstanceNSFW: {
+ id: string;
+ host: string;
+ };
suspendRemoteInstance: {
id: string;
host: string;
@@ -331,6 +351,14 @@ export type ModerationLogPayloads = {
id: string;
host: string;
};
+ rejectRemoteInstanceReports: {
+ id: string;
+ host: string;
+ };
+ acceptRemoteInstanceReports: {
+ id: string;
+ host: string;
+ };
updateRemoteInstanceNote: {
id: string;
host: string;
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index efe5ba19fb..b92c2537a1 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -120,12 +120,27 @@ export type ModerationLog = {
} | {
type: 'resetPassword';
info: ModerationLogPayloads['resetPassword'];
+} | {
+ type: 'setRemoteInstanceNSFW';
+ info: ModerationLogPayloads['setRemoteInstanceNSFW'];
+} | {
+ type: 'unsetRemoteInstanceNSFW';
+ info: ModerationLogPayloads['unsetRemoteInstanceNSFW'];
+} | {
+ type: 'resetPassword';
+ info: ModerationLogPayloads['resetPassword'];
} | {
type: 'suspendRemoteInstance';
info: ModerationLogPayloads['suspendRemoteInstance'];
} | {
type: 'unsuspendRemoteInstance';
info: ModerationLogPayloads['unsuspendRemoteInstance'];
+} | {
+ type: 'rejectRemoteInstanceReports';
+ info: ModerationLogPayloads['rejectRemoteInstanceReports'];
+} | {
+ type: 'acceptRemoteInstanceReports';
+ info: ModerationLogPayloads['acceptRemoteInstanceReports'];
} | {
type: 'updateRemoteInstanceNote';
info: ModerationLogPayloads['updateRemoteInstanceNote'];
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index b95a912a5f..a12d84e2f5 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -303,6 +303,7 @@ _abuseReport:
webhook: "Send a notification to the SystemWebhook when an abuse report is received or resolved."
_moderationLogTypes:
approve: "Approved"
+ decline: "Declined"
setRemoteInstanceNSFW: "Set remote instance as NSFW"
unsetRemoteInstanceNSFW: "Set remote instance as NSFW"
rejectRemoteInstanceReports: "Rejected reports from remote instance"