diff --git a/env b/env index c46bb6fb7..0aa8bc190 100644 --- a/env +++ b/env @@ -24,7 +24,6 @@ export DEFAULT_TIME_FILTER="all" export GUMROAD_TOKEN="blahblahblah" export GUMROAD_LINK="blahblahblah" export GUMROAD_ID="blahblahblah" -export CARD_VIEW="0" export DISABLE_DOWNVOTES="0" export DEFAULT_THEME="midnight" export DEFAULT_COLOR="805ad5" diff --git a/files/classes/user.py b/files/classes/user.py index fb4f8390c..0f170c7e2 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -47,7 +47,7 @@ class User(Base): titlecolor = Column(String, default=DEFAULT_COLOR) theme = Column(String, default=DEFAULT_THEME) themecolor = Column(String, default=DEFAULT_COLOR) - cardview = Column(Boolean, default=CARD_VIEW) + cardview = Column(Boolean, default=False) song = Column(String) highres = Column(String) profileurl = Column(String) diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 97c10290e..b1f7e1ae9 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -30,7 +30,6 @@ GUMROAD_ID = environ.get("GUMROAD_ID", DEFAULT_CONFIG_VALUE).strip() DISABLE_DOWNVOTES = bool(int(environ.get("DISABLE_DOWNVOTES", "0").strip())) DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip() DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip() -CARD_VIEW = bool(int(environ.get("CARD_VIEW", "0").strip())) EMAIL = environ.get("EMAIL", "blahblahblah@gmail.com").strip() MAILGUN_KEY = environ.get("MAILGUN_KEY", DEFAULT_CONFIG_VALUE).strip() DESCRIPTION = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip() diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index d01fd2b24..f7560d143 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -235,24 +235,24 @@ {% endif %} - {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %} + {% if p.is_image and not p.over_18 and ((v and v.cardview)) %}
Unable to load image
{% elif p.is_video %} -
+

{% elif p.is_audio %} -
+
{% elif p.is_youtube %} -
+
{{p.embed_url | safe}}
{% endif %}