fsd

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - MASTER_KEY=3435tdfsdudebussylmaoxxt43
       - REDIS_URL=redis://redis
       - DOMAIN=localhost
-      - SITE_NAME=PCM
+      - SITE_NAME=Drama
       - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
       - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43
       - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43

files/assets/css/classic.css

@@ -0,0 +1,243 @@
+:root {
+	--white: #f1f1f1 !important;
+	--black1: #888 !important;
+	--black2: #222222 !important;
+    --black3: #4f4f4f !important;
+	--grey : #ccc !important;
+	--red: #b40457 !important;
+    --blue: #369 !important;
+    --upvote: #ff8b60 !important;
+    --downvote: #9393ff !important;
+    --sticky: #228822 !important;
+    
+    --primary: var(--black1) !important;
+    --bg1: url('http://b.thumbs.redditmedia.com/9FnbxmVwv2i-bfNusiiCz7QTh1LQYuRiqCPFQMrtrMQ.png') !important;
+    --bg2: url('http://b.thumbs.redditmedia.com/xULA8h2eoYv1UwcUovOwwFHPa3WOXqZGMEpNaRjKFUA.png') !important;
+}
+
+/*navbar*/
+.navbar-light, .navbar .container-fluid, #mobile-bottom-navigation-bar {
+    background-color: var(--white) !important;
+}
+
+#srd, .banner {
+    display: none;
+}
+
+.form-inline.search input {
+	background-color: white !important;
+}
+
+.nav.settings-nav {
+    background-color: var(--red);
+}
+
+/*common*/
+body, .card, #main-content-row {
+	background-color: var(--white) !important;
+    background-image: var(--bg2);
+    color: var(--black1);
+}
+
+.posts .card {
+	border-color: var(--grey) !important;
+}
+
+.btn-primary, .btn-secondary {
+	background-color: var(--red) !important;
+    color: white !important;
+	border-color: transparent;
+}
+
+.score-up, .active.arrow-up::before, .arrow-up::after, .arrow-up:hover::before {
+    color: var(--upvote) !important;
+}
+
+.score-down, .active.arrow-down::before, .arrow-down::after, .arrow-down:hover::before {
+    color: var(--downvote) !important;
+}
+
+a {
+    color: var(--blue);
+}
+
+.post-title a {
+	color: var(--blue) !important;
+}
+
+.fa-thumbtack.text-admin, .card.stickied .post-title a {
+    color: var(--sticky) !important;
+}
+
+.flaggers, .flaggers a {
+	background-color: white !important;
+	color: var(--black3) !important;
+	border-color: var(--grey);
+}
+
+.dropdown-menu, .dropdown-menu a {
+    color: var(--black3);
+    background-color: white;
+}
+
+.popover, .pop-username, .pop-bio, .popover-user-profile, .popover-user-profile * {
+    background-color: var(--white);
+    color: var(--black3);
+    border-color: var(--black1) !important;
+}
+
+.text-muted {
+    color: var(--grey) !important;
+}
+
+/*frontpage*/
+#frontpage .container {
+    max-width: 2160px;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+#frontpage .d-lg-flex, 
+#frontpage .font-weight-bold.py-3 {
+	display: none !important;
+}
+
+#frontpage .sidebar {
+	background-color: white !important;
+	color: black;
+}
+
+#frontpage .col.h-100.custom-gutters .row .col {
+	background-image: var(--bg1);
+}
+
+#frontpage .dropdown .btn {
+	background-color:transparent !important;
+	color:yellow;
+	text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black !important;
+	border-color: transparent;
+    font-size: 1.3rem;
+}
+
+#frontpage i.fas.mr-1 {
+    color:yellow;
+}
+
+/*post*/
+.post-meta, .post-actions a, .nav-link .fas, label, small, .comment-actions * {
+	color: var(--black1) !important;
+}
+
+.comment, .comment-text, .comment-section, .comment-body, .post-body {
+	background-color: white;
+	color: var(--black2) !important;
+}
+
+.post-body * {
+    margin-left:10px;
+    margin-top:10px;
+    margin-right:10px;
+}
+
+.anchor.comment {
+	border-left: 2px dotted var(--black1) !important;
+}
+
+.comment-collapse-desktop {
+    border-left: none !important;
+}
+
+blockquote {
+	border-left: 2px solid #c5c1ad !important;
+	background-color: white !important;
+	color: #4f4f4f !important;
+}
+
+.form-control, .comment-box.form-control.rounded {
+    background-color: white !important;
+    color: var(--black2) !important;
+}
+
+.comment-box, .form-control{
+	border-color: var(--black1) !important;
+}
+
+#thread #dropdownMenuButton {
+	background-color: var(--red) !important;
+    color: white !important;
+	border-color: transparent;
+}
+
+.btn.format {
+    background-color: transparent !important;
+    color: var(--black1) !important;
+    border-color: transparent !important;
+}
+
+/*userpage*/
+#userpage .nav.settings-nav {
+    background-color: transparent;
+}
+
+#userpage .nav-link {
+    color: var(--red) !important;
+}
+
+#userpage .nav-link.active {
+    box-shadow: inset 0 -2px 0 var(--red) !important;
+}
+
+/*leaderboard*/
+#settings2 .container, #settings2 .container-fluid {
+    background-color: transparent !important;
+}
+
+#settings2 .bg-white {
+    background-color: var(--white) !important;
+}
+
+#settings2 .text-muted {
+    color: var(--black1) !important;
+}
+
+#settings2 .nav.settings-nav {
+    margin: auto !important;
+}
+
+#settings2 .table {
+    color: var(--black1);
+}
+
+/*shop*/
+#message .container {
+    background-color: transparent !important;
+}
+
+#message .table {
+    color: var(--black1);
+}
+
+/*submit*/
+#submit .container {
+    background-color: transparent !important
+}
+
+#submit .text-muted {
+    color: var(--black1) !important;
+}
+
+#submit #create_button {
+	background-color: var(--red) !important;
+    color: white !important;
+	border-color: transparent;
+}
+
+#submit .btn.format {
+    background-color: transparent !important;
+    color: var(--black1) !important;
+    border-color: transparent !important;
+}
+
+#submit .row.fixed-bottom {
+    background-color: var(--white) !important
+}

files/routes/search.py

@@ -302,5 +302,6 @@ def searchusers(v):
 	users=[x for x in users.offset(25 * (page-1)).limit(26)]
 	next_exists=(len(users)>25)
 	users=users[:25]
-	
+
+	if request.headers.get("Authorization"): return {"data": [x.json for x in users]}
 	return render_template(f"{template}search_users.html", v=v, query=query, total=total, page=page, users=users, sort=sort, t=t, next_exists=next_exists)

files/routes/settings.py

@@ -365,11 +365,13 @@ def settings_profile_post(v):
 
 	theme = request.values.get("theme")
 	if theme:
-		if theme == "transparent" and not v.background: 
+		if theme in ["classic","transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"]:
-			return render_template(f"{template}settings_profile.html", v=v, error="You need to set a background to use the transparent theme!")
+			if theme == "transparent" and not v.background: 
-		v.theme = theme
+				return render_template(f"{template}settings_profile.html", v=v, error="You need to set a background to use the transparent theme!")
-		if theme == "win98": v.themecolor = "30409f"
+			v.theme = theme
-		updated = True
+			if theme == "win98": v.themecolor = "30409f"
+			updated = True
+		else: abort(400)
 
 	theme2 = request.values.get("theme2")
 	if theme2:
@@ -640,7 +642,7 @@ def settings_security_post(v):
 
 		g.db.commit()
 
-		return render_template("settings_security.html", v=v, error="Two-factor authentication enabled.")
+		return render_template("settings_security.html", v=v, msg="Two-factor authentication enabled.")
 
 	if request.values.get("2fa_remove", ""):
 
@@ -657,7 +659,7 @@ def settings_security_post(v):
 
 		g.db.commit()
 
-		return render_template("settings_security.html", v=v, error="Two-factor authentication disabled.")
+		return render_template("settings_security.html", v=v, msg="Two-factor authentication disabled.")
 
 @app.post("/settings/log_out_all_others")
 @limiter.limit("1/second")

files/templates/header.html

@@ -117,7 +117,7 @@
 								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw text-left mr-3"></i>Source code</a>
 
 								{% if request.host in ['rdrama.net', 'pcmemes.net'] %}
-									<a class="dropdown-item" rel="nofollow noopener noreferrer" href="/report_bugs"><i class="fas fa-bug fa-fw text-left mr-3"></i>Report bugs or suggestions</a>
+									<a class="dropdown-item" rel="nofollow noopener noreferrer" href="/report_bugs"><i class="fas fa-bug fa-fw text-left mr-3"></i>Bugs/Suggestions</a>
 								{% endif %}
 
 								{% if request.host != 'pcmemes.net' %}
@@ -177,7 +177,7 @@
 			<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw mr-3"></i>Source code</a>
 
 			{% if request.host in ['rdrama.net', 'pcmemes.net'] %}
-				<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="/report_bugs"><i class="fas fa-bug fa-fw mr-3"></i>Report bugs or suggestions</a>
+				<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="/report_bugs"><i class="fas fa-bug fa-fw mr-3"></i>Bugs/Suggestions</a>
 			{% endif %}
 
 			{% if request.host != 'pcmemes.net' %}

files/templates/settings_profile.html

@@ -111,7 +111,7 @@
 							<p>Change the theme for the website.</p>
 							<div class="input-group mb2">
 								<select autocomplete="off" id='theme' class="form-control" form="profile-settings" name="theme" onchange="post_toast('/settings/profile?theme='+document.getElementById('theme').value, '1')">
-								{% for entry in  ["transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %}
+								{% for entry in  ["classic","transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %}
 									<option value="{{entry}}" {% if v.theme==entry %} selected {% endif %}>
 										{{entry}}
 									</option>

files/templates/userpage.html

@@ -503,7 +503,7 @@
 
 								<form action="/admin/title_change/{{u.id}}" method="post">
 									<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
-									<input autocomplete="off" id="customtitlebody-mobile" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.customtitle %}{{u.customtitle}}{% endif %}">
+									<input autocomplete="off" id="customtitlebody-mobile" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.customtitleplain %}{{u.customtitleplain}}{% endif %}">
 									<div class="d-flex mt-2">
 										<a class="format" role="button"><i class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('customtitlebody-mobile')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom"  data-bs-original-title="Add Emoji"></i></a>
 										&nbsp;&nbsp;&nbsp;