Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-mattyatea/report' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
This commit is contained in:
mattyatea 2024-01-28 08:01:21 +09:00
commit 7a3eb26c4d
16 changed files with 276 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/GlobalEventService.ts
View file

@ -158,6 +158,8 @@ export interface AdminEventTypes {
targetUserId: MiUser['id'],
reporterId: MiUser['id'],
comment: string;
notes: any[];
noteIds: string[];
};
}