kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

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
parent d8908ef2d8 f0ac0aa84d
commit 40975719ec
82 changed files with 1563 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/misskey-js/src/consts.ts
+7 -1
View File
@@ -10,9 +10,10 @@ import type {
ReversiGameDetailed,
SystemWebhook,
UserLite,
ChatRoom,
} from './autogen/models.js';
export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned', 'edited', 'scheduledNoteFailed', 'scheduledNotePosted'] as const;
export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'chatRoomInvitationReceived', 'achievementEarned', 'edited', 'scheduledNoteFailed', 'scheduledNotePosted'] as const;
export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
@@ -178,6 +179,7 @@ export const moderationLogTypes = [
'deletePage',
'deleteFlash',
'deleteGalleryPost',
'deleteChatRoom',
] as const;
// See: packages/backend/src/core/ReversiService.ts@L410
@@ -569,4 +571,8 @@ export type ModerationLogPayloads = {
removeRelay: {
inbox: string;
};
deleteChatRoom: {
roomId: string;
room: ChatRoom;
};
};