merge: all upstream changes

packages/misskey-js/src/api.ts

@@ -67,8 +67,7 @@ export class APIClient {
 			IsCaseMatched<E, P, 8> extends true ? GetCaseResult<E, P, 8> :
 			IsCaseMatched<E, P, 9> extends true ? GetCaseResult<E, P, 9> :
 			Endpoints[E]['res']['$switch']['$default']
-		: Endpoints[E]['res']>
-	{
+		: Endpoints[E]['res']> {
 		const promise = new Promise((resolve, reject) => {
 			this.fetch(`${this.origin}/api/${endpoint}`, {
 				method: 'POST',

packages/misskey-js/src/consts.ts

@@ -1,4 +1,4 @@
-export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app'] as const;
+export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'achievementEarned'] as const;
 
 export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
 
@@ -186,6 +186,9 @@ export type ModerationLogPayloads = {
 	deleteUserAnnouncement: {
 		announcementId: string;
 		announcement: any;
+		userId: string;
+		userUsername: string;
+		userHost: string | null;
 	};
 	resetPassword: {
 		userId: string;

packages/misskey-js/src/entities.ts

@@ -292,6 +292,9 @@ export type Notification = {
 	invitation: UserGroup;
 	user: User;
 	userId: User['id'];
+} | {
+	type: 'achievementEarned';
+	achievement: string;
 } | {
 	type: 'app';
 	header?: string | null;
@@ -337,6 +340,8 @@ export type LiteInstanceMetadata = {
 	tosUrl: string | null;
 	repositoryUrl: string;
 	feedbackUrl: string;
+	impressumUrl: string | null;
+	privacyPolicyUrl: string | null;
 	disableRegistration: boolean;
 	disableLocalTimeline: boolean;
 	disableGlobalTimeline: boolean;
@@ -376,6 +381,7 @@ export type LiteInstanceMetadata = {
 		url: string;
 		imageUrl: string;
 	}[];
+	notesPerOneAd: number;
 	translatorAvailable: boolean;
 	serverRules: string[];
 };

packages/misskey-js/src/streaming.types.ts

@@ -127,12 +127,6 @@ export type NoteUpdatedEvent = {
 		reaction: string;
 		userId: User['id'];
 	};
-} | {
-	id: Note['id'];
-	type: 'deleted';
-	body: {
-		deletedAt: string;
-	};
 } | {
 	id: Note['id'];
 	type: 'updated';
@@ -140,6 +134,12 @@ export type NoteUpdatedEvent = {
 		cw: string | null;
 		text: string;
 	};
+} | {
+	id: Note['id'];
+	type: 'deleted';
+	body: {
+		deletedAt: string;
+	};
 } | {
 	id: Note['id'];
 	type: 'pollVoted';