From 770643b4a6142e84e61274f9711ee3fdcc796f21 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 6 Mar 2022 00:16:40 +0200
Subject: [PATCH] no more quadrants y'all cant behave

---
 files/classes/user.py                   |  1 -
 files/routes/settings.py                | 34 -------------------------
 files/templates/comments.html           |  2 +-
 files/templates/settings_profile.html   | 32 -----------------------
 files/templates/submission.html         |  2 +-
 files/templates/submission_listing.html |  2 +-
 files/templates/userpage.html           |  4 +--
 7 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 3290e3299..369193d71 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -30,7 +30,6 @@ class User(Base):
 	__tablename__ = "users"
 
 	if SITE == "pcmemes.net":
-		quadrant = Column(String)
 		basedcount = Column(Integer, default=0)
 		pills = deferred(Column(String, default=""))
 
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 74329e685..63538ae96 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -348,40 +348,6 @@ def settings_profile_post(v):
 
 		updated = True
 
-	quadrant = request.values.get("quadrant")
-	if quadrant and request.host == 'pcmemes.net'.lower():
-		v.quadrant = quadrant
-		v.customtitle = quadrant
-		if quadrant=="Centrist":
-			v.namecolor = "7f8fa6"
-			v.titlecolor = "7f8fa6"
-		elif quadrant=="LibLeft":
-			v.namecolor = "62ca56"
-			v.titlecolor = "62ca56"
-		elif quadrant=="LibRight":
-			v.namecolor = "f8db58"
-			v.titlecolor = "f8db58"
-		elif quadrant=="AuthLeft":
-			v.namecolor = "ff0000"
-			v.titlecolor = "ff0000"
-		elif quadrant=="AuthRight":
-			v.namecolor = "2a96f3"
-			v.titlecolor = "2a96f3"
-		elif quadrant=="LibCenter":
-			v.namecolor = "add357"
-			v.titlecolor = "add357"
-		elif quadrant=="AuthCenter":
-			v.namecolor = "954b7a"
-			v.titlecolor = "954b7a"
-		elif quadrant=="Left":
-			v.namecolor = "b1652b"
-			v.titlecolor = "b1652b"
-		elif quadrant=="Right":
-			v.namecolor = "91b9A6"
-			v.titlecolor = "91b9A6"
-
-		updated = True
-
 	if updated:
 		g.db.add(v)
 		g.db.commit()
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1833b0b08..80eaedb67 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -226,7 +226,7 @@
 						{{c.print()}}
 					{% endif %}
 					<a class="user-name text-decoration-none" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level and SITE_NAME == 'Drama' %}class="mod"{% endif %}>{{c.author_name}}</span></a>
-					{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{% if c.author.quadrant %}<img alt="{{c.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{c.author.quadrant}}.webp?v=1008">{% endif %}{{c.author.customtitle | safe}}</bdi>{% endif %}
+					{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{{c.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
 
 				{% if c.parent_comment_id and not standalone and level != 1 %}<a href="#comment-{{c.parent_comment_id}}-only" class="text-muted ml-2"><i class="fas fa-reply fa-sm fa-fw fa-flip-horizontal mr-1"></i>{{c.parent_comment.author_name}}</a>{% endif %}
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 85dd33c52..da0a74bff 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -10,38 +10,6 @@
 
 		<div class="settings">
 
-			{% if request.host == "pcmemes.net".lower() %}
-
-			<h2 class="h5" name="referral">Quadrant</h2>
-
-			<div class="settings-section rounded">
-
-					<div class="d-lg-flex border-bottom">
-						<div class="title w-lg-25">
-							<label for="quadrant">Quadrant</label>
-						</div>
-
-						<div class="body w-lg-100">
-							<p>Choose your quadrant.</p>
-							<div class="input-group mb2">
-								<select autocomplete="off" id='quadrant' class="form-control" form="profile-settings" name="quadrant" onchange="post_toast(this,'/settings/profile?quadrant='+document.getElementById('quadrant').value, '1')">
-								{% for entry in ["Centrist", "LibLeft", "LibRight", "AuthLeft", "AuthRight", "LibCenter", "AuthCenter", "Left", "Right"] %}
-									<option value="{{entry}}" {% if v.quadrant==entry %} selected {% endif %}>
-										{{entry}}
-									</option>
-								{% endfor %}
-							</select>
-							</div>
-
-						</div>
-
-				</div>
-			</div>
-			{% endif %}
-
-
-
-
 
 			{% if SITE_NAME == 'Drama' %}
 				<h2 class="h5" name="referral">House</h2>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index b3a7d53f4..32b98cb43 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -632,7 +632,7 @@
 
 							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 							{% endif %}
-							<a class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold"class="user-name"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and SITE_NAME == 'Drama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{% if p.author.quadrant %}<img alt="{{p.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{p.author.quadrant}}.webp?v=1008">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
+							<a class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold"class="user-name"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and SITE_NAME == 'Drama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 						{% endif %}
 						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="timestamp" onmouseover="timestamp('timestamp','{{p.created_utc}}')">&nbsp;{{p.age_string}}</span>
 						({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>{{p.domain}}</a>{% else %}text post{% endif %})
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 965b1a317..6d9a3e277 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -200,7 +200,7 @@
 
 					{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 					{% endif %}
-					<a class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}};  font-weight: bold;"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and SITE_NAME == 'Drama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{% if p.author.quadrant %}<img alt="{{p.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{p.author.quadrant}}.webp?v=1008">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
+					<a class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}};  font-weight: bold;"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and SITE_NAME == 'Drama' %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
 				<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>
 				&nbsp;
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 023c7328f..dfed1db03 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -104,7 +104,7 @@
 					</div> 
 				</div>
 
-				{% if u.customtitle %}<p class="font-weight-bolder" style="color: #{{u.titlecolor}}">{% if u.quadrant %}<img alt="{{u.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{u.quadrant}}.webp?v=1008">{% endif %}{{u.customtitle | safe}}</p>
+				{% if u.customtitle %}<p class="font-weight-bolder" style="color: #{{u.titlecolor}}">{{u.customtitle | safe}}</p>
 				{% else %}<pre></pre>
 				{% endif %}
 
@@ -399,7 +399,7 @@
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					<span class="followsyou badge badge-secondary text-small align-middle mx-1">Follows you</span>
 				{% endif %}
-				{% if u.customtitle %}<p style="color: #{{u.titlecolor}}">{% if u.quadrant %}<img alt="@{{u.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{u.quadrant}}.webp?v=1008">{% endif %}{{u.customtitle | safe}}</p>
+				{% if u.customtitle %}<p style="color: #{{u.titlecolor}}">{{u.customtitle | safe}}</p>
 				{% else %}
 					<pre></pre>
 				{% endif %}