From 0883b3245bf0deb9106c4041e9afbd3521b79280 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 19 Apr 2018 11:01:34 +0200 Subject: Add ability to choose what policy we have for NSFW videos There is a global instance setting and a per user setting --- shared/models/users/user-update-me.model.ts | 4 +++- shared/models/users/user.model.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'shared/models/users') diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts index b84233329..0a73879ed 100644 --- a/shared/models/users/user-update-me.model.ts +++ b/shared/models/users/user-update-me.model.ts @@ -1,6 +1,8 @@ +import { NSFWPolicyType } from '../videos/nsfw-policy.type' + export interface UserUpdateMe { description?: string - displayNSFW?: boolean + nsfwPolicy?: NSFWPolicyType autoPlayVideo?: boolean email?: string password?: string diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index b5f459f31..188e29ede 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts @@ -1,12 +1,13 @@ import { Account } from '../actors' import { VideoChannel } from '../videos/video-channel.model' import { UserRole } from './user-role' +import { NSFWPolicyType } from '../videos/nsfw-policy.type' export interface User { id: number username: string email: string - displayNSFW: boolean + nsfwPolicy: NSFWPolicyType autoPlayVideo: boolean role: UserRole videoQuota: number -- cgit v1.2.3