From ec821c7742f8ecf4f17c29ee51bd467896707364 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 28 Apr 2023 13:38:21 +0100 Subject: [PATCH] dms have a different license --- daemon.py | 8 +++++--- posts.py | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index be89dcaa0..547cf60ae 100644 --- a/daemon.py +++ b/daemon.py @@ -710,7 +710,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.system_language, conversation_id, self.server.low_bandwidth, - self.server.content_license_url, + self.server.dm_license_url, self.server.content_license_url, '', languages_understood, False, self.server.translate, buy_url) @@ -21619,6 +21619,7 @@ class PubServer(BaseHTTPRequestHandler): if fields.get('replychatmsg'): reply_is_chat = fields['replychatmsg'] + dm_license_url = self.server.dm_license_url media_license_url = content_license_url if fields.get('mediaLicense'): media_license_url = fields['mediaLicense'] @@ -21659,7 +21660,7 @@ class PubServer(BaseHTTPRequestHandler): fields['languagesDropdown'], conversation_id, self.server.low_bandwidth, - content_license_url, + dm_license_url, media_license_url, media_creator, languages_understood, @@ -21792,7 +21793,7 @@ class PubServer(BaseHTTPRequestHandler): fields['languagesDropdown'], conversation_id, self.server.low_bandwidth, - self.server.content_license_url, + self.server.dm_license_url, media_license_url, media_creator, languages_understood, @@ -23500,6 +23501,7 @@ def run_daemon(max_hashtags: int, if not content_license_url: content_license_url = 'https://creativecommons.org/licenses/by-nc/4.0' httpd.content_license_url = content_license_url + httpd.dm_license_url = '' # fitness metrics fitness_filename = base_dir + '/accounts/fitness.json' diff --git a/posts.py b/posts.py index 7098deb73..89150e3bb 100644 --- a/posts.py +++ b/posts.py @@ -1138,6 +1138,8 @@ def _attach_post_license(post_json_object: {}, represent license information on ActivityPub posts, so this might need to change if such a consensus appears. """ + if not content_license_url: + return post_json_object['attachment'].append({ "type": "PropertyValue", "name": "license",