Merge tag '2023.10.0' into merge-upstream

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/api.types.ts

@@ -375,7 +375,6 @@ export type Endpoints = {
 	'i/favorites': { req: { limit?: number; sinceId?: NoteFavorite['id']; untilId?: NoteFavorite['id']; }; res: NoteFavorite[]; };
 	'i/gallery/likes': { req: TODO; res: TODO; };
 	'i/gallery/posts': { req: TODO; res: TODO; };
-	'i/get-word-muted-notes-count': { req: TODO; res: TODO; };
 	'i/import-following': { req: TODO; res: TODO; };
 	'i/import-user-lists': { req: TODO; res: TODO; };
 	'i/move': { req: TODO; res: TODO; };

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;
 
@@ -189,6 +189,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

@@ -180,7 +180,6 @@ export type GalleryPost = {
 export type Note = {
 	id: ID;
 	createdAt: DateString;
-	updatedAt?: DateString | null;
 	text: string | null;
 	cw: string | null;
 	user: User;
@@ -281,6 +280,9 @@ export type Notification = {
 	invitation: UserGroup;
 	user: User;
 	userId: User['id'];
+} | {
+	type: 'achievementEarned';
+	achievement: string;
 } | {
 	type: 'app';
 	header?: string | null;
@@ -329,6 +331,8 @@ export type LiteInstanceMetadata = {
 	tosUrl: string | null;
 	repositoryUrl: string;
 	feedbackUrl: string;
+	impressumUrl: string | null;
+	privacyPolicyUrl: string | null;
 	disableRegistration: boolean;
 	disableLocalTimeline: boolean;
 	disableGlobalTimeline: boolean;
@@ -367,6 +371,7 @@ export type LiteInstanceMetadata = {
 		url: string;
 		imageUrl: string;
 	}[];
+	notesPerOneAd: number;
 	translatorAvailable: boolean;
 	serverRules: string[];
 };

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

@@ -133,13 +133,6 @@ export type NoteUpdatedEvent = {
 	body: {
 		deletedAt: string;
 	};
-} | {
-	id: Note['id'];
-	type: 'updated';
-	body: {
-		cw: string | null;
-		text: string;
-	};
 } | {
 	id: Note['id'];
 	type: 'pollVoted';