Merge pull request 'Merge upstream 2025-01-12' (#29) from sugar/forkey:merge-upstream-2025-01-12 into main

Reviewed-on: #29
Reviewed-by: leah <leah@noreply.woem.men>

packages/backend/src/core/chart/ChartManagementService.ts

@@ -58,9 +58,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	@bindThis
 	public async start() {
 		// 20分おきにメモリ情報をDBに書き込み
-		this.saveIntervalId = setInterval(() => {
+		this.saveIntervalId = setInterval(async () => {
 			for (const chart of this.charts) {
-				chart.save();
+				await chart.save();
 			}
 		}, 1000 * 60 * 20);
 	}
@@ -69,9 +69,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	public async dispose(): Promise<void> {
 		clearInterval(this.saveIntervalId);
 		if (process.env.NODE_ENV !== 'test') {
-			await Promise.all(
+			for (const chart of this.charts) {
-				this.charts.map(chart => chart.save()),
+				await chart.save();
-			);
+			}
 		}
 	}
 

packages/backend/src/queue/processors/CleanChartsProcessorService.ts

@@ -48,20 +48,18 @@ export class CleanChartsProcessorService {
 	public async process(): Promise<void> {
 		this.logger.info('Clean charts...');
 
-		await Promise.all([
+		await this.federationChart.clean();
-			this.federationChart.clean(),
+		await this.notesChart.clean();
-			this.notesChart.clean(),
+		await this.usersChart.clean();
-			this.usersChart.clean(),
+		await this.activeUsersChart.clean();
-			this.activeUsersChart.clean(),
+		await this.instanceChart.clean();
-			this.instanceChart.clean(),
+		await this.perUserNotesChart.clean();
-			this.perUserNotesChart.clean(),
+		await this.perUserPvChart.clean();
-			this.perUserPvChart.clean(),
+		await this.driveChart.clean();
-			this.driveChart.clean(),
+		await this.perUserReactionsChart.clean();
-			this.perUserReactionsChart.clean(),
+		await this.perUserFollowingChart.clean();
-			this.perUserFollowingChart.clean(),
+		await this.perUserDriveChart.clean();
-			this.perUserDriveChart.clean(),
+		await this.apRequestChart.clean();
-			this.apRequestChart.clean(),
-		]);
 
 		this.logger.succ('All charts successfully cleaned.');
 	}

packages/backend/src/queue/processors/ResyncChartsProcessorService.ts

@@ -31,11 +31,9 @@ export class ResyncChartsProcessorService {
 
 		// TODO: ユーザーごとのチャートも更新する
 		// TODO: インスタンスごとのチャートも更新する
-		await Promise.all([
+		await this.driveChart.resync();
-			this.driveChart.resync(),
+		await this.notesChart.resync();
-			this.notesChart.resync(),
+		await this.usersChart.resync();
-			this.usersChart.resync(),
-		]);
 
 		this.logger.succ('All charts successfully resynced.');
 	}

packages/backend/src/queue/processors/TickChartsProcessorService.ts

@@ -48,20 +48,18 @@ export class TickChartsProcessorService {
 	public async process(): Promise<void> {
 		this.logger.info('Tick charts...');
 
-		await Promise.all([
+		await this.federationChart.tick(false);
-			this.federationChart.tick(false),
+		await this.notesChart.tick(false);
-			this.notesChart.tick(false),
+		await this.usersChart.tick(false);
-			this.usersChart.tick(false),
+		await this.activeUsersChart.tick(false);
-			this.activeUsersChart.tick(false),
+		await this.instanceChart.tick(false);
-			this.instanceChart.tick(false),
+		await this.perUserNotesChart.tick(false);
-			this.perUserNotesChart.tick(false),
+		await this.perUserPvChart.tick(false);
-			this.perUserPvChart.tick(false),
+		await this.driveChart.tick(false);
-			this.driveChart.tick(false),
+		await this.perUserReactionsChart.tick(false);
-			this.perUserReactionsChart.tick(false),
+		await this.perUserFollowingChart.tick(false);
-			this.perUserFollowingChart.tick(false),
+		await this.perUserDriveChart.tick(false);
-			this.perUserDriveChart.tick(false),
+		await this.apRequestChart.tick(false);
-			this.apRequestChart.tick(false),
-		]);
 
 		this.logger.succ('All charts successfully ticked.');
 	}

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -40,7 +40,7 @@ export const meta = {
 
 	res: {
 		type: 'object',
-		optional: false, nullable: false,
+		optional: true, nullable: false,
 		properties: {
 			createdNote: {
 				type: 'object',
@@ -207,6 +207,7 @@ export const paramDef = {
 			},
 			required: ['choices'],
 		},
+		noCreatedNote: { type: 'boolean', default: false },
 	},
 	// (re)note with text, files and poll are optional
 	if: {
@@ -281,7 +282,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				const note = await this.notesRepository.findOneBy({ id: idempotent });
 				if (note) {
 					logger.info('The request has already been processed.', { noteId: note.id });
-					return { createdNote: await this.noteEntityService.pack(note, me) };
+					if (ps.noCreatedNote) return;
+					else return { createdNote: await this.noteEntityService.pack(note, me) };
 				}
 			}
 
@@ -453,7 +455,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				await this.redisForTimelines.set(`note:idempotent:${me.id}:${hash}`, note.id, 'EX', 60);
 
 				logger.info('Successfully created a note.', { noteId: note.id });
-				return {
+				if (ps.noCreatedNote) return;
+				else return {
 					createdNote: await this.noteEntityService.pack(note, me),
 				};
 			} catch (err) {

packages/backend/src/server/web/cli.js

@@ -41,7 +41,8 @@ window.onload = async () => {
 
 	document.getElementById('submit').addEventListener('click', () => {
 		api('notes/create', {
-			text: document.getElementById('text').value
+			text: document.getElementById('text').value,
+			noCreatedNote: true,
 		}).then(() => {
 			location.reload();
 		});

packages/frontend/src/components/MkPostForm.vue

@@ -798,6 +798,7 @@ async function post(ev?: MouseEvent) {
 		visibility: visibility.value,
 		visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(u => u.id) : undefined,
 		reactionAcceptance: reactionAcceptance.value,
+		noCreatedNote: true,
 	};
 
 	if (withHashtags.value && hashtags.value && hashtags.value.trim() !== '') {

packages/frontend/src/pages/reversi/game.vue

@@ -46,6 +46,7 @@ function start(_game: Misskey.entities.ReversiGameDetailed) {
 		misskeyApi('notes/create', {
 			text: i18n.ts._reversi.iStartedAGame + '\n' + location.href,
 			visibility: 'home',
+			noCreatedNote: true,
 		});
 	}
 

packages/frontend/src/scripts/get-note-menu.ts

@@ -543,6 +543,7 @@ export function getRenoteMenu(props: {
 					misskeyApi('notes/create', {
 						renoteId: appearNote.id,
 						channelId: appearNote.channelId,
+						noCreatedNote: true,
 					}).then(() => {
 						os.toast(i18n.ts.renoted);
 					});
@@ -589,6 +590,7 @@ export function getRenoteMenu(props: {
 						localOnly,
 						visibility,
 						renoteId: appearNote.id,
+						noCreatedNote: true,
 					}).then(() => {
 						os.toast(i18n.ts.renoted);
 					});
@@ -630,6 +632,7 @@ export function getRenoteMenu(props: {
 							misskeyApi('notes/create', {
 								renoteId: appearNote.id,
 								channelId: channel.id,
+								noCreatedNote: true,
 							}).then(() => {
 								os.toast(i18n.tsx.renotedToX({ name: channel.name }));
 							});

packages/frontend/src/scripts/get-user-menu.ts

@@ -298,7 +298,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 							const { canceled: canceled3, result: memo } = await os.inputText({
 								title: i18n.ts.addMemo,
 								type: 'textarea',
-								placeholder: i18n.ts.memo,
+								default: '',
 							});
 							if (canceled3) return;
 

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

@@ -23465,6 +23465,8 @@ export type operations = {
             expiresAt?: number | null;
             expiredAfter?: number | null;
           }) | null;
+          /** @default false */
+          noCreatedNote?: boolean;
         };
       };
     };
@@ -23477,6 +23479,10 @@ export type operations = {
           };
         };
       };
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
       /** @description Client error */
       400: {
         content: {

packages/sw/src/sw.ts

@@ -114,7 +114,7 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
 						if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
 						break;
 					case 'renote':
-						if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id });
+						if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id, noCreatedNote: true });
 						break;
 					case 'accept':
 						switch (data.body.type) {