From e59bcfc467186a48511826b95212e1f7ed1e39c4 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 14 Jan 2022 06:38:27 +0200
Subject: [PATCH] bb

---
 files/classes/submission.py             | 2 +-
 files/helpers/sanitize.py               | 4 ++--
 files/templates/formatting.html         | 2 +-
 files/templates/submission.html         | 2 +-
 files/templates/submission_listing.html | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index 6d87b7da7..4b5a1e8d3 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -424,7 +424,7 @@ class Submission(Base):
 	@property
 	@lazy
 	def is_video(self):
-		return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov', '#t=0.1')))
+		return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov')))
 
 	@property
 	@lazy
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 8db6bdf93..866233edc 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -247,9 +247,9 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False):
 
 		sanitized = sanitized.replace(replacing, htmlsource)
 	for i in re.finditer('>(https://.*?\.(mp4|webm|mov))</a></p>', sanitized):
-		sanitized = sanitized.replace(f'<p><a href="{i.group(1)}" rel="nofollow noopener noreferrer" target="_blank">{i.group(1)}</a></p>', f'<p><video controls preload="metadata" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
+		sanitized = sanitized.replace(f'<p><a href="{i.group(1)}" rel="nofollow noopener noreferrer" target="_blank">{i.group(1)}</a></p>', f'<p><video controls preload="none" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
 	for i in re.finditer('<p>(https:.*?\.(mp4|webm|mov))</p>', sanitized):
-		sanitized = sanitized.replace(i.group(0), f'<p><video controls preload="metadata" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
+		sanitized = sanitized.replace(i.group(0), f'<p><video controls preload="none" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
 
 	for rd in ["://reddit.com", "://new.reddit.com", "://www.reddit.com", "://redd.it", "://libredd.it"]:
 		sanitized = sanitized.replace(rd, "://old.reddit.com")
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 0da8bc755..bcbd97705 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -64,7 +64,7 @@ You can use Markdown formatting:
 		<tr>
 			<td>Video Files</td>
 			<td>https://files.catbox.moe/v4om92.mp4</td>
-			<td><video controls preload="metadata" class="embedvid"><source src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td>
+			<td><video controls preload="none" class="embedvid"><source src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td>
 		</tr>
 		<tr>
 			<td>Emojis</td>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0f5b25b70..94a899d1c 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -429,7 +429,7 @@
 							{% elif p.is_video %}
 								<div class="row no-gutters">
 									<div class="col">
-										<video controls preload="metadata" class="embedvid">
+										<video controls preload="none" class="embedvid">
 											<source src="{{p.realurl(v)}}" type="video/mp4">
 										</video>
 									</div>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 6c5dcad58..b0f22e7ea 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -528,7 +528,7 @@
 		</div>
 	{% elif p.is_video %}
 		<div id="video-{{p.id}}" style="text-align: center" class="{% if p.over_18 or not ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}d-none{% endif %} mt-4">
-			<video id="video2-{{p.id}}" controls preload="metadata" class="embedvid">
+			<video id="video2-{{p.id}}" controls preload="none" class="embedvid">
 				<source src="{{p.realurl(v)}}" type="video/mp4">
 			</video>
 		</div>