diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-17 10:48:56 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-17 10:48:56 +0200 |
commit | bb5d90e62f631af3c899fbe586485e64938a5927 (patch) | |
tree | 8dc28c7027a52bed76bcc7e117da290ff7a58b6b /client/src/app/shared | |
parent | bcf21a376f1e26cb3e74236e4cc41909310d4c32 (diff) | |
parent | a73115f31ae891cb47759f075b1d2cead40817a4 (diff) | |
download | PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.tar.gz PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.tar.zst PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.zip |
Merge branch 'feature/webtorrent-disabling' into develop
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/users/user.model.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts index 877f1bf3a..7c840ffa7 100644 --- a/client/src/app/shared/users/user.model.ts +++ b/client/src/app/shared/users/user.model.ts | |||
@@ -18,6 +18,7 @@ export type UserConstructorHash = { | |||
18 | videoQuota?: number, | 18 | videoQuota?: number, |
19 | videoQuotaDaily?: number, | 19 | videoQuotaDaily?: number, |
20 | nsfwPolicy?: NSFWPolicyType, | 20 | nsfwPolicy?: NSFWPolicyType, |
21 | webTorrentEnabled?: boolean, | ||
21 | autoPlayVideo?: boolean, | 22 | autoPlayVideo?: boolean, |
22 | createdAt?: Date, | 23 | createdAt?: Date, |
23 | account?: AccountServerModel, | 24 | account?: AccountServerModel, |
@@ -32,6 +33,7 @@ export class User implements UserServerModel { | |||
32 | email: string | 33 | email: string |
33 | role: UserRole | 34 | role: UserRole |
34 | nsfwPolicy: NSFWPolicyType | 35 | nsfwPolicy: NSFWPolicyType |
36 | webTorrentEnabled: boolean | ||
35 | autoPlayVideo: boolean | 37 | autoPlayVideo: boolean |
36 | videoQuota: number | 38 | videoQuota: number |
37 | videoQuotaDaily: number | 39 | videoQuotaDaily: number |
@@ -52,6 +54,7 @@ export class User implements UserServerModel { | |||
52 | this.videoQuota = hash.videoQuota | 54 | this.videoQuota = hash.videoQuota |
53 | this.videoQuotaDaily = hash.videoQuotaDaily | 55 | this.videoQuotaDaily = hash.videoQuotaDaily |
54 | this.nsfwPolicy = hash.nsfwPolicy | 56 | this.nsfwPolicy = hash.nsfwPolicy |
57 | this.webTorrentEnabled = hash.webTorrentEnabled | ||
55 | this.autoPlayVideo = hash.autoPlayVideo | 58 | this.autoPlayVideo = hash.autoPlayVideo |
56 | this.createdAt = hash.createdAt | 59 | this.createdAt = hash.createdAt |
57 | this.blocked = hash.blocked | 60 | this.blocked = hash.blocked |