import { hasUserRight } from '@shared/core-utils/users'
import {
ActorImage,
+ HTMLServerConfig,
NSFWPolicyType,
User as UserServerModel,
UserAdminFlag,
autoPlayVideo: boolean
autoPlayNextVideo: boolean
autoPlayNextVideoPlaylist: boolean
- webTorrentEnabled: boolean
+
+ p2pEnabled: boolean
+ // FIXME: deprecated in 4.1
+ webTorrentEnabled: never
+
videosHistoryEnabled: boolean
videoLanguages: string[]
lastLoginDate: Date | null
+ twoFactorEnabled: boolean
+
createdAt: Date
constructor (hash: Partial<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
this.notificationSettings = hash.notificationSettings
+ this.twoFactorEnabled = hash.twoFactorEnabled
+
this.createdAt = hash.createdAt
this.pluginAuth = hash.pluginAuth
}
}
- updateAccountAvatar (newAccountAvatar?: ActorImage) {
- if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar)
+ updateAccountAvatar (newAccountAvatars?: ActorImage[]) {
+ if (newAccountAvatars) this.account.updateAvatar(newAccountAvatars)
else this.account.resetAvatar()
}
return this.videoQuota === 0 || this.videoQuotaDaily === 0
}
- isAutoBlocked () {
+ isAutoBlocked (serverConfig: HTMLServerConfig) {
+ if (serverConfig.autoBlacklist.videos.ofUsers.enabled !== true) return false
+
return this.role === UserRole.USER && this.adminFlags !== UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST
}
}