From 7b469947e125d050c3aa73c842167209d88b4fe9 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 04:55:19 +0200
Subject: [PATCH 1/7] vb

---
 files/routes/chat.py      | 8 ++++++++
 files/templates/chat.html | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/files/routes/chat.py b/files/routes/chat.py
index ef47e5c91a..b74f320c1e 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -23,6 +23,14 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 	def chat( v):
 		return render_template("chat.html", v=v, messages=messages)
 
+
+	@app.get('/static/chat.js')
+	@limiter.exempt
+	def chatjs(path):
+		resp = make_response(send_from_directory('assets', 'js/chat.js'))
+		return resp
+
+
 	@socketio.on('speak')
 	@limiter.limit("3/second;10/minute")
 	@auth_required
diff --git a/files/templates/chat.html b/files/templates/chat.html
index b30c53d1ac..0de1cfab66 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -81,7 +81,7 @@
 <input id="vid" type="hidden" value="{{v.id}}">
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
 
-<script data-cfasync="false" src="/assets/js/chat.js?v=29"></script>
+<script data-cfasync="false" src="/static/chat.js?v=1"></script>
 
 <style>
 	#chat-window {

From 6842b509ab43e6ab2e54ceb3a92e1f3188c14c1a Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 05:00:39 +0200
Subject: [PATCH 2/7] f

---
 files/routes/chat.py      |  4 ++--
 files/templates/chat.html | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/files/routes/chat.py b/files/routes/chat.py
index b74f320c1e..7fc8396709 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -8,7 +8,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 	from datetime import datetime
 	from flask_socketio import SocketIO, emit
 	from files.__main__ import app, limiter, cache
-	from flask import render_template
+	from flask import render_template, make_response, send_from_directory
 	import sys
 	import atexit
 
@@ -26,7 +26,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 
 	@app.get('/static/chat.js')
 	@limiter.exempt
-	def chatjs(path):
+	def chatjs():
 		resp = make_response(send_from_directory('assets', 'js/chat.js'))
 		return resp
 
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 0de1cfab66..e9db946e4b 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -15,7 +15,7 @@
 </div>
 
 <div id="chat-line-template" class="d-none">
-	<div class="chat-line my-2">
+	<div class="chat-line">
 		<div class="d-flex align-items-center">
 			<span class="rounded mb-auto d-none d-md-block chat-profile">
 				<img class="desktop-avatar rounded-circle w-100">
@@ -41,7 +41,7 @@
 			{% for m in messages %}
 				{% set text_html = m['text_html'] %}
 				{% set link = '<a href="/id/' + v.id|string + '">' %}
-				<div class="chat-line my-2 {% if link in text_html %}chat-mention{% endif %}">
+				<div class="chat-line {% if link in text_html %}chat-mention{% endif %}">
 					<div class="d-flex align-items-center">
 						<span class="rounded mb-auto d-none d-md-block chat-profile">
 							<img class="desktop-avatar rounded-circle w-100" src="{{m['avatar']}}">
@@ -120,6 +120,12 @@
 	.chat-message p {
 		display: inline-block;
 	}
+
+	@media (max-width: 768px) {
+		* {
+			font-size: 10px !important;
+		}
+	}
 </style>
 
 <script>

From ccdf31fdc6c1cca32bd14ce50f88de33239b9358 Mon Sep 17 00:00:00 2001
From: DramaticParagon <102272609+DramaticParagon@users.noreply.github.com>
Date: Wed, 23 Mar 2022 22:01:43 -0500
Subject: [PATCH 3/7] Update const.py (#224)

---
 files/helpers/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index af797d28f9..1e66011419 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -472,7 +472,7 @@ AWARDS = {
 	},
 	"deflector": {
         "kind": "deflector",
-        "title": "deflector",
+        "title": "Deflector",
         "description": "Causes most awards received for the next 10 hours to be deflected back at their giver.",
         "icon": "fas fa-shield",
         "color": "text-pink",

From a20dfd06f921af0ea8f971e63fdab43daad794fb Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 05:04:23 +0200
Subject: [PATCH 4/7] c

---
 files/routes/chat.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/routes/chat.py b/files/routes/chat.py
index 7fc8396709..4368a4a6ec 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -35,6 +35,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 	@limiter.limit("3/second;10/minute")
 	@auth_required
 	def speak(data, v):
+		if v.is_banned: abort(403)
 		global messages
 		text = data[:1000].strip()
 		if not text: abort(403)

From 780e31f1bb13d43aeeac58d4e08c0b426564586c Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 05:07:24 +0200
Subject: [PATCH 5/7] c

---
 files/routes/chat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/chat.py b/files/routes/chat.py
index 4368a4a6ec..a716c7b1d6 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -8,7 +8,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 	from datetime import datetime
 	from flask_socketio import SocketIO, emit
 	from files.__main__ import app, limiter, cache
-	from flask import render_template, make_response, send_from_directory
+	from flask import render_template, make_response, send_from_directory, abort
 	import sys
 	import atexit
 

From cbbeaf209c7419821f0eeeb0b34bab380521cc21 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 05:10:30 +0200
Subject: [PATCH 6/7] ff

---
 files/routes/chat.py      | 2 +-
 files/templates/chat.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/routes/chat.py b/files/routes/chat.py
index a716c7b1d6..772a31ed59 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -24,7 +24,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 		return render_template("chat.html", v=v, messages=messages)
 
 
-	@app.get('/static/chat.js')
+	@app.get('/chat.js')
 	@limiter.exempt
 	def chatjs():
 		resp = make_response(send_from_directory('assets', 'js/chat.js'))
diff --git a/files/templates/chat.html b/files/templates/chat.html
index e9db946e4b..cd63ffe6b9 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -81,7 +81,7 @@
 <input id="vid" type="hidden" value="{{v.id}}">
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
 
-<script data-cfasync="false" src="/static/chat.js?v=1"></script>
+<script data-cfasync="false" src="/chat.js?v=2"></script>
 
 <style>
 	#chat-window {

From eec1738d01dcfb479ccc8ddf96c6305c92dc134c Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 24 Mar 2022 21:44:12 +0200
Subject: [PATCH 7/7] what a mess

---
 files/__main__.py                       |   8 +-
 files/helpers/const.py                  |   2 +-
 files/helpers/sanitize.py               |   4 +
 files/routes/__init__.py                |   3 +-
 files/routes/chat.py                    | 167 ++++++++--------
 files/routes/comments.py                |   4 -
 files/routes/posts.py                   |   4 -
 files/templates/chat.html               | 247 ++++++++++++++----------
 files/templates/comments.html           |   9 +-
 files/templates/default.html            |  35 ++--
 files/templates/header.html             |   2 +-
 files/templates/submission.html         |   5 +-
 files/templates/submission_listing.html |   2 +-
 snappy_Drama.txt                        |  32 +--
 14 files changed, 280 insertions(+), 244 deletions(-)

diff --git a/files/__main__.py b/files/__main__.py
index 891f364ce6..4f18844d0b 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -13,7 +13,7 @@ from sqlalchemy import *
 import gevent
 import redis
 import time
-from sys import stdout
+from sys import stdout, argv
 import faulthandler
 from json import loads
 
@@ -116,4 +116,8 @@ def after_request(response):
 	response.headers.add("X-Frame-Options", "deny")
 	return response
 
-from files.routes import *
\ No newline at end of file
+if "load_chat" in argv or app.config["SERVER_NAME"] == 'localhost':
+	from files.routes.chat import *
+
+if "load_chat" not in argv:
+	from files.routes import *
\ No newline at end of file
diff --git a/files/helpers/const.py b/files/helpers/const.py
index 1e66011419..94321e6c52 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -724,7 +724,7 @@ def sub_matcher_upper(match):
 	return SLURS[match.group(0).lower()].upper()
 
 def censor_slurs(body, logged_user):
-	if not logged_user or logged_user.slurreplacer:
+	if not logged_user or logged_user == 'chat' or logged_user.slurreplacer:
 		body = slur_regex_upper.sub(sub_matcher_upper, body)
 		body = slur_regex.sub(sub_matcher, body)
 	return body
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index fa5d01e2ac..5717d13a2d 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -326,6 +326,10 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
 			marsey.count += 1
 			g.db.add(marsey)
 
+	if '#fortune' in sanitized:
+		sanitized = sanitized.replace('#fortune', '')
+		sanitized += '\n\n<p>' + random.choice(FORTUNE_REPLIES) + '</p>'
+
 	signal.alarm(0)
 
 	return sanitized
diff --git a/files/routes/__init__.py b/files/routes/__init__.py
index bcca8b0436..e9121b46a5 100644
--- a/files/routes/__init__.py
+++ b/files/routes/__init__.py
@@ -15,5 +15,4 @@ from .votes import *
 from .feeds import *
 from .awards import *
 from .giphy import *
-from .subs import *
-from .chat import *
\ No newline at end of file
+from .subs import *
\ No newline at end of file
diff --git a/files/routes/chat.py b/files/routes/chat.py
index 772a31ed59..6cab14e242 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -1,90 +1,95 @@
+import time
+from files.helpers.wrappers import auth_required
+from files.helpers.sanitize import sanitize
+from files.helpers.const import *
+from datetime import datetime
+from flask_socketio import SocketIO, emit
+from files.__main__ import app, limiter, cache
+from flask import render_template, make_response, send_from_directory
 import sys
-from files.helpers.const import SITE, SITE_FULL
-
-if "load_chat" in sys.argv or SITE == 'localhost':
-	import time
-	from files.helpers.wrappers import auth_required
-	from files.helpers.sanitize import sanitize
-	from datetime import datetime
-	from flask_socketio import SocketIO, emit
-	from files.__main__ import app, limiter, cache
-	from flask import render_template, make_response, send_from_directory, abort
-	import sys
-	import atexit
+import atexit
 
+if SITE == 'localhost':
+	socketio = SocketIO(app, async_mode='gevent', cors_allowed_origins=[SITE_FULL], logger=True, engineio_logger=True, debug=True)
+else:
 	socketio = SocketIO(app, async_mode='gevent', cors_allowed_origins=[SITE_FULL])
-	typing = []
-	online = []
-	messages = cache.get('chat') or []
+
+typing = []
+online = []
+messages = cache.get('chat') or []
+total = cache.get('total') or 0
+
+@app.get("/chat")
+@auth_required
+def chat( v):
+	return render_template("chat.html", v=v, messages=messages)
 
 
-	@app.get("/chat")
-	@auth_required
-	def chat( v):
-		return render_template("chat.html", v=v, messages=messages)
+@app.get('/chat.js')
+@limiter.exempt
+def chatjs():
+	resp = make_response(send_from_directory('assets', 'js/chat.js'))
+	return resp
 
 
-	@app.get('/chat.js')
-	@limiter.exempt
-	def chatjs():
-		resp = make_response(send_from_directory('assets', 'js/chat.js'))
-		return resp
+@socketio.on('speak')
+@limiter.limit("3/second;10/minute")
+@auth_required
+def speak(data, v):
+	if v.is_banned: return '', 403
+	global messages, total
+	text = data[:1000].strip()
+	if not text: return '', 403
+	text_html = sanitize(text)
+
+	data={
+		"avatar": v.profile_url,
+		"username":v.username,
+		"namecolor":v.namecolor,
+		"text":text,
+		"text_html":text_html,
+		"text_censored":censor_slurs(text_html, 'chat')
+	}
+
+	messages.append(data)
+	messages = messages[-20:]
+	total += 1
+	emit('speak', data, broadcast=True)
+	return '', 204
+
+@socketio.on('connect')
+@auth_required
+def connect(v):
+	if v.username not in online:
+		online.append(v.username)
+		emit("online", online, broadcast=True)
+
+	emit('typing', typing)
+	return '', 204
+
+@socketio.on('disconnect')
+@auth_required
+def disconnect(v):
+	if v.username in online:
+		online.remove(v.username)
+		emit("online", online, broadcast=True)
+
+	if v.username in typing: typing.remove(v.username)
+	emit('typing', typing, broadcast=True)
+	return '', 204
+
+@socketio.on('typing')
+@auth_required
+def typing_indicator(data, v):
+
+	if data and v.username not in typing: typing.append(v.username)
+	elif not data and v.username in typing: typing.remove(v.username)
+
+	emit('typing', typing, broadcast=True)
+	return '', 204
 
 
-	@socketio.on('speak')
-	@limiter.limit("3/second;10/minute")
-	@auth_required
-	def speak(data, v):
-		if v.is_banned: abort(403)
-		global messages
-		text = data[:1000].strip()
-		if not text: abort(403)
-
-		data={
-			"avatar": v.profile_url,
-			"username":v.username,
-			"namecolor":v.namecolor,
-			"text":text,
-			"text_html":sanitize(text),
-		}
-
-		messages.append(data)
-		messages = messages[-500:]
-		emit('speak', data, broadcast=True)
-		return '', 204
-
-	@socketio.on('connect')
-	@auth_required
-	def connect(v):
-		if v.username not in online:
-			online.append(v.username)
-			emit("online", online, broadcast=True)
-
-		emit('typing', typing)
-		return '', 204
-
-	@socketio.on('disconnect')
-	@auth_required
-	def disconnect(v):
-		if v.username in online:
-			online.remove(v.username)
-			emit("online", online, broadcast=True)
-
-		if v.username in typing: typing.remove(v.username)
-		emit('typing', typing, broadcast=True)
-		return '', 204
-
-	@socketio.on('typing')
-	@auth_required
-	def typing_indicator(data, v):
-
-		if data and v.username not in typing: typing.append(v.username)
-		elif not data and v.username in typing: typing.remove(v.username)
-
-		emit('typing', typing, broadcast=True)
-		return '', 204
-
-
-	def close_running_threads():
-		cache.set('chat', messages)
-	atexit.register(close_running_threads)
\ No newline at end of file
+def close_running_threads():
+	cache.set('chat', messages)
+	cache.set('total', total)
+atexit.register(close_running_threads)
\ No newline at end of file
diff --git a/files/routes/comments.py b/files/routes/comments.py
index e9e726b05e..ca7a823a1c 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -335,10 +335,6 @@ def api_comment(v):
 	if v.agendaposter and not v.marseyawarded and parent_post.id not in ADMIGGERS:
 		body = torture_ap(body, v.username)
 
-	if '#fortune' in body:
-		body = body.replace('#fortune', '')
-		body += '\n\n<p>' + random.choice(FORTUNE_REPLIES) + '</p>'
-
 	body_html = sanitize(body, comment=True)
 
 	if v.marseyawarded and parent_post.id not in ADMIGGERS and marseyaward_body_regex.search(body_html):
diff --git a/files/routes/posts.py b/files/routes/posts.py
index fe7273596e..0953e033ef 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -1034,10 +1034,6 @@ def submit_post(v, sub=None):
 			else:
 				return error("Image/Video files only.")
 
-	if '#fortune' in body:
-		body = body.replace('#fortune', '')
-		body += '\n\n<p>' + random.choice(FORTUNE_REPLIES) + '</p>'
-
 	body_html = sanitize(body)
 
 	if v.marseyawarded and marseyaward_body_regex.search(body_html):
diff --git a/files/templates/chat.html b/files/templates/chat.html
index cd63ffe6b9..676622eacd 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -1,132 +1,165 @@
-{% extends "default.html" %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="description" content="{{config('DESCRIPTION')}}">
+	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
+
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+	<meta name="author" content="">
+
+	<link id="favicon" rel="icon" type="image/png" href="/static/assets/images/{{SITE_NAME}}/icon.webp?v=1012">
 
-{% block title %}
 	<title>Chat</title>
-	<meta name="description" content="Chat">
-{% endblock %}
 
-{% block content %}
+	<style>:root{--primary:#{{v.themecolor}}}</style>
+	<link rel="stylesheet" href="/static/assets/css/main.css?v=188">
+	<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?v=30">
+	{% if v.css %}
+		<link rel="stylesheet" href="/@{{v.username}}/css">
+	{% endif %}
 
-<div class="border-right py-3 px-3">
-	<span data-toggle="tooltip" data-placement="bottom" data-bs-title="Users online right now" title="Users online right now" class="text-muted">
-		<i class="far fa-user fa-sm mr-1"></i>
-		<span class="board-chat-count">0</span>
-	</span>
-</div>
+	<style>
+		#chat-window {
+			max-height:90vh;
+			overflow-y: scroll;
+		}
 
-<div id="chat-line-template" class="d-none">
-	<div class="chat-line">
-		<div class="d-flex align-items-center">
-			<span class="rounded mb-auto d-none d-md-block chat-profile">
-				<img class="desktop-avatar rounded-circle w-100">
-			</span>
-			<div class="pl-md-3 text-muted">
-				<div>
-					<img class="mobile-avatar profile-pic-30 mr-1 d-inline-block d-md-none" data-toggle="tooltip" data-placement="right">
-					<a href="" class="font-weight-bold text-black userlink" target="_blank"></a>
-					<div style="overflow:hidden">
-						<span class="chat-message text-black text-break"></span>
-						<span class="text d-none"></span>
-						<button class="quote-btn btn d-inline-block pt-0" onclick="quote(this)"><i class="fas fa-reply" aria-hidden="true"></i></button>
-					</div>
-				</div>
+		#chat-window .chat-profile {
+			min-width: 42px;
+			width: 42px;
+			height: 42px;
+		}
+
+		#chat-window::-webkit-scrollbar {
+			display: none;
+		}
+
+		#chat-window {
+			-ms-overflow-style: none;
+			scrollbar-width: none;
+		}
+
+		.chat-mention {
+			background-color: var(--primary55);
+			border-radius: 5px;
+		}
+
+		.chat-message p {
+			display: inline-block;
+		}
+
+		.diff {
+			margin-top: 1rem;
+		}
+
+		@media (max-width: 768px) {
+			#shrink * {
+				font-size: 10px !important;
+			}
+			.fa-reply:before {
+				font-size: 9px;
+			}
+			.diff {
+				margin-top: 0.5rem;
+			}
+		}
+
+		#input-text {
+			max-height: 50px!important;
+		}
+
+		p {
+			margin: 0!important;
+			margin-left: 27px !important;
+		}
+	</style>
+</head>
+
+<body>
+	<script src="/static/assets/js/bootstrap.js?v=245"></script>
+
+	{% include "header.html" %}
+	
+	<div class="container {% if request.path=='/' or '/post/' in request.path or '/comment/' in request.path %}transparent{% endif %}">
+		<div class="row justify-content-around" id="main-content-row">
+			<div class="col h-100 {% block customPadding %}{% if request.path.startswith('/@') %}user-gutters{% else %}custom-gutters{% endif %}{% endblock %}" id="main-content-col">	
+
+			<div class="border-right py-3 px-3">
+				<span data-toggle="tooltip" data-placement="bottom" data-bs-title="Users online right now" title="Users online right now" class="text-muted">
+					<i class="far fa-user fa-sm mr-1"></i>
+					<span class="board-chat-count">0</span>
+				</span>
 			</div>
-		</div>
-	</div>
-</div>
 
-<div class="container py-0 chat-container">
-	<div id="chat-window">
-		<div id="chat-text" class="fullchat">
-			{% for m in messages %}
-				{% set text_html = m['text_html'] %}
-				{% set link = '<a href="/id/' + v.id|string + '">' %}
-				<div class="chat-line {% if link in text_html %}chat-mention{% endif %}">
+			<div id="chat-line-template" class="d-none">
+				<div class="chat-line">
 					<div class="d-flex align-items-center">
-						<span class="rounded mb-auto d-none d-md-block chat-profile">
-							<img class="desktop-avatar rounded-circle w-100" src="{{m['avatar']}}">
-						</span>
 						<div class="pl-md-3 text-muted">
 							<div>
-								<img src="{{m['avatar']}}" class="mobile-avatar profile-pic-30 mr-1 d-inline-block d-md-none" data-toggle="tooltip" data-placement="right">
-								<a class="font-weight-bold text-black userlink" style="color:#{{m['namecolor']}}" target="_blank" href="/@{{m['username']}}">{{m['username']}}</a>
+								<img class="avatar pp20 mr-1" data-toggle="tooltip" data-placement="right">
+								<a href="" class="font-weight-bold text-black userlink" target="_blank"></a>
 								<div style="overflow:hidden">
-									<span class="chat-message text-black text-break">{{text_html | safe}}</span>
-									<span class="d-none">{{m['text']}}</span>
-									<button class="btn d-inline-block pt-0" onclick="quote(this)"><i class="fas fa-reply" aria-hidden="true"></i></button>
+									<span class="chat-message text-black text-break"></span>
+									<span class="text d-none"></span>
+									<button class="quote-btn btn d-inline-block py-0" onclick="quote(this)"><i class="fas fa-reply" aria-hidden="true"></i></button>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>		
-			{% endfor %}
-		</div>
-		<div id="system-template">
-			<div class="system-line">
-				<p class="message text-muted"></p>
+				</div>
+			</div>
+			<div id="shrink">
+				<div id="chat-window" class="container py-0">
+					{% for m in messages %}
+						{% set text_html = m['text_censored'] if v.slurreplacer else m['text_html'] %}
+						{% set link = '<a href="/id/' + v.id|string + '">' %}
+						{% set same = m['username'] == messages[loop.index-2]['username'] %}
+						<div class="chat-line {% if link in text_html %}chat-mention{% endif %} {% if not same %}diff{% endif %}">
+							<div class="d-flex align-items-center">
+								<div class="pl-md-3 text-muted">
+									<div>
+										{% if not same %}<img src="{{m['avatar']}}" class="avatar pp20 mr-1" data-toggle="tooltip" data-placement="right">{% endif %}
+
+										<a class="{% if same %}d-none{% endif %} font-weight-bold text-black userlink" style="color:#{{m['namecolor']}}" target="_blank" href="/@{{m['username']}}">{{m['username']}}</a>
+
+										<div style="overflow:hidden">
+											<span class="chat-message text-black text-break">{{text_html | safe}}</span>
+											<span class="d-none">{{m['text']}}</span>
+											<button class="btn d-inline-block py-0" onclick="quote(this)"><i class="fas fa-reply" aria-hidden="true"></i></button>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					{% endfor %}
+				</div>
+
+				<div id='message' class="d-none position-relative form-group d-flex mt-4">
+					<div class="position-absolute text-muted text-small" style="bottom: -1.5rem; line-height: 1;">
+						<span id="typing-indicator"></span>
+						<span id="loading-indicator" class="d-none"></span>
+					</div>
+					<i class="btn btn-secondary mr-2 fas fa-smile-beam" style="padding-top:0.65rem" onclick="loadEmojis('input-text')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-placement="bottom" title="Add Emoji"></i>
+					<textarea id="input-text" minlength="1" maxlength="1000" type="text" class="form-control" placeholder="Message" autocomplete="off" autofocus rows="1"></textarea>
+					<button id="chatsend" onclick="send()" class="btn btn-primary ml-3" type="submit">Send</button>
+				</div>
 			</div>
 		</div>
-	</div>
-	<div id='message' class="d-none position-relative form-group d-flex pb-3">
-		<div class="position-absolute text-muted text-small" style="bottom: -1.5rem; line-height: 1;">
-			<span id="typing-indicator"></span>
-			<span id="loading-indicator" class="d-none"></span>
+
+		<div id="online" class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
 		</div>
-		<i class="btn btn-secondary mr-2 fas fa-smile-beam" style="padding-top:0.65rem" onclick="loadEmojis('input-text')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-placement="bottom" title="Add Emoji"></i>
-		<textarea id="input-text" minlength="1" maxlength="1000" type="text" class="form-control" placeholder="Message" autocomplete="off" autofocus rows="1"></textarea>
-		<button id="chatsend" onclick="send()" class="btn btn-primary ml-3" type="submit">Send</button>
+
 	</div>
+
 </div>
 
 <input id="vid" type="hidden" value="{{v.id}}">
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
+<input id="slurreplacer" type="hidden" value="{{v.slurreplacer}}">
 
-<script data-cfasync="false" src="/chat.js?v=2"></script>
-
-<style>
-	#chat-window {
-		max-height:calc(100vh - 300px);
-		overflow-y: scroll;
-	}
-
-	.fullchat .chat-profile {
-		min-width: 42px;
-		width: 42px;
-		height: 42px;
-	}
-
-	#chat-window::-webkit-scrollbar {
-		display: none;
-	}
-
-	#chat-window {
-		-ms-overflow-style: none;
-		scrollbar-width: none;
-	}
-
-	.chat-mention {
-		background-color: var(--primary55);
-		border-radius: 5px;
-	}
-
-	.profile-pic-30 {
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-		text-align: center;
-		object-fit: cover;
-	}
-
-	.chat-message p {
-		display: inline-block;
-	}
-
-	@media (max-width: 768px) {
-		* {
-			font-size: 10px !important;
-		}
-	}
-</style>
+<script data-cfasync="false" src="/chat.js?v=4"></script>
 
 <script>
 	box.scrollTo(0, box.scrollHeight)
@@ -135,4 +168,6 @@
 {% include "emoji_modal.html" %}
 {% include "expanded_image_modal.html" %}
 
-{% endblock %}
\ No newline at end of file
+<script src="/static/assets/js/lozad.js?v=240"></script>
+
+</body>
\ No newline at end of file
diff --git a/files/templates/comments.html b/files/templates/comments.html
index ed71cfd01f..e7f3218bb3 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -843,7 +843,7 @@
 
 	{% if v %}
 		<script src="/static/assets/js/marked.js?v=249"></script>
-		<script src="/static/assets/js/comments_v.js?v=262"></script>
+		<script src="/static/assets/js/comments_v.js?v=263"></script>
 	{% endif %}
 
 	<script src="/static/assets/js/clipboard.js?v=250"></script>
@@ -854,7 +854,7 @@
 
 	{% include "expanded_image_modal.html" %}
 
-	<script src="/static/assets/js/comments+submission_listing.js?v=253"></script>
+	<script src="/static/assets/js/comments+submission_listing.js?v=254"></script>
 	<script src="/static/assets/js/comments.js?v=253"></script>
 
 	<script>
@@ -885,8 +885,9 @@
 			xhr.setRequestHeader('xhr', 'xhr');
 			xhr.onload=function(){
 				if (xhr.status==200) {
-					document.getElementById(`morecomments-${cid}`).innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
-					bs_trigger()
+					let e = document.getElementById(`morecomments-${cid}`)
+					e.innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
+					bs_trigger(e)
 
 					{% if p %}
 						comments = JSON.parse(localStorage.getItem("old-comment-counts")) || {}
diff --git a/files/templates/default.html b/files/templates/default.html
index 875a9a41c2..fbf911ac87 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -88,7 +88,7 @@
 	<link rel="apple-touch-icon" sizes="180x180" href="/static/assets/images/{{SITE_NAME}}/icon.webp?v=1012">
 		<link rel="manifest" href="/static/assets/manifest.json?v=1">
 		<link rel="mask-icon" href="/static/assets/images/{{SITE_NAME}}/icon.webp?v=1012">
-		<link id="favicon" rel="shortcut icon" href="/static/assets/images/{{SITE_NAME}}/icon.webp?v=1012">
+		<link rel="shortcut icon" href="/static/assets/images/{{SITE_NAME}}/icon.webp?v=1012">
 		<meta name="apple-mobile-web-app-title" content="{{SITE_NAME}}">
 		<meta name="application-name" content="{{SITE_NAME}}">
 		<meta name="msapplication-TileColor" content="#{{config('DEFAULT_COLOR')}}">
@@ -233,24 +233,20 @@
 {% block Banner %}
 	{% if '@' not in request.path %}		
 		{% if v %}
-			
-			{% if request.path != '/chat' %}
-				{% if sub %}
-					<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
-				{% elif SITE_NAME == 'Drama' %}
-					{% set path = "assets/images/" + SITE_NAME + "/banners" %}
-					{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=23' %}
+			{% if sub %}
+				<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
+			{% elif SITE_NAME == 'Drama' %}
+				{% set path = "assets/images/" + SITE_NAME + "/banners" %}
+				{% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=23' %}
 
-					<a href="https://secure.transequality.org/site/Donation2?df_id=1480">
-						<img alt="site banner" src="{{image}}" width="100%">
-					</a>
-				{% else %}
-					<a href="/">
-						<img alt="site banner" src="/static/assets/images/{{SITE_NAME}}/banner.webp?v=1042" width="100%">
-					</a>	
-				{% endif %}
+				<a href="https://secure.transequality.org/site/Donation2?df_id=1480">
+					<img alt="site banner" src="{{image}}" width="100%">
+				</a>
+			{% else %}
+				<a href="/">
+					<img alt="site banner" src="/static/assets/images/{{SITE_NAME}}/banner.webp?v=1042" width="100%">
+				</a>	
 			{% endif %}
-
 		{% else %}
 			<a href="/login">
 				<img class="banner" alt="site banner" src="/static/assets/images/{{SITE_NAME}}/cached.webp?v=1012" width="100%">
@@ -270,7 +266,7 @@
 {% block postNav %}
 {% endblock %}
 
-<div class="container {% if request.path=='/' or '/post/' in request.path or '/comment/' in request.path %}transparent{% elif request.path == '/chat' %}pb-0{% endif %}">
+<div class="container {% if request.path=='/' or '/post/' in request.path or '/comment/' in request.path %}transparent{% endif %}">
 	<div class="row justify-content-around" id="main-content-row">
 
 		<div class="col h-100 {% block customPadding %}{% if request.path.startswith('/@') %}user-gutters{% else %}custom-gutters{% endif %}{% endblock %}" id="main-content-col">
@@ -297,9 +293,6 @@
 		{% block sidebar %}
 			{% if home or sub and p %}
 				{% include "sidebar_" + SITE_NAME + ".html" %}
-			{% elif request.path == '/chat' %}
-				<div id="online" class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
-				</div>
 			{% endif %}
 		{% endblock %}
 	</div>
diff --git a/files/templates/header.html b/files/templates/header.html
index 53811b991d..1465fba69b 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -256,7 +256,7 @@
 	</div>
 </nav>
 
-<script src="/static/assets/js/header.js?v=253"></script>
+<script src="/static/assets/js/header.js?v=254"></script>
 
 {% if v and not err %}
 	<div id="formkey" class="d-none">{{v.formkey}}</div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 72436c3578..2e03986c89 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -999,8 +999,9 @@
 			xhr.setRequestHeader('xhr', 'xhr');
 			xhr.onload=function(){
 				if (xhr.status==200) {
-					document.getElementById(`viewmore-${offset}`).innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
-					bs_trigger()
+					let e = document.getElementById(`viewmore-${offset}`);
+					e.innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
+					bs_trigger(e)
 
 					comments = JSON.parse(localStorage.getItem("old-comment-counts")) || {}
 					lastCount = comments['{{p.id}}']
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 0c6f2f8c30..106512a611 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -445,5 +445,5 @@
 {% include "expanded_image_modal.html" %}
 
 <script src="/static/assets/js/clipboard.js?v=240"></script>
-<script src="/static/assets/js/comments+submission_listing.js?v=253"></script>
+<script src="/static/assets/js/comments+submission_listing.js?v=254"></script>
 <script src="/static/assets/js/submission_listing.js?v=240"></script>
\ No newline at end of file
diff --git a/snappy_Drama.txt b/snappy_Drama.txt
index aae420d707..3b4e810b5e 100644
--- a/snappy_Drama.txt
+++ b/snappy_Drama.txt
@@ -3631,20 +3631,22 @@ I cannot think or comprehend of anything more cucked than having a daughter. Hon
 {[para]}
 watch this go nowhere in 2 weeks
 {[para]}
-I would appreciate you removing my post from the site asap,and I won't sign up to your site just to have a 'word' I hate the fact I have to explain
-myself inregards to my weight. But if it helps you take down my post. Here you go - I hate myself. Ive struggled with depression my entire life I was
-bullied at school for being taller than most girls and not being stick thin (yet according to the bmi calculator I was healthy at 16-17) but to everyone I
-was fat, and white and gross. I turned to self harm and eating as coping mechanisms. Even now at a bmi of 40 (yes I'm actively losing weight) I'm still
-not the biggest person in the room. I'm guessing your admin thinks I have fat rolls dripping down me, breathing heavy and unable to leave my bed.
-Sadly for him thats not the case. I do alot for my kids, I have to be active but I use to eat a crazy amount of sugary shit to just get through the day
-because of my depression. Im ashamed of how I look, I can't stand to see myself in the mirror, let alone get on the scales every day. I almost lost my
-veteran husband 3 years ago to a disease, I care for him 24/7. What I sub to in reddit are my outlets for my depression, for my loneliness. I have four
-kids and my husband but I dont have friends no one to vent to about the hard shit. I design clothes for my "creepy" dolls as an outlet a way to stay
-creative I use to make dresses and outfits for my daughters dolls when she was younger and I just continued it. I even use to draw furry art (hi gay
-furry femboy) but I gave that up years ago. I honestly thought twox chromosome was a safe place for me to say stuff that made me happy,
-everything I write is true however sad you think it is. I dont want to be made fun of its hard enough looking at myself everyday without a chorus of
-people telling me exactly what my own thoughts are. Ive attempted suicide numerous times and its my kids that pull me through it. So please take it
-down. I dont deserve to be shamed, im just a sad pathetic woman who cares about her kids and if she could end it without hurting anyone she
+I would appreciate you removing my post from the site asap,and I won't sign up to your site just to have a 'word' I hate the fact I have to explain
+myself inregards to my weight. But if it helps you take down my post. Here you go - I hate myself. Ive struggled with depression my entire life I was
+bullied at school for being taller than most girls and not being stick thin (yet according to the bmi calculator I was healthy at 16-17) but to everyone I
+was fat, and white and gross. I turned to self harm and eating as coping mechanisms. Even now at a bmi of 40 (yes I'm actively losing weight) I'm still
+not the biggest person in the room. I'm guessing your admin thinks I have fat rolls dripping down me, breathing heavy and unable to leave my bed.
+Sadly for him thats not the case. I do alot for my kids, I have to be active but I use to eat a crazy amount of sugary shit to just get through the day
+because of my depression. Im ashamed of how I look, I can't stand to see myself in the mirror, let alone get on the scales every day. I almost lost my
+veteran husband 3 years ago to a disease, I care for him 24/7. What I sub to in reddit are my outlets for my depression, for my loneliness. I have four
+kids and my husband but I dont have friends no one to vent to about the hard shit. I design clothes for my "creepy" dolls as an outlet a way to stay
+creative I use to make dresses and outfits for my daughters dolls when she was younger and I just continued it. I even use to draw furry art (hi gay
+furry femboy) but I gave that up years ago. I honestly thought twox chromosome was a safe place for me to say stuff that made me happy,
+everything I write is true however sad you think it is. I dont want to be made fun of its hard enough looking at myself everyday without a chorus of
+people telling me exactly what my own thoughts are. Ive attempted suicide numerous times and its my kids that pull me through it. So please take it
+down. I dont deserve to be shamed, im just a sad pathetic woman who cares about her kids and if she could end it without hurting anyone she
 would.
 {[para]}
-My husband use to snore like a chainsaw then he got nose surgery and it was like white noise and then a cpap so nice and quiet. He farts so much and I HATE IT. He is so freaking proud of them, throws his leg in the air and pretends to kick start a bike while farting. Then he tries to crop dust me. Ive asked him to stop but Nada. Im am disgusted by it. We've both put on a lot of weight in the last few years and that doesn't repulse me but his hygiene and man funk do.
\ No newline at end of file
+My husband use to snore like a chainsaw then he got nose surgery and it was like white noise and then a cpap so nice and quiet. He farts so much and I HATE IT. He is so freaking proud of them, throws his leg in the air and pretends to kick start a bike while farting. Then he tries to crop dust me. Ive asked him to stop but Nada. Im am disgusted by it. We've both put on a lot of weight in the last few years and that doesn't repulse me but his hygiene and man funk do.
+{[para]}
+The only thing that is advanced from this thread is my stage 4 cancer from reading it.
\ No newline at end of file