From 0883b3245bf0deb9106c4041e9afbd3521b79280 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
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
---
 config/default.yaml            | 3 +++
 config/production.yaml.example | 3 +++
 config/test.yaml               | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'config')

diff --git a/config/default.yaml b/config/default.yaml
index 9f4a76621..25dde72c9 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -84,6 +84,9 @@ instance:
   description: 'Welcome to this PeerTube instance!' # Support markdown
   terms: 'No terms for now.' # Support markdown
   default_client_route: '/videos/trending'
+  # By default, "do_not_list" or "blur" or "display" NSFW videos
+  # Could be overridden per user with a setting
+  default_nsfw_policy: 'do_not_list'
   customizations:
     javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
     css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/config/production.yaml.example b/config/production.yaml.example
index fc06c51fb..1d7d35c9c 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -100,6 +100,9 @@ instance:
   description: '' # Support markdown
   terms: '' # Support markdown
   default_client_route: '/videos/trending'
+  # By default, "do_not_list" or "blur" or "display" NSFW videos
+  # Could be overridden per user with a setting
+  default_nsfw_policy: 'do_not_list'
   customizations:
     javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
     css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/config/test.yaml b/config/test.yaml
index 7e395db04..020987920 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -32,3 +32,6 @@ transcoding:
     480p: true
     720p: true
     1080p: true
+
+instance:
+  default_nsfw_policy: 'display'
\ No newline at end of file
-- 
cgit v1.2.3