From 2ec553108076d039c9e7aa0ac573f5a03d49d867 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 5 Aug 2022 18:26:44 +0200
Subject: [PATCH] order themes alphabetically

---
 files/helpers/const.py                | 4 +---
 files/routes/settings.py              | 2 +-
 files/templates/settings_profile.html | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 401245143..00e1b0d58 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -380,7 +380,7 @@ bots = {AUTOJANNY_ID, SNAPPY_ID, LONGPOSTBOT_ID, ZOZBOT_ID, BASEDBOT_ID}
 IMGUR_KEY = environ.get("IMGUR_KEY").strip()
 PUSHER_ID = environ.get("PUSHER_ID", "").strip()
 PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()
-DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip()
+DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip()
 COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR}
 
 AWARDS = {
@@ -1008,8 +1008,6 @@ hosts = "|".join(approved_embed_hosts).replace('.','\.')
 
 SITE_NAME = environ.get("SITE_NAME").strip()
 GUMROAD_LINK = environ.get("GUMROAD_LINK", "https://marsey1.gumroad.com/l/rdrama").strip()
-DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "ff0000").strip()
-DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip()
 HCAPTCHA_SITEKEY = environ.get("HCAPTCHA_SITEKEY","").strip()
 HCAPTCHA_SECRET = environ.get("HCAPTCHA_SECRET","").strip()
 SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD", 0.5))
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 5f0fb74fb..bc2e017af 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -252,7 +252,7 @@ def settings_profile_post(v):
 
 	theme = request.values.get("theme")
 	if theme:
-		if theme in {"dramblr", "reddit", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"}:
+		if theme in {"4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"}:
 			if theme == "transparent" and not v.background: 
 				return {"error": "You need to set a background to use the transparent theme!"}
 			v.theme = theme
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index f8d230825..604618723 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -130,9 +130,9 @@
 								<select autocomplete="off" id='theme' class="form-control" form="profile-settings" name="theme" onchange="post_toast(this,'/settings/profile?theme='+document.getElementById('theme').value, true)">
 								
 								{% if SITE_NAME == 'rDrama' %}
-									{% set themes = ["dramblr", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %}
+									{% set themes = ["4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"] %}
 								{% else %}
-									{% set themes = ["dramblr", "reddit", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %}
+									{% set themes = ["4chan","classic","classic_dark","coffee","dark","dramblr","light","midnight","reddit","transparent","tron","win98"] %}
 								{% endif %}
 								
 								{% for entry in themes %}