indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Update default categories

merge-requests/30/head
Bob Mottram 2023-04-28 18:44:35 +01:00
parent ec821c7742
commit 0ae7f614d9
2 changed files with 276 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

534
defaultcategories/en.xml
View File

File diff suppressed because one or more lines are too long

18
inbox.py
View File

@ -3768,7 +3768,7 @@ def _bounce_dm(sender_post_id: str, session, http_prefix: str,
translate: {}, debug: bool, translate: {}, debug: bool,
last_bounce_message: [], system_language: str, last_bounce_message: [], system_language: str,
signing_priv_key_pem: str, signing_priv_key_pem: str,
content_license_url: str, dm_license_url: str,
languages_understood: [], languages_understood: [],
bounce_is_chat: bool, bounce_is_chat: bool,
curr_domain: str, onion_domain: str, i2p_domain: str) -> bool: curr_domain: str, onion_domain: str, i2p_domain: str) -> bool:
@ -3832,8 +3832,8 @@ def _bounce_dm(sender_post_id: str, session, http_prefix: str,
subject, debug, schedule_post, subject, debug, schedule_post,
event_date, event_time, event_end_time, event_date, event_time, event_end_time,
location, system_language, conversation_id, location, system_language, conversation_id,
low_bandwidth, content_license_url, low_bandwidth, dm_license_url,
content_license_url, '', dm_license_url, '',
languages_understood, bounce_is_chat, languages_understood, bounce_is_chat,
translate, buy_url) translate, buy_url)
if not post_json_object: if not post_json_object:
@ -3865,7 +3865,7 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
last_bounce_message: [], last_bounce_message: [],
handle: str, system_language: str, handle: str, system_language: str,
signing_priv_key_pem: str, signing_priv_key_pem: str,
content_license_url: str, dm_license_url: str,
languages_understood: [], languages_understood: [],
curr_domain: str, onion_domain: str, i2p_domain: str) -> bool: curr_domain: str, onion_domain: str, i2p_domain: str) -> bool:
"""Is the given message a valid DM? """Is the given message a valid DM?
@ -3967,7 +3967,7 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
last_bounce_message, last_bounce_message,
system_language, system_language,
signing_priv_key_pem, signing_priv_key_pem,
content_license_url, dm_license_url,
languages_understood, languages_understood,
bounce_chat, bounce_chat,
curr_domain, curr_domain,
@ -4234,7 +4234,7 @@ def _inbox_after_initial(server, inbox_start_time,
signing_priv_key_pem: str, signing_priv_key_pem: str,
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
cw_lists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
content_license_url: str, dm_license_url: str,
languages_understood: [], languages_understood: [],
mitm: bool, bold_reading: bool, mitm: bool, bold_reading: bool,
dogwhistles: {}, dogwhistles: {},
@ -4666,7 +4666,7 @@ def _inbox_after_initial(server, inbox_start_time,
last_bounce_message, last_bounce_message,
handle, system_language, handle, system_language,
signing_priv_key_pem, signing_priv_key_pem,
content_license_url, dm_license_url,
languages_understood, languages_understood,
domain, domain,
onion_domain, i2p_domain): onion_domain, i2p_domain):
@ -6054,7 +6054,7 @@ def run_inbox_queue(server,
inbox_start_time = time.time() inbox_start_time = time.time()
lists_enabled = get_config_param(base_dir, "listsEnabled") lists_enabled = get_config_param(base_dir, "listsEnabled")
content_license_url = get_config_param(base_dir, "contentLicenseUrl") dm_license_url = ''
fitness_performance(inbox_start_time, server.fitness, fitness_performance(inbox_start_time, server.fitness,
'INBOX', 'distribute_post', 'INBOX', 'distribute_post',
@ -6102,7 +6102,7 @@ def run_inbox_queue(server,
signing_priv_key_pem, signing_priv_key_pem,
default_reply_interval_hrs, default_reply_interval_hrs,
cw_lists, lists_enabled, cw_lists, lists_enabled,
content_license_url, dm_license_url,
languages_understood, mitm, languages_understood, mitm,
bold_reading, dogwhistles, bold_reading, dogwhistles,
max_hashtags, server.buy_sites) max_hashtags, server.buy_sites)