From 851a3e35aea80c936b1327cc961ad327f2ac6a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:43:54 +0900 Subject: [PATCH 1/4] =?UTF-8?q?enhance(ux):=20defaultWithReplies=E3=81=AE?= =?UTF-8?q?=E6=97=A2=E5=AE=9A=E5=80=A4=E3=82=92true=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B=20(MisskeyIO#864)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 70cea20e4..81b21dd5e 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -417,7 +417,7 @@ export const defaultStore = markRaw(new Storage('base', { }, defaultWithReplies: { where: 'account', - default: false, + default: true, }, disableStreamingTimeline: { where: 'device', From f7ac3c5493b64be1d9397c887bd6cd0eda6086db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:44:43 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"perf(queue):=20BullMQ=20+=20Drago?= =?UTF-8?q?nflyDB=20=E3=81=A7=20Hashtag=20=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=81=99=E3=81=B9=E3=81=A6=E3=82=92=E3=83=AD=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B=20(MisskeyIO#838)"=20(MisskeyIO#865)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8c81bb9b6ac02a7a01848227e99922fab9392b86 partially. --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/test-backend.yml | 4 ++-- chart/templates/Deployment.yml | 4 ++-- docker-compose.local-db.yml | 2 +- docker-compose_example.yml | 2 +- packages/backend/test/docker-compose.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a8ad3c6f7..d9f38b823 100644 --- a/.devcontainer/docker-compose.yml +++ b/.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 diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 20390f444..26c352699 100644 --- a/.github/workflows/test-backend.yml +++ b/.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 diff --git a/chart/templates/Deployment.yml b/chart/templates/Deployment.yml index d45dfebca..2d3c89e67 100644 --- a/chart/templates/Deployment.yml +++ b/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 diff --git a/docker-compose.local-db.yml b/docker-compose.local-db.yml index db2c4a8b5..25793bc4f 100644 --- a/docker-compose.local-db.yml +++ b/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 diff --git a/docker-compose_example.yml b/docker-compose_example.yml index eceda396f..379bc3d77 100644 --- a/docker-compose_example.yml +++ b/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 diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/docker-compose.yml index d54d61ae7..74659a952 100644 --- a/packages/backend/test/docker-compose.yml +++ b/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 From 3750888c6abfa84f363437c79ccaef76847a7907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:45:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix(frontend/role):=20=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=89=B2=E3=82=8A=E5=BD=93=E3=81=A6=E6=99=82?= =?UTF-8?q?=E3=83=A1=E3=83=A2=E3=82=92=E5=85=A5=E5=8A=9B=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=A8=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB?= =?UTF-8?q?=E6=89=B1=E3=81=84=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(MisskeyIO#866)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/admin-user.vue | 2 +- packages/frontend/src/pages/admin/roles.role.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index 09a51efdc..90172191b 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/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; diff --git a/packages/frontend/src/pages/admin/roles.role.vue b/packages/frontend/src/pages/admin/roles.role.vue index cacfa9760..73dee88de 100644 --- a/packages/frontend/src/pages/admin/roles.role.vue +++ b/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; From b5a796ffd1d68b86eaafe179fba7e709d33ddad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=82=85?= <17376330+u1-liquid@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:29:44 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix(backend/UtilityService):=20=E9=9D=9E?= =?UTF-8?q?=E6=A8=99=E6=BA=96=E3=83=9D=E3=83=BC=E3=83=88=E7=95=AA=E5=8F=B7?= =?UTF-8?q?=E7=92=B0=E5=A2=83=E3=81=A7URI=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=AB=E5=88=A4=E5=AE=9A=E3=81=8C=E5=B8=B8=E3=81=AB?= =?UTF-8?q?false=E3=81=AB=E3=81=AA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(MisskeyIO#867)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/UtilityService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts index 71d774712..4b5a8f75c 100644 --- a/packages/backend/src/core/UtilityService.ts +++ b/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