From 2dd9bd9abd1f5aaf4dae5af0460b09b6406b27ff Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 3 Feb 2019 17:54:56 +0000
Subject: [PATCH] Add setting to hide mature content from ContentDB

---
 builtin/mainmenu/dlg_contentstore.lua | 11 ++++++++---
 builtin/settingtypes.txt              | 13 +++++++++++++
 src/defaultsettings.cpp               |  8 ++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index ab55e3848..655e596d4 100644
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -285,9 +285,14 @@ function store.load()
 	local show_nonfree = core.settings:get_bool("show_nonfree_packages")
 	local url = base_url ..
 		"/api/packages/?type=mod&type=game&type=txp&protocol_version=" ..
-		core.get_max_supp_proto() ..
-		"&nonfree=" ..
-		(show_nonfree and "true" or "false")
+		core.get_max_supp_proto()
+
+	for _, item in pairs(core.settings:get("contentdb_flag_blacklist"):split(",")) do
+		item = item:trim()
+		if item ~= "" then
+			url = url .. "&hide=" .. item
+		end
+	end
 
 	core.download_file(url, target)
 
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 813016581..b2b139bac 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1515,3 +1515,16 @@ main_menu_mod_mgr (Main menu mod manager) int 1
 
 #    Print the engine's profiling data in regular intervals (in seconds). 0 = disable. Useful for developers.
 profiler_print_interval (Engine profiling data print interval) int 0
+
+[Content Store]
+
+#    The URL for the content repository
+contentdb_url (ContentDB URL) string https://content.minetest.net
+
+#    Comma-separated list of flags to hide in the content repository.
+#    "nonfree" can be used to hide packages which do not qualify as 'free software',
+#    as defined by the Free Software Foundation.
+#    You can also specify content ratings.
+#    These flags are independent from Minetest versions,
+#    so see a full list at https://content.minetest.net/help/content_flags/
+contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 2588f3542..d0c7b4f5e 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -255,6 +255,14 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("font_size", font_size_str);
 	settings->setDefault("mono_font_size", font_size_str);
 	settings->setDefault("contentdb_url", "https://content.minetest.net");
+<<<<<<< HEAD
+=======
+#ifdef __ANDROID__
+	settings->setDefault("contentdb_flag_blacklist", "nonfree, android_default");
+#else
+	settings->setDefault("contentdb_flag_blacklist", "nonfree, desktop_default");
+#endif
+>>>>>>> 626b0b7e... Add setting to hide mature content from ContentDB
 
 
 	// Server