From 25ba9a33a33ba653608e27e15e3cf368e7544b45 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Sat, 2 Oct 2021 18:31:30 +0200
Subject: [PATCH] fds

---
 files/templates/submission.html        | 29 +++++++++++++-------------
 files/templates/submission_banned.html |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index fa0601e7b5..40ceec2e5c 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -1,15 +1,14 @@
 {% extends "default.html" %}
 
 
-{% set title=p.realtitle(v) %}
 {% set ups=p.upvotes %}
 {% set downs=p.downvotes %}
 {% set score=ups-downs %}
 
 {% if v %}
-{% set voted=p.voted if p.voted else 0 %}
+	{% set voted=p.voted if p.voted else 0 %}
 {% else %}
-{% set voted=-2 %}
+	{% set voted=-2 %}
 {% endif %}
 
 {% block title %}
@@ -84,15 +83,15 @@
 <meta property="og:type" content="article" />
 
 {% if comment_info and not comment_info.is_banned and not linked_comment.deleted_utc > 0 %}
-<title>{{'@'+comment_info.author.username}} comments on "{{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}"</title>
+<title>{{'@'+comment_info.author.username}} comments on "{{p.title}} - {{'SITE_NAME' | app_config}}"</title>
 
 
 <meta property="og:article:author" content="{{'@'+comment_info.author.username}}" />
 <meta property="article:published_time" content="{{comment_info.created_datetime}}" />
 {% if comment_info.edited_utc %}<meta property="article:modified_time" content="{{comment_info.edited_string}}" />{% endif %}
-<meta property="og:description" name="description" content="{{comment_info.realbody(v)}}" />
+<meta property="og:description" name="description" content="{{comment_info.body}}" />
 <meta property="og:author" name="author" content="{{'@'+comment_info.author.username}}" />
-<meta property="og:title" content="{{'@'+comment_info.author.username}} comments on {{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}" />
+<meta property="og:title" content="{{'@'+comment_info.author.username}} comments on {{p.title}} - {{'SITE_NAME' | app_config}}" />
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.webp{% endif %}" />
 {% if p.url and p.url.lower().endswith('.mp4') %}
 	<meta property="og:video" content="{{ p.realurl(v) }}" />
@@ -102,9 +101,9 @@
 
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="{{request.host_url}}">
-<meta name="twitter:title" content="{{'@'+comment_info.author.username}} comments on {{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}" />
+<meta name="twitter:title" content="{{'@'+comment_info.author.username}} comments on {{p.title}} - {{'SITE_NAME' | app_config}}" />
 <meta name="twitter:creator" content="{{'@'+comment_info.author.username}}">
-<meta name="twitter:description" content="{{comment_info.realbody(v)}}" />
+<meta name="twitter:description" content="{{comment_info.body}}" />
 <meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.webp{% endif %}" />
 <meta name="twitter:url" content="{{p.permalink | full_link}}" />
 
@@ -113,15 +112,15 @@
 {% endif %}
 
 {% else %}
-<title>{{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}</title>
+<title>{{p.title}} - {{'SITE_NAME' | app_config}}</title>
 
 
 <meta property="og:article:author" content="{{'@'+p.author.username}}" />
 <meta property="article:published_time" content="{{p.created_datetime}}" />
 {% if p.edited_utc %}<meta property="article:modified_time" content="{{p.edited_string}}" />{% endif %}
-<meta property="og:description" name="description" content="{{p.realbody(V)}}" />
+<meta property="og:description" name="description" content="{{p.body}}" />
 <meta property="og:author" name="author" content="{{'@'+p.author.username}}" />
-<meta property="og:title" content="{{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}" />
+<meta property="og:title" content="{{p.title}} - {{'SITE_NAME' | app_config}}" />
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.webp{% endif %}" />
 {% if p.url and p.url.lower().endswith('.mp4') %}
 <meta property="og:video" content="{{ p.realurl(v) }}" />
@@ -131,9 +130,9 @@
 
 <meta name="twitter:card" content="summary_large_image"/>
 <meta name="twitter:site" content="{{request.host_url}}">
-<meta name="twitter:title" content="{{p.realtitle(v)}} - {{'SITE_NAME' | app_config}}" />
+<meta name="twitter:title" content="{{p.title}} - {{'SITE_NAME' | app_config}}" />
 <meta name="twitter:creator" content="{{'@'+p.author.username}}">
-<meta name="twitter:description" content="{{p.realbody(v)}}" />
+<meta name="twitter:description" content="{{p.body}}" />
 <meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb %}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.webp{% endif %}" />
 <meta name="twitter:url" content="{{p.permalink | full_link}}" />
 
@@ -307,12 +306,12 @@
 					{% if p.realurl(v) %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
 							{% if p.club %}<span class="patron font-weight-bolder" style="background-color:red; font-size:12px;">COUNTRY CLUB</span>{% endif %}
-							{{title | safe}}
+							{{p.realtitle(v) | safe}}
 						</a></h1>					
 					{% else %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
 							{% if p.club %}<span class="patron font-weight-bolder" style="background-color:red; font-size:12px;">COUNTRY CLUB</span>{% endif %}
-							{{title | safe}}
+							{{p.realtitle(v) | safe}}
 						</h1>
 					{% endif %}
 
diff --git a/files/templates/submission_banned.html b/files/templates/submission_banned.html
index 509e39aa94..f36412b20b 100644
--- a/files/templates/submission_banned.html
+++ b/files/templates/submission_banned.html
@@ -55,7 +55,7 @@
 												<div id="post-{{p.id}}" class="card d-flex flex-row-reverse flex-nowrap justify-content-end border-0 p-0 {% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
 														<div class="card-block my-md-auto{% if p.is_banned %} banned{% endif %}">
 																<div class="post-meta text-left d-md-none mb-1">{% if p.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}{% if p.is_banned %}[Removed by admins]{% else %}[Deleted by user]{% endif %}</div>
-																<h5 class="card-title post-title text-left mb-0 mb-md-1">{{p.realtitle(v)}}</h5>
+																<h5 class="card-title post-title text-left mb-0 mb-md-1">{{p.title}}</h5>
 																<div class="post-meta text-left d-none d-md-block">{% if p.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}{% if p.is_banned %}[Removed by admins]{% else %}[Deleted by user]{% endif %}</div>
 
 														</div>