diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-07-07 23:34:43 +1000 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-07-07 23:34:43 +1000 |
| commit | 74857223acc0b9ef67c6a5ca437637591a828619 (patch) | |
| tree | 919124034d3aac958878cfe8101676de9f09064c /util/src/entities/User.ts | |
| parent | Ensure password was given if email is given in PATCH @me (diff) | |
| parent | Format changed files (diff) | |
| download | server-74857223acc0b9ef67c6a5ca437637591a828619.tar.xz | |
Merge branch 'master' into fix/claim_accounts
Diffstat (limited to 'util/src/entities/User.ts')
| -rw-r--r-- | util/src/entities/User.ts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index a5c4c136..9b1c494e 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -163,6 +163,10 @@ export class User extends BaseClass { @Column({ type: "simple-json", select: false }) settings: UserSettings; + + // workaround to prevent fossord-unaware clients from deleting settings not used by them + @Column({ type: "simple-json", select: false }) + extended_settings: string; @Column({ type: "simple-json" }) notes: { [key: string]: string }; //key is ID of user @@ -273,6 +277,7 @@ export class User extends BaseClass { valid_tokens_since: new Date(), }, settings: { ...defaultSettings, locale: language }, + extended_settings: {}, fingerprints: [], notes: {}, }); |