From e129375fb8b3d16242dcf3e23e45c72f7e6f7b59 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 9 Dec 2021 22:30:14 +0200
Subject: [PATCH] fdsfsd

---
 files/__main__.py               | 1 -
 files/classes/comment.py        | 4 +++-
 files/helpers/sanitize.py       | 6 ++++++
 files/templates/comments.html   | 2 +-
 files/templates/submission.html | 8 ++++----
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/files/__main__.py b/files/__main__.py
index dec99ea7f..de8ff43f9 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -128,5 +128,4 @@ def after_request(response):
 	response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self' tls-use1.fpapi.io api.fpjs.io 02ddcc80-b8db-42be-9022-44c546b4dce6.pushnotifications.pusher.com; object-src 'none';")
 	return response
 
-
 from files.routes import *
\ No newline at end of file
diff --git a/files/classes/comment.py b/files/classes/comment.py
index 164a7b775..4478e9052 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -401,7 +401,9 @@ class Comment(Base):
 		for o in self.options:
 			html += f'<div class="custom-control"><input type="checkbox" class="custom-control-input" id="{o.id}" name="option"'
 			if o.poll_voted(v): html += " checked"
-			html += f''' onchange="poll_vote('{o.id}', '{self.id}')"><label class="custom-control-label" for="{o.id}">{o.body_html}<span class="presult-{self.id}'''
+			if v: html += f''' onchange="poll_vote('{o.id}', '{self.id}')"'''
+			else: html += f''' onchange="poll_vote_no_v('{o.id}', '{self.id}')"'''
+			html += f'''><label class="custom-control-label" for="{o.id}">{o.body_html}<span class="presult-{self.id}'''
 			if not self.total_poll_voted(v): html += ' d-none'	
 			html += f'"> - <a href="/votes?link=t3_{o.id}"><span id="poll-{o.id}">{o.upvotes}</span> votes</a></span></label></div><pre></pre>'
 		return html
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index b25a1e5ee..ed8f2eac0 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -39,6 +39,9 @@ allowed_tags = tags = ['b',
 						'a',
 						'img',
 						'span',
+						'ruby',
+						'rp',
+						'rt',
 						]
 
 no_images = ['b',
@@ -71,6 +74,9 @@ no_images = ['b',
 						'marquee',
 						'a',
 						'span',
+						'ruby',
+						'rp',
+						'rt',
 						]
 
 def sanitize_marquee(tag, name, value):
diff --git a/files/templates/comments.html b/files/templates/comments.html
index ac5050d5b..edfb51e1b 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -761,7 +761,7 @@
 {% include "expanded_image_modal.html" %}
 
 <script src="/assets/js/popover.js?v=10"></script>
-<script src="/assets/js/comments.js?v=8"></script>
+<script src="/assets/js/comments.js?v=9"></script>
 
 <script>
 	{% if p and (not v or v.highlightcomments) %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 3b4aaa3d2..45dca3a83 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -417,9 +417,9 @@
 							{% if p.domain == "twitter.com" %}
 								{{p.embed_url | safe}}
 								{% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %}
-									<script src="/assets/js/twitterlight.js?v=4"></script>
+									<script src="/assets/js/twitterlight.js?v=5"></script>
 								{% else %}
-									<script src="/assets/js/twitter.js?v=4"></script>
+									<script src="/assets/js/twitter.js?v=5"></script>
 								{% endif %}
 							{% elif p.domain in ['youtu.be','youtube.com'] and p.embed_url and p.embed_url.startswith('<lite-youtube') %}
 								{{p.embed_url | safe}}
@@ -460,7 +460,7 @@
 
 							{% for c in p.options %}
 								<div class="custom-control">								
-									<input type="checkbox" class="custom-control-input" id="{{c.id}}" name="option" {% if c.poll_voted(v) %}checked{% endif %} onchange="poll_vote('{{c.id}}')">
+									<input type="checkbox" class="custom-control-input" id="{{c.id}}" name="option" {% if c.poll_voted(v) %}checked{% endif %} onchange="{% if v %}poll_vote('{{c.id}}'){% else %}poll_vote_no_v(){% endif %}">
 									<label class="custom-control-label" for="{{c.id}}">{{c.body_html | safe}}<span class="presult {% if not p.total_poll_voted(v) %}d-none{% endif %}"> - <a href="/votes?link=t3_{{c.id}}"><span id="poll-{{c.id}}">{{c.upvotes}}</span> votes</a></span></label>
 								</div>
 							{% endfor %}
@@ -873,7 +873,7 @@
 			{% include "ban_modal.html" %}
 		{% endif %}
 	{% endif %}
-	<script src="/assets/js/comments.js?v=8"></script>
+	<script src="/assets/js/comments.js?v=9"></script>
 	{% include "expanded_image_modal.html" %}
 {% endif %}