Drop extended_settings, account data soon. Closes #1160

5 files changed, 14 insertions, 17 deletions

diff --git a/assets/openapi.json b/assets/openapi.json

index 55e044ad..2afc2170 100644
--- a/assets/openapi.json
+++ b/assets/openapi.json
@@ -7979,10 +7979,6 @@
                     "settings": {
                         "$ref": "#/components/schemas/UserSettings"
                     },
-                    "extended_settings": {
-                        "type": "string",
-                        "default": "{}"
-                    },
                     "security_keys": {
                         "type": "array",
                         "items": {
@@ -8009,7 +8005,6 @@
                     "desktop",
                     "disabled",
                     "discriminator",
-                    "extended_settings",
                     "fingerprints",
                     "flags",
                     "id",
@@ -23588,7 +23583,7 @@
         },
         "/channels/{channel_id}/greet/": {
             "post": {
-                "x-permission-required": "MANAGE_CHANNELS",
+                "x-permission-required": "SEND_MESSAGES",
                 "security": [
                     {
                         "bearer": []
diff --git a/assets/schemas.json b/assets/schemas.json

index 64625399..7aebefe5 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -8465,10 +8465,6 @@
             "settings": {
                 "$ref": "#/definitions/UserSettings"
             },
-            "extended_settings": {
-                "type": "string",
-                "default": "{}"
-            },
             "security_keys": {
                 "type": "array",
                 "items": {
@@ -8496,7 +8492,6 @@
             "desktop",
             "disabled",
             "discriminator",
-            "extended_settings",
             "fingerprints",
             "flags",
             "id",
diff --git a/src/schemas/api/users/User.ts b/src/schemas/api/users/User.ts

index 5a13d3a8..41d60673 100644
--- a/src/schemas/api/users/User.ts
+++ b/src/schemas/api/users/User.ts
@@ -56,7 +56,6 @@ interface UserEntityPleaseRewriteThankYou {
     connected_accounts: ConnectedAccountSchema[];
     fingerprints: string[];
     settings?: UserSettingsSchema;
-    extended_settings: string;
     badge_ids?: string[];
 }
 
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts

index 9e9685b0..bc970c63 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -162,10 +162,6 @@ export class User extends BaseClass {
     @JoinColumn()
     settings?: UserSettings;
 
-    // workaround to prevent fossord-unaware clients from deleting settings not used by them
-    @Column({ type: "simple-json", select: false })
-    extended_settings: string = "{}";
-
     @OneToMany(() => SecurityKey, (key: SecurityKey) => key.user)
     security_keys: SecurityKey[];
 
@@ -297,7 +293,6 @@ export class User extends BaseClass {
                 hash: password,
                 valid_tokens_since: new Date(),
             },
-            extended_settings: "{}",
             settings: settings,
 
             premium_since: Config.get().defaults.user.premium ? new Date() : undefined,
diff --git a/src/util/migration/postgres/1765967660704-DropExtendedSettings.ts b/src/util/migration/postgres/1765967660704-DropExtendedSettings.ts
new file mode 100644

index 00000000..749058a8
--- /dev/null
+++ b/src/util/migration/postgres/1765967660704-DropExtendedSettings.ts
@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class DropExtendedSettings1765967660704 implements MigrationInterface {
+    name = "DropExtendedSettings1765967660704";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "extended_settings"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "users" ADD "extended_settings" text NOT NULL`);
+    }
+}