X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fusers%2Fuser.model.ts;h=6ba30e4b81f22425da822448918a99ac906d2bca;hb=7b51ede977c299a74728171d8c124bcc4cbba6ea;hp=5e1fb1c8d6942aaeaa32d8420ab754042a682af6;hpb=4e1592daa41f81667f914f37d36795e8c6c046c3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts index 5e1fb1c8d..6ba30e4b8 100644 --- a/client/src/app/core/users/user.model.ts +++ b/client/src/app/core/users/user.model.ts @@ -2,6 +2,7 @@ import { Account } from '@app/shared/shared-main/account/account.model' import { hasUserRight } from '@shared/core-utils/users' import { ActorImage, + HTMLServerConfig, NSFWPolicyType, User as UserServerModel, UserAdminFlag, @@ -25,7 +26,11 @@ export class User implements UserServerModel { autoPlayVideo: boolean autoPlayNextVideo: boolean autoPlayNextVideoPlaylist: boolean - webTorrentEnabled: boolean + + p2pEnabled: boolean + // FIXME: deprecated in 4.1 + webTorrentEnabled: never + videosHistoryEnabled: boolean videoLanguages: string[] @@ -55,6 +60,7 @@ export class User implements UserServerModel { noInstanceConfigWarningModal: boolean noWelcomeModal: boolean + noAccountSetupWarningModal: boolean pluginAuth: string | null @@ -82,7 +88,7 @@ export class User implements UserServerModel { this.videoCommentsCount = hash.videoCommentsCount this.nsfwPolicy = hash.nsfwPolicy - this.webTorrentEnabled = hash.webTorrentEnabled + this.p2pEnabled = hash.p2pEnabled this.autoPlayVideo = hash.autoPlayVideo this.autoPlayNextVideo = hash.autoPlayNextVideo this.autoPlayNextVideoPlaylist = hash.autoPlayNextVideoPlaylist @@ -98,6 +104,7 @@ export class User implements UserServerModel { this.noInstanceConfigWarningModal = hash.noInstanceConfigWarningModal this.noWelcomeModal = hash.noWelcomeModal + this.noAccountSetupWarningModal = hash.noAccountSetupWarningModal this.notificationSettings = hash.notificationSettings @@ -125,8 +132,8 @@ export class User implements UserServerModel { } } - updateAccountAvatar (newAccountAvatar?: ActorImage) { - if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar) + updateAccountAvatar (newAccountAvatars?: ActorImage[]) { + if (newAccountAvatars) this.account.updateAvatar(newAccountAvatars) else this.account.resetAvatar() } @@ -134,29 +141,9 @@ export class User implements UserServerModel { return this.videoQuota === 0 || this.videoQuotaDaily === 0 } - isAutoBlocked () { - return this.role === UserRole.USER && this.adminFlags !== UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST - } - - hasNoQuotaLeft () { - // unlimited videoQuota - if (this.videoQuota === -1) return false - - // no more videoQuota - if (!this.videoQuotaUsed) return true + isAutoBlocked (serverConfig: HTMLServerConfig) { + if (serverConfig.autoBlacklist.videos.ofUsers.enabled !== true) return false - // videoQuota left lower than 10% - return this.videoQuotaUsed > this.videoQuota * 0.9 - } - - hasNoQuotaLeftDaily () { - // unlimited videoQuotaDaily - if (this.videoQuotaDaily === -1) return false - - // no more videoQuotaDaily - if (!this.videoQuotaUsedDaily) return true - - // videoQuotaDaily left lower than 10% - return this.videoQuotaUsedDaily > this.videoQuotaDaily * 0.9 + return this.role === UserRole.USER && this.adminFlags !== UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST } }