misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'misskey-develop' into merge/2025-03-24

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts
This commit is contained in:
Hazelnoot 2025-03-25 16:17:34 -04:00
commit 40975719ec
82 changed files with 1563 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/models/Notification.ts
View file

@ -75,6 +75,12 @@ export type MiNotification = {
id: string;
createdAt: string;
roleId: MiRole['id'];
} | {
type: 'chatRoomInvitationReceived';
id: string;
createdAt: string;
notifierId: MiUser['id'];
invitationId: string;
} | {
type: 'achievementEarned';
id: string;