fix(MisskeyIO#872): 消し忘れ (MisskeyIO#875)

This reverts commit 8c81bb9b6a partially.

.devcontainer/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       DFLY_snapshot_cron: '* * * * *'
       DFLY_version_check: false
       DFLY_tcp_backlog: 2048
-      DFLY_lock_on_hashtags: true
+      DFLY_default_lua_flags: allow-undeclared-keys
       DFLY_pipeline_squash: 0
       DFLY_multi_exec_squash: false
       DFLY_conn_io_threads: 4

.github/workflows/test-backend.yml

@@ -38,7 +38,7 @@ jobs:
         env:
           DFLY_version_check: false
           DFLY_tcp_backlog: 2048
-          DFLY_lock_on_hashtags: true
+          DFLY_default_lua_flags: allow-undeclared-keys
           DFLY_pipeline_squash: 0
           DFLY_multi_exec_squash: false
           DFLY_conn_io_threads: 4
@@ -99,7 +99,7 @@ jobs:
         env:
           DFLY_version_check: false
           DFLY_tcp_backlog: 2048
-          DFLY_lock_on_hashtags: true
+          DFLY_default_lua_flags: allow-undeclared-keys
           DFLY_pipeline_squash: 0
           DFLY_multi_exec_squash: false
           DFLY_conn_io_threads: 4

chart/templates/Deployment.yml

@@ -44,8 +44,8 @@ spec:
               value: false
             - name: DFLY_tcp_backlog
               value: 2048
-            - name: DFLY_lock_on_hashtags
-              value: true
+            - name: DFLY_default_lua_flags
+              value: allow-undeclared-keys
             - name: DFLY_pipeline_squash
               value: 0
             - name: DFLY_multi_exec_squash

docker-compose.local-db.yml

@@ -12,7 +12,7 @@ services:
       DFLY_snapshot_cron: '* * * * *'
       DFLY_version_check: false
       DFLY_tcp_backlog: 2048
-      DFLY_lock_on_hashtags: true
+      DFLY_default_lua_flags: allow-undeclared-keys
       DFLY_pipeline_squash: 0
       DFLY_multi_exec_squash: false
       DFLY_conn_io_threads: 4

docker-compose_example.yml

@@ -32,7 +32,7 @@ services:
       DFLY_snapshot_cron: '* * * * *'
       DFLY_version_check: false
       DFLY_tcp_backlog: 2048
-      DFLY_lock_on_hashtags: true
+      DFLY_default_lua_flags: allow-undeclared-keys
       DFLY_pipeline_squash: 0
       DFLY_multi_exec_squash: false
       DFLY_conn_io_threads: 4

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.5d",
+	"version": "2024.5.0-io.5e",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/core/AccountMoveService.ts

@@ -274,12 +274,8 @@ export class AccountMoveService {
 
 		if (!srcprofile || !dstprofile) return;
 
-		await this.userProfilesRepository.update({ userId: dst.id }, {
-			moderationNote: srcprofile.moderationNote + '\n' + dstprofile.moderationNote,
-		});
-
-		await this.userProfilesRepository.update({ userId: src.id }, {
-			moderationNote: srcprofile.moderationNote + '\n' + dstprofile.moderationNote,
+		await this.userProfilesRepository.update({ userId: In([src.id, dst.id]) }, {
+			moderationNote: (srcprofile.moderationNote + '\n' + dstprofile.moderationNote).trim(),
 		});
 	}
 

packages/backend/src/core/UtilityService.ts

@@ -35,7 +35,7 @@ export class UtilityService {
 
 	@bindThis
 	public isUriLocal(uri: string): boolean {
-		return this.normalizeHost(this.config.hostname) === this.extractHost(uri);
+		return this.normalizeHost(this.config.host) === this.extractHost(uri);
 	}
 
 	@bindThis

packages/backend/src/server/ActivityPubServerService.ts

@@ -524,8 +524,8 @@ export class ActivityPubServerService {
 			},
 			deriveConstraint(request: IncomingMessage) {
 				const accepted = accepts(request).type(['html', ACTIVITY_JSON, LD_JSON]);
-				const isAp = typeof accepted === 'string' && !accepted.match(/html/);
-				return isAp ? 'ap' : 'html';
+				if (accepted === false) return null;
+				return accepted !== 'html' ? 'ap' : 'html';
 			},
 		});
 

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

@@ -52,7 +52,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		title: { type: 'string' },
-		name: { type: 'string', minLength: 1 },
+		name: { type: 'string', minLength: 1, pattern: /^[a-zA-Z0-9_-]+$/.toString().slice(1, -1) },
 		summary: { type: 'string', nullable: true },
 		content: { type: 'array', items: {
 			type: 'object', additionalProperties: true,

packages/backend/src/server/api/endpoints/pages/update.ts

@@ -57,7 +57,7 @@ export const paramDef = {
 	properties: {
 		pageId: { type: 'string', format: 'misskey:id' },
 		title: { type: 'string' },
-		name: { type: 'string', minLength: 1 },
+		name: { type: 'string', minLength: 1, pattern: /^[a-zA-Z0-9_-]+$/.toString().slice(1, -1) },
 		summary: { type: 'string', nullable: true },
 		content: { type: 'array', items: {
 			type: 'object', additionalProperties: true,

packages/backend/src/server/web/ClientServerService.ts

@@ -534,7 +534,7 @@ export class ClientServerService {
 
 			vary(reply.raw, 'Accept');
 
-			if (user != null) {
+			if (user) {
 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 				const meta = await this.metaService.fetch();
 				const me = profile.fields
@@ -564,11 +564,9 @@ export class ClientServerService {
 		fastify.get<{ Params: { user: string; } }>('/users/:user', async (request, reply) => {
 			const user = await this.usersRepository.findOneBy({
 				id: request.params.user,
-				host: IsNull(),
-				isSuspended: false,
 			});
 
-			if (user == null) {
+			if (!user || (user.isDeleted && user.isSuspended)) {
 				reply.code(404);
 				return;
 			}

packages/backend/test/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     environment:
       DFLY_version_check: false
       DFLY_tcp_backlog: 2048
-      DFLY_lock_on_hashtags: true
+      DFLY_default_lua_flags: allow-undeclared-keys
       DFLY_pipeline_squash: 0
       DFLY_multi_exec_squash: false
       DFLY_conn_io_threads: 4

packages/frontend/src/pages/admin-user.vue

@@ -506,7 +506,7 @@ async function assignRole() {
 	const { canceled: canceled3, result: memo } = await os.inputText({
 		title: i18n.ts.addMemo,
 		type: 'textarea',
-		placeholder: i18n.ts.memo,
+		default: '',
 	});
 	if (canceled3) return;
 

packages/frontend/src/pages/admin/roles.role.vue

@@ -146,7 +146,7 @@ async function assign() {
 	const { canceled: canceled3, result: memo } = await os.inputText({
 		title: i18n.ts.addMemo,
 		type: 'textarea',
-		placeholder: i18n.ts.memo,
+		default: '',
 	});
 	if (canceled3) return;
 

packages/frontend/src/pages/page-editor/page-editor.vue

@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #label>{{ i18n.ts._pages.summary }}</template>
 				</MkInput>
 
-				<MkInput v-model="name">
+				<MkInput v-model="name" type="text" pattern="^[a-zA-Z0-9_-]+$" autocapitalize="off">
 					<template #prefix>{{ url }}/@{{ author.username }}/pages/</template>
 					<template #label>{{ i18n.ts._pages.url }}</template>
 				</MkInput>
@@ -158,7 +158,7 @@ function save() {
 
 	if (pageId.value) {
 		options.pageId = pageId.value;
-		misskeyApi('pages/update', options)
+		os.apiWithDialog('pages/update', options)
 			.then(page => {
 				currentName.value = name.value.trim();
 				os.alert({
@@ -167,7 +167,7 @@ function save() {
 				});
 			}).catch(onError);
 	} else {
-		misskeyApi('pages/create', options)
+		os.apiWithDialog('pages/create', options)
 			.then(created => {
 				pageId.value = created.id;
 				currentName.value = name.value.trim();

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.5d",
+	"version": "2024.5.0-io.5e",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {