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/unused/test-backend.yml b/.github/unused/test-backend.yml index b31aa97f1..f8e0e244f 100644 --- a/.github/unused/test-backend.yml +++ b/.github/unused/test-backend.yml @@ -36,7 +36,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 @@ -97,7 +97,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/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 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 diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index c418f94b6..685bbdb6f 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; diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 199288b12..174dfa764 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -454,7 +454,7 @@ export const defaultStore = markRaw(new Storage('base', { }, defaultWithReplies: { where: 'account', - default: false, + default: true, }, disableStreamingTimeline: { where: 'device',