Merge remote-tracking branch 'overseerr/develop' into develop

2022-12-16 19:58:30 +13:00
parent a2babb83ad 76a7ceb758
commit afcb096f49
32 changed files with 711 additions and 152 deletions
--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -39,7 +39,7 @@ export class User {
    return users.map((u) => u.filter(showFiltered));
  }

-  static readonly filteredFields: string[] = ['email'];
+  static readonly filteredFields: string[] = ['email', 'plexId'];

  public displayName: string;

@@ -76,7 +76,7 @@ export class User {
  @Column({ type: 'integer', default: UserType.PLEX })
  public userType: UserType;

-  @Column({ nullable: true })
+  @Column({ nullable: true, select: true })
  public plexId?: number;

  @Column({ nullable: true })