diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 77af955f9..7b5f88f7a 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -92,7 +92,7 @@ def execute_snappy(post, v): body += "\n\n" - if post.url and not post.url.startswith(SITE_FULL) and not post.url.startswith('/') and not post.url.startswith('https://rdrama.org/'): + if post.url and not post.url.startswith(SITE_FULL) and not post.url.startswith('/') and not post.url.startswith(f'https://{BAN_EVASION_DOMAIN}'): if post.url.startswith('https://old.reddit.com/r/'): rev = post.url.replace('https://old.reddit.com/', '') rev = f"* [unddit.com](https://unddit.com/{rev})\n" @@ -121,7 +121,7 @@ def execute_snappy(post, v): for href, title in captured: - if href.startswith(SITE_FULL) or href.startswith('https://rdrama.org/'): continue + if href.startswith(SITE_FULL) or href.startswith(f'https://{BAN_EVASION_DOMAIN}'): continue if "Snapshots:\n\n" not in body: body += "Snapshots:\n\n" diff --git a/files/helpers/const.py b/files/helpers/const.py index d26acdc2a..d3de290f1 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -517,6 +517,8 @@ bots = {AUTOJANNY_ID, SNAPPY_ID, LONGPOSTBOT_ID, ZOZBOT_ID, BASEDBOT_ID} COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR} +BAN_EVASION_DOMAIN = 'rdrama.life' + AWARDS = { ### Deprecated "ghost": { @@ -1227,6 +1229,7 @@ proxies = {"http":PROXY_URL,"https":PROXY_URL} approved_embed_hosts = { SITE, 'rdrama.net', + BAN_EVASION_DOMAIN, 'pcmemes.net', 'watchpeopledie.tv', 'imgur.com', @@ -1343,6 +1346,7 @@ EMAIL_REGEX_PATTERN = '[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{2,63}\.[A-Za-z]{2,63 BOOSTED_SITES = { 'rdrama.net', + BAN_EVASION_DOMAIN, 'pcmemes.net', 'watchpeopledie.tv', 'themotte.org', diff --git a/files/templates/comments.html b/files/templates/comments.html index 210b166cc..a3a50ac5a 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -399,7 +399,7 @@ Context - + {% if v %} {% if not c.deleted_utc %} @@ -611,7 +611,7 @@ Context - + {% if v %} diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html index 8d9f944ab..9ad462af1 100644 --- a/files/templates/post_actions.html +++ b/files/templates/post_actions.html @@ -12,7 +12,7 @@ {% endif %} - + {% if v %} diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html index 5bb481db0..52a37a951 100644 --- a/files/templates/post_actions_mobile.html +++ b/files/templates/post_actions_mobile.html @@ -8,7 +8,7 @@ {% if v and ((not p.ghost and v.admin_level >= PERMS['VOTES_VISIBLE']) or v.id == AEVANN_ID) %}{% endif %} - +