summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--locales/index.d.ts4
-rw-r--r--locales/ja-JP.yml4
-rw-r--r--packages/backend/src/core/AnnouncementService.ts77
-rw-r--r--packages/backend/src/server/api/endpoints/admin/announcements/delete.ts5
-rw-r--r--packages/backend/src/server/api/endpoints/admin/announcements/update.ts7
-rw-r--r--packages/backend/src/types.ts22
-rw-r--r--packages/misskey-js/etc/misskey-js.api.md26
-rw-r--r--packages/misskey-js/src/consts.ts22
-rw-r--r--packages/misskey-js/src/entities.ts24
9 files changed, 177 insertions, 14 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 1e5396ad63..c2f50dd54a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2262,6 +2262,10 @@ export interface Locale {
"deleteNote": string;
"createGlobalAnnouncement": string;
"createUserAnnouncement": string;
+ "updateGlobalAnnouncement": string;
+ "updateUserAnnouncement": string;
+ "deleteGlobalAnnouncement": string;
+ "deleteUserAnnouncement": string;
"resetPassword": string;
"suspendRemoteInstance": string;
"unsuspendRemoteInstance": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 47bbb0aa55..43a3394264 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2175,6 +2175,10 @@ _moderationLogTypes:
deleteNote: "ノートを削除"
createGlobalAnnouncement: "全体のお知らせを作成"
createUserAnnouncement: "ユーザーへお知らせを作成"
+ updateGlobalAnnouncement: "全体のお知らせを更新"
+ updateUserAnnouncement: "ユーザーのお知らせを更新"
+ deleteGlobalAnnouncement: "全体のお知らせを削除"
+ deleteUserAnnouncement: "ユーザーのお知らせを削除"
resetPassword: "パスワードをリセット"
suspendRemoteInstance: "リモートサーバーを停止"
unsuspendRemoteInstance: "リモートサーバーを再開"
diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
index 31fcb139ea..2b4877788a 100644
--- a/packages/backend/src/core/AnnouncementService.ts
+++ b/packages/backend/src/core/AnnouncementService.ts
@@ -60,7 +60,7 @@ export class AnnouncementService {
}
@bindThis
- public async create(values: Partial<MiAnnouncement>, moderator: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
+ public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
const announcement = await this.announcementsRepository.insert({
id: this.idService.genId(),
createdAt: new Date(),
@@ -82,20 +82,24 @@ export class AnnouncementService {
announcement: packed,
});
- this.moderationLogService.log(moderator, 'createUserAnnouncement', {
- announcementId: announcement.id,
- announcement: announcement,
- userId: values.userId,
- });
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'createUserAnnouncement', {
+ announcementId: announcement.id,
+ announcement: announcement,
+ userId: values.userId,
+ });
+ }
} else {
this.globalEventService.publishBroadcastStream('announcementCreated', {
announcement: packed,
});
- this.moderationLogService.log(moderator, 'createGlobalAnnouncement', {
- announcementId: announcement.id,
- announcement: announcement,
- });
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'createGlobalAnnouncement', {
+ announcementId: announcement.id,
+ announcement: announcement,
+ });
+ }
}
return {
@@ -105,6 +109,59 @@ export class AnnouncementService {
}
@bindThis
+ public async update(announcement: MiAnnouncement, values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<void> {
+ await this.announcementsRepository.update(announcement.id, {
+ updatedAt: new Date(),
+ title: values.title,
+ text: values.text,
+ /* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
+ imageUrl: values.imageUrl || null,
+ display: values.display,
+ icon: values.icon,
+ forExistingUsers: values.forExistingUsers,
+ needConfirmationToRead: values.needConfirmationToRead,
+ isActive: values.isActive,
+ });
+
+ const after = await this.announcementsRepository.findOneByOrFail({ id: announcement.id });
+
+ if (moderator) {
+ if (announcement.userId) {
+ this.moderationLogService.log(moderator, 'updateUserAnnouncement', {
+ announcementId: announcement.id,
+ before: announcement,
+ after: after,
+ });
+ } else {
+ this.moderationLogService.log(moderator, 'updateGlobalAnnouncement', {
+ announcementId: announcement.id,
+ before: announcement,
+ after: after,
+ });
+ }
+ }
+ }
+
+ @bindThis
+ public async delete(announcement: MiAnnouncement, moderator?: MiUser): Promise<void> {
+ await this.announcementsRepository.delete(announcement.id);
+
+ if (moderator) {
+ if (announcement.userId) {
+ this.moderationLogService.log(moderator, 'deleteUserAnnouncement', {
+ announcementId: announcement.id,
+ announcement: announcement,
+ });
+ } else {
+ this.moderationLogService.log(moderator, 'deleteGlobalAnnouncement', {
+ announcementId: announcement.id,
+ announcement: announcement,
+ });
+ }
+ }
+ }
+
+ @bindThis
public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise<void> {
try {
await this.announcementReadsRepository.insert({
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
index 80eb6d7a80..80ec281253 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
@@ -7,6 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { AnnouncementsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { AnnouncementService } from '@/core/AnnouncementService.js';
import { ApiError } from '../../../error.js';
export const meta = {
@@ -37,13 +38,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
constructor(
@Inject(DI.announcementsRepository)
private announcementsRepository: AnnouncementsRepository,
+
+ private announcementService: AnnouncementService,
) {
super(meta, paramDef, async (ps, me) => {
const announcement = await this.announcementsRepository.findOneBy({ id: ps.id });
if (announcement == null) throw new ApiError(meta.errors.noSuchAnnouncement);
- await this.announcementsRepository.delete(announcement.id);
+ await this.announcementService.delete(announcement, me);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
index 782928048b..d36590c264 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -7,6 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { AnnouncementsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { AnnouncementService } from '@/core/AnnouncementService.js';
import { ApiError } from '../../../error.js';
export const meta = {
@@ -45,13 +46,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
constructor(
@Inject(DI.announcementsRepository)
private announcementsRepository: AnnouncementsRepository,
+
+ private announcementService: AnnouncementService,
) {
super(meta, paramDef, async (ps, me) => {
const announcement = await this.announcementsRepository.findOneBy({ id: ps.id });
if (announcement == null) throw new ApiError(meta.errors.noSuchAnnouncement);
- await this.announcementsRepository.update(announcement.id, {
+ await this.announcementService.update(announcement, {
updatedAt: new Date(),
title: ps.title,
text: ps.text,
@@ -62,7 +65,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
forExistingUsers: ps.forExistingUsers,
needConfirmationToRead: ps.needConfirmationToRead,
isActive: ps.isActive,
- });
+ }, me);
});
}
}
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index a58bb9585a..b85388d6e4 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -43,6 +43,10 @@ export const moderationLogTypes = [
'deleteNote',
'createGlobalAnnouncement',
'createUserAnnouncement',
+ 'updateGlobalAnnouncement',
+ 'updateUserAnnouncement',
+ 'deleteGlobalAnnouncement',
+ 'deleteUserAnnouncement',
'resetPassword',
'suspendRemoteInstance',
'unsuspendRemoteInstance',
@@ -107,6 +111,24 @@ export type ModerationLogPayloads = {
announcement: any;
userId: string;
};
+ updateGlobalAnnouncement: {
+ announcementId: string;
+ before: any;
+ after: any;
+ };
+ updateUserAnnouncement: {
+ announcementId: string;
+ before: any;
+ after: any;
+ };
+ deleteGlobalAnnouncement: {
+ announcementId: string;
+ announcement: any;
+ };
+ deleteUserAnnouncement: {
+ announcementId: string;
+ announcement: any;
+ };
resetPassword: {
targetId: string;
};
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index adedea8755..b5d07a394c 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2557,6 +2557,30 @@ type ModerationLog = {
type: 'promoteQueue';
info: ModerationLogPayloads['promoteQueue'];
} | {
+ type: 'deleteDriveFile';
+ info: ModerationLogPayloads['deleteDriveFile'];
+} | {
+ type: 'deleteNote';
+ info: ModerationLogPayloads['deleteNote'];
+} | {
+ type: 'createGlobalAnnouncement';
+ info: ModerationLogPayloads['createGlobalAnnouncement'];
+} | {
+ type: 'createUserAnnouncement';
+ info: ModerationLogPayloads['createUserAnnouncement'];
+} | {
+ type: 'updateGlobalAnnouncement';
+ info: ModerationLogPayloads['updateGlobalAnnouncement'];
+} | {
+ type: 'updateUserAnnouncement';
+ info: ModerationLogPayloads['updateUserAnnouncement'];
+} | {
+ type: 'deleteGlobalAnnouncement';
+ info: ModerationLogPayloads['deleteGlobalAnnouncement'];
+} | {
+ type: 'deleteUserAnnouncement';
+ info: ModerationLogPayloads['deleteUserAnnouncement'];
+} | {
type: 'resetPassword';
info: ModerationLogPayloads['resetPassword'];
} | {
@@ -2568,7 +2592,7 @@ type ModerationLog = {
});
// @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "assignRole", "unassignRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "assignRole", "unassignRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance"];
// @public (undocumented)
export const mutedNoteReasons: readonly ["word", "manual", "spam", "other"];
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index a5c8c2ba00..dd4fd2609f 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -61,6 +61,10 @@ export const moderationLogTypes = [
'deleteNote',
'createGlobalAnnouncement',
'createUserAnnouncement',
+ 'updateGlobalAnnouncement',
+ 'updateUserAnnouncement',
+ 'deleteGlobalAnnouncement',
+ 'deleteUserAnnouncement',
'resetPassword',
'suspendRemoteInstance',
'unsuspendRemoteInstance',
@@ -125,6 +129,24 @@ export type ModerationLogPayloads = {
announcement: any;
userId: string;
};
+ updateGlobalAnnouncement: {
+ announcementId: string;
+ before: any;
+ after: any;
+ };
+ updateUserAnnouncement: {
+ announcementId: string;
+ before: any;
+ after: any;
+ };
+ deleteGlobalAnnouncement: {
+ announcementId: string;
+ announcement: any;
+ };
+ deleteUserAnnouncement: {
+ announcementId: string;
+ announcement: any;
+ };
resetPassword: {
targetId: string;
};
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index a1fc8befb4..b157eb59f6 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -608,6 +608,30 @@ export type ModerationLog = {
type: 'promoteQueue';
info: ModerationLogPayloads['promoteQueue'];
} | {
+ type: 'deleteDriveFile';
+ info: ModerationLogPayloads['deleteDriveFile'];
+} | {
+ type: 'deleteNote';
+ info: ModerationLogPayloads['deleteNote'];
+} | {
+ type: 'createGlobalAnnouncement';
+ info: ModerationLogPayloads['createGlobalAnnouncement'];
+} | {
+ type: 'createUserAnnouncement';
+ info: ModerationLogPayloads['createUserAnnouncement'];
+} | {
+ type: 'updateGlobalAnnouncement';
+ info: ModerationLogPayloads['updateGlobalAnnouncement'];
+} | {
+ type: 'updateUserAnnouncement';
+ info: ModerationLogPayloads['updateUserAnnouncement'];
+} | {
+ type: 'deleteGlobalAnnouncement';
+ info: ModerationLogPayloads['deleteGlobalAnnouncement'];
+} | {
+ type: 'deleteUserAnnouncement';
+ info: ModerationLogPayloads['deleteUserAnnouncement'];
+} | {
type: 'resetPassword';
info: ModerationLogPayloads['resetPassword'];
} | {
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 12:12:06 +0000