From 41b3bf129c4c3a1f8075d32960a8d7f241e5fe5b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 28 Dec 2022 11:43:11 +0000 Subject: [PATCH] Switch default content license to noncommercial This may deter some sketchy databrokering --- daemon.py | 5 +++-- desktop_client.py | 2 +- epicyon.py | 3 ++- tests.py | 30 +++++++++++++++--------------- webapp_profile.py | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/daemon.py b/daemon.py index bc2599767..37a66489f 100644 --- a/daemon.py +++ b/daemon.py @@ -6470,7 +6470,8 @@ class PubServer(BaseHTTPRequestHandler): license_str else: license_str = \ - 'https://creativecommons.org/licenses/by/4.0' + 'https://creativecommons.org/' + \ + 'licenses/by-nc/4.0' set_config_param(base_dir, 'contentLicenseUrl', license_str) @@ -22555,7 +22556,7 @@ def run_daemon(max_hashtags: int, # license for content of the instance if not content_license_url: - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' httpd.content_license_url = content_license_url # fitness metrics diff --git a/desktop_client.py b/desktop_client.py index 8633cd3df..9a21a3d6b 100644 --- a/desktop_client.py +++ b/desktop_client.py @@ -1419,7 +1419,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str, # TODO: this should probably be retrieved somehow from the server signing_priv_key_pem = None - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' blocked_cache = {} languages_understood = [] diff --git a/epicyon.py b/epicyon.py index 47ef8ee1a..7f04ccdfa 100644 --- a/epicyon.py +++ b/epicyon.py @@ -149,7 +149,8 @@ def _command_options() -> None: default=None, help='Location for an event when sending a c2s post') parser.add_argument('--content_license_url', type=str, - default='https://creativecommons.org/licenses/by/4.0', + default='https://creativecommons.org/' + + 'licenses/by-nc/4.0', help='Url of the license used for the ' + 'instance content') parser.add_argument('--import_emoji', type=str, diff --git a/tests.py b/tests.py index 58f51b6a9..be4fe4f3f 100644 --- a/tests.py +++ b/tests.py @@ -770,7 +770,7 @@ def create_server_alice(path: str, domain: str, port: int, test_is_article = False conversation_id = None translate = {} - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' create_public_post(path, nickname, domain, port, http_prefix, "No wise fish would go anywhere without a porpoise", test_save_to_file, @@ -839,7 +839,7 @@ def create_server_alice(path: str, domain: str, port: int, max_like_count = 10 default_reply_interval_hrs = 9999999999 lists_enabled = '' - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' dyslexic_font = False crawlers_allowed = [] check_actor_timeout = 2 @@ -933,7 +933,7 @@ def create_server_bob(path: str, domain: str, port: int, test_location = None test_is_article = False conversation_id = None - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' translate = {} create_public_post(path, nickname, domain, port, http_prefix, "It's your life, live it your way.", @@ -1003,7 +1003,7 @@ def create_server_bob(path: str, domain: str, port: int, max_like_count = 10 default_reply_interval_hrs = 9999999999 lists_enabled = '' - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' dyslexic_font = False crawlers_allowed = [] check_actor_timeout = 2 @@ -1089,7 +1089,7 @@ def create_server_eve(path: str, domain: str, port: int, federation_list: [], low_bandwidth = True default_reply_interval_hrs = 9999999999 lists_enabled = '' - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' dyslexic_font = False crawlers_allowed = [] check_actor_timeout = 2 @@ -1177,7 +1177,7 @@ def create_server_group(path: str, domain: str, port: int, low_bandwidth = True default_reply_interval_hrs = 9999999999 lists_enabled = '' - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' dyslexic_font = False crawlers_allowed = [] check_actor_timeout = 2 @@ -1229,7 +1229,7 @@ def test_post_message_between_servers(base_dir: str) -> None: languages_understood = [system_language] http_prefix = 'http' proxy_type = None - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' if os.path.isdir(base_dir + '/.tests'): shutil.rmtree(base_dir + '/.tests', ignore_errors=False, onerror=None) @@ -1559,7 +1559,7 @@ def test_follow_between_servers(base_dir: str) -> None: http_prefix = 'http' proxy_type = None federation_list = [] - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' if os.path.isdir(base_dir + '/.tests'): shutil.rmtree(base_dir + '/.tests', ignore_errors=False, onerror=None) @@ -1753,7 +1753,7 @@ def test_shared_items_federation(base_dir: str) -> None: http_prefix = 'http' proxy_type = None federation_list = [] - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' if os.path.isdir(base_dir + '/.tests'): shutil.rmtree(base_dir + '/.tests', ignore_errors=False, onerror=None) @@ -2175,7 +2175,7 @@ def test_group_follow(base_dir: str) -> None: http_prefix = 'http' proxy_type = None federation_list = [] - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' if os.path.isdir(base_dir + '/.tests'): shutil.rmtree(base_dir + '/.tests', ignore_errors=False, onerror=None) @@ -2869,7 +2869,7 @@ def _test_create_person_account(base_dir: str): conversation_id = None low_bandwidth = True translate = {} - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' content = \ "If your \"independent organization\" is government funded...\n\n" + \ "(yawn)\n\n...then it's not really independent.\n\n" + \ @@ -2992,7 +2992,7 @@ def test_client_to_server(base_dir: str): global TEST_SERVER_ALICE_RUNNING global TEST_SERVER_BOB_RUNNING - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' TEST_SERVER_ALICE_RUNNING = False TEST_SERVER_BOB_RUNNING = False @@ -4693,7 +4693,7 @@ def _test_reply_to_public_post(base_dir: str) -> None: test_is_article = False conversation_id = None low_bandwidth = True - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' translate = {} reply = \ create_public_post(base_dir, nickname, domain, port, http_prefix, @@ -5643,7 +5643,7 @@ def _test_links_within_post(base_dir: str) -> None: test_is_article = False conversation_id = None low_bandwidth = True - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' translate = {} post_json_object = \ @@ -6733,7 +6733,7 @@ def _test_can_replyto(base_dir: str) -> None: test_is_article = False conversation_id = None low_bandwidth = True - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' translate = {} post_json_object = \ diff --git a/webapp_profile.py b/webapp_profile.py index ed5f0fc2a..eb87ac8e0 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1537,7 +1537,7 @@ def _html_edit_profile_instance(base_dir: str, translate: {}, content_license_url = \ get_config_param(base_dir, 'contentLicenseUrl') if not content_license_url: - content_license_url = 'https://creativecommons.org/licenses/by/4.0' + content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' instance_str = begin_edit_section(translate['Instance Settings'])