diff --git a/files/classes/post.py b/files/classes/post.py index a3df8224a..c47625086 100644 --- a/files/classes/post.py +++ b/files/classes/post.py @@ -278,10 +278,6 @@ class Post(Base): if self.distinguished and SITE_NAME == 'WPD': return 0 - #DELETE_ME_PLS - if not v and kind == "ricardo": - return 0 - num = len([x for x in self.awards if x.kind == kind]) if kind in {"shit", "fireflies", "tilt"}: diff --git a/files/helpers/can_see.py b/files/helpers/can_see.py index 3d5a64b7a..45563109c 100644 --- a/files/helpers/can_see.py +++ b/files/helpers/can_see.py @@ -4,20 +4,8 @@ from files.classes.comment import Comment from files.classes.hole import Hole from flask import request -#DELETE_ME_PLS -words_to_hide = ('israel', 'isreal', 'palest', 'muslim', 'islam', 'hamas', 'jew', 'zion', 'gaza', 'rafah', 'isis', 'terror', 'iraq', 'allah', 'mohammad', 'muhammad', 'mohammed', 'muhammed', 'mohamad', 'muhamad', 'mohamed', 'muhamed') - def can_see(user, obj): if isinstance(obj, (Post, Comment)): - #DELETE_ME_PLS - if not user: - if obj.nsfw: - return False - if any((x in obj.body.lower() for x in words_to_hide)): - return False - if isinstance(obj, Post) and obj.hole == 'sandshit': - return False - if not can_see(user, obj.author): return False if user and user.id == obj.author_id: return True if isinstance(obj, Post): @@ -48,8 +36,6 @@ def can_see(user, obj): if obj.name == 'chudrama': return bool(user) and user.can_see_chudrama if obj.name == 'countryclub': return bool(user) and user.can_see_countryclub if obj.name == 'highrollerclub': return bool(user) and user.can_see_highrollerclub - #DELETE_ME_PLS - if obj.name == 'fascism': return bool(user) elif obj.__class__.__name__ == 'User': return not obj.shadowbanned or (user and user.id == obj.id) or (user and user.admin_level >= PERMS['USER_SHADOWBAN']) return True diff --git a/files/templates/home.html b/files/templates/home.html index 00fe2a1ae..2706069e5 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -6,11 +6,8 @@ {% elif request.path == '/' %} {% if IS_DKD() %} Kongrama - {# DELETE_ME_PLS #} - {% elif v %} - {{SITE_NAME}}{% if TAGLINES %}: {{TAGLINES|random}}{% endif %} {% else %} - {{SITE_NAME}}{% if TAGLINES %}: {{TAGLINES[0]}}{% endif %} + {{SITE_NAME}}{% if TAGLINES %}: {{TAGLINES|random}}{% endif %} {% endif %} {% else %} {{super()}} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index ff088f5fc..9b3bd1339 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -19,11 +19,7 @@ - {# DELETE_ME_PLS #} - {% if not v %} - {% set image = SITE_FULL_IMAGES + "/i/WPD/sidebar/622.webp?x=8" %} - {% set expanded_image = image|expand_art %} - {% elif hole and hole.sidebarurls %} + {% if hole and hole.sidebarurls %} {% set image = hole.random_sidebar %} {% elif IS_FISTMAS() %} {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index c4128329a..816416e65 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -15,11 +15,7 @@ - {# DELETE_ME_PLS #} - {% if not v %} - {% set image = SITE_FULL_IMAGES + "/i/rDrama/sidebar/2464.webp?x=8" %} - {% set expanded_image = image|expand_art %} - {% elif hole and hole.sidebarurls %} + {% if hole and hole.sidebarurls %} {% set image = hole.random_sidebar %} {% elif IS_FISTMAS() %} {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %}