Merge remote-tracking branch 'og/develop' into v1.7.0/postgresql

This commit is contained in:
dr-carrot
2024-04-04 11:37:53 -04:00
16 changed files with 78 additions and 59 deletions

View File

@@ -152,11 +152,11 @@ class Media {
@Column({ nullable: true, type: 'varchar' })
public ratingKey4k?: string | null;
@Column({ nullable: true })
public jellyfinMediaId?: string;
@Column({ nullable: true, type: 'varchar' })
public jellyfinMediaId?: string | null;
@Column({ nullable: true })
public jellyfinMediaId4k?: string;
@Column({ nullable: true, type: 'varchar' })
public jellyfinMediaId4k?: string | null;
public serviceUrl?: string;
public serviceUrl4k?: string;