Merge remote-tracking branch 'upstream/io' into oscar

.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/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

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

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/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/store.ts

@@ -454,7 +454,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	defaultWithReplies: {
 		where: 'account',
-		default: false,
+		default: true,
 	},
 	disableStreamingTimeline: {
 		where: 'device',