Bump, Responsive login page, use new stylesheet helpers

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: Aevann1
-custom: ["https://marsey1.gumroad.com/l/rdrama"]

.github/workflows/ossar.yml

@@ -1,51 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow integrates a collection of open source static analysis tools
-# with GitHub code scanning. For documentation, or to provide feedback, visit
-# https://github.com/github/ossar-action
-name: OSSAR
-
-on:
-  push:
-    branches: [ frost ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ frost ]
-  schedule:
-    - cron: '34 10 * * 3'
-
-jobs:
-  OSSAR-Scan:
-    # OSSAR runs on windows-latest.
-    # ubuntu-latest and macos-latest support coming soon
-    runs-on: windows-latest
-    permissions:
-      security-events: write
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Ensure a compatible version of dotnet is installed.
-    # The [Microsoft Security Code Analysis CLI](https://aka.ms/mscadocs) is built with dotnet v3.1.201.
-    # A version greater than or equal to v3.1.201 of dotnet must be installed on the agent in order to run this action.
-    # GitHub hosted runners already have a compatible version of dotnet installed and this step may be skipped.
-    # For self-hosted runners, ensure dotnet version 3.1.201 or later is installed by including this action:
-    # - name: Install .NET
-    #   uses: actions/setup-dotnet@v1
-    #   with:
-    #     dotnet-version: '3.1.x'
-
-      # Run open source static analysis tools
-    - name: Run OSSAR
-      uses: github/ossar-action@v1
-      id: ossar
-
-      # Upload results to the Security tab
-    - name: Upload OSSAR results
-      uses: github/codeql-action/upload-sarif@v2
-      with:
-        sarif_file: ${{ steps.ossar.outputs.sarifFile }}

docker-compose.yml

@@ -7,11 +7,6 @@ services:
             - "./:/rDrama"
             - "./nginx.conf:/etc/nginx/sites-enabled/1"
             - "./nginx-serve-static.conf:/etc/nginx/includes/serve-static"
-        env_file: env
-        environment:
-            - DATABASE_URL=postgresql://postgres@postgres:5432
-            - REDIS_URL=redis://redis
-            - PROXY_URL=http://opera-proxy:18080
         links:
             - "redis"
             - "postgres"

env

@@ -1,38 +1,38 @@
-FLASK_APP=/rDrama/files/cli:app
-SITE=localhost
-SITE_NAME=rDrama
-MASTER_KEY=blahblahblah
-PROXY_URL=http://localhost:18080
-GIPHY_KEY=blahblahblah
-DISCORD_SERVER_ID=blahblahblah
-DISCORD_CLIENT_ID=blahblahblah
-DISCORD_CLIENT_SECRET=blahblahblah
-DISCORD_BOT_TOKEN=blahblahblah
-HCAPTCHA_SITEKEY=blahblahblah
-HCAPTCHA_SECRET=blahblahblah
-YOUTUBE_KEY=blahblahblah
-PUSHER_ID=blahblahblah
-PUSHER_KEY=blahblahblah
-IMGUR_KEY=blahblahblah
-SPAM_SIMILARITY_THRESHOLD=0.5
-SPAM_URL_SIMILARITY_THRESHOLD=0.1
-SPAM_SIMILAR_COUNT_THRESHOLD=10
-COMMENT_SPAM_SIMILAR_THRESHOLD=0.5
-COMMENT_SPAM_COUNT_THRESHOLD=10
-DEFAULT_TIME_FILTER=all
-GUMROAD_TOKEN=blahblahblah
-GUMROAD_LINK=https://marsey1.gumroad.com/l/rdrama
-GUMROAD_ID=rdrama
-CARD_VIEW=0
-DISABLE_DOWNVOTES=0
-DUES=0
-DEFAULT_THEME=midnight
-DEFAULT_COLOR=805ad5
-EMAIL=blahblahblah@gmail.com
-MAILGUN_KEY=blahblahblah
-DESCRIPTION=rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!
-CF_KEY=blahblahblah
-CF_ZONE=blahblahblah
-DEBIAN_FRONTEND=noninteractive
-NODE_VERSION=16.13.0
-NVM_DIR=/root/.nvm
+export FLASK_APP="/rDrama/files/cli:app"
+export SITE="localhost"
+export SITE_NAME="rDrama"
+export SECRET_KEY="blahblahblah"
+export DATABASE_URL="postgresql://postgres@localhost:5432"
+export REDIS_URL="redis://localhost:6379"
+export PROXY_URL="http://localhost:18080"
+export GIPHY_KEY="blahblahblah"
+export DISCORD_BOT_TOKEN="blahblahblah"
+export HCAPTCHA_SITEKEY="blahblahblah"
+export HCAPTCHA_SECRET="blahblahblah"
+export YOUTUBE_KEY="blahblahblah"
+export PUSHER_ID="blahblahblah"
+export PUSHER_KEY="blahblahblah"
+export IMGUR_KEY="blahblahblah"
+export SPAM_SIMILARITY_THRESHOLD="0.5"
+export SPAM_URL_SIMILARITY_THRESHOLD="0.1"
+export SPAM_SIMILAR_COUNT_THRESHOLD="10"
+export COMMENT_SPAM_SIMILAR_THRESHOLD="0.5"
+export COMMENT_SPAM_COUNT_THRESHOLD="10"
+export DEFAULT_TIME_FILTER="all"
+export GUMROAD_TOKEN="blahblahblah"
+export GUMROAD_LINK="blahblahblah"
+export GUMROAD_ID="blahblahblah"
+export CARD_VIEW="0"
+export DISABLE_DOWNVOTES="0"
+export DUES="0"
+export DEFAULT_THEME="midnight"
+export DEFAULT_COLOR="805ad5"
+export EMAIL="blahblahblah@gmail.com"
+export MAILGUN_KEY="blahblahblah"
+export DESCRIPTION="rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!"
+export CF_KEY="blahblahblah"
+export CF_ZONE="blahblahblah"
+export DEBIAN_FRONTEND="noninteractive"
+export NODE_VERSION="16.13.0"
+export NVM_DIR="/root/.nvm"
+export TELEGRAM_LINK="blahblahblah"

files/__main__.py

@@ -24,8 +24,10 @@ app.jinja_env.auto_reload = True
 app.jinja_env.add_extension('jinja2.ext.do')
 faulthandler.enable()
 
-app.config['SECRET_KEY'] = environ.get('MASTER_KEY')
-app.config["SERVER_NAME"] = environ.get("SITE").strip()
+SITE = environ.get("SITE").strip()
+
+app.config['SERVER_NAME'] = SITE
+app.config['SECRET_KEY'] = environ.get('SECRET_KEY').strip()
 app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 3153600
 app.config["SESSION_COOKIE_NAME"] = "session_" + environ.get("SITE_NAME").strip().lower()
 app.config['MAX_CONTENT_LENGTH'] = 100 * 1024 * 1024
@@ -35,15 +37,14 @@ app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365
 app.config['SESSION_REFRESH_EACH_REQUEST'] = False
 
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
-app.config['SQLALCHEMY_DATABASE_URL'] = environ.get("DATABASE_URL", "postgresql://postgres@localhost:5432")
+app.config['SQLALCHEMY_DATABASE_URL'] = environ.get("DATABASE_URL").strip()
 
 app.config["CACHE_TYPE"] = "RedisCache"
-app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL", "redis://localhost")
-
+app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL").strip()
 
 app.config['SETTINGS'] = {}
 
-r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)
+r=redis.Redis(host=environ.get("REDIS_URL").strip(), decode_responses=True, ssl_cert_reqs=None)
 
 def get_CF():
 	with app.app_context():
@@ -74,6 +75,8 @@ if not path.isfile(f'/site_settings.json'):
 
 @app.before_request
 def before_request():
+	if SITE == 'marsey.world' and request.path != '/kofi':
+		abort(404)
 
 	g.agent = request.headers.get("User-Agent")
 	if not g.agent and request.path != '/kofi':
@@ -85,8 +88,10 @@ def before_request():
 	with open('/site_settings.json', 'r', encoding='utf_8') as f:
 		app.config['SETTINGS'] = json.load(f)
 
-	if request.host != app.config["SERVER_NAME"]: return {"error":"Unauthorized host provided."}, 401
-	if request.headers.get("CF-Worker"): return {"error":"Cloudflare workers are not allowed to access this website."}, 401
+	if request.host != SITE:
+		return {"error": "Unauthorized host provided"}, 403
+
+	if request.headers.get("CF-Worker"): return {"error": "Cloudflare workers are not allowed to access this website."}, 403
 
 	if not app.config['SETTINGS']['Bots'] and request.headers.get("Authorization"): abort(403)
 
@@ -99,6 +104,10 @@ def before_request():
 	request.full_path = request.full_path.rstrip('?').rstrip('/')
 	if not request.full_path: request.full_path = '/'
 
+	if not session.get("session_id"):
+		session.permanent = True
+		session["session_id"] = secrets.token_hex(49)
+
 @app.after_request
 def after_request(response):
 	response.headers.add("Strict-Transport-Security", "max-age=31536000")

files/assets/css/4chan.css

@@ -28,10 +28,6 @@
 	color: var(--primary) !important;
 }
 
-.modal .comment-actions a {
-	color: var(--gray-500);
-}
-
 .navbar-light .navbar-nav .nav-link .fa, .navbar-light .navbar-nav .nav-link .fas, .navbar-light .navbar-nav .nav-link .far, .navbar-light .navbar-nav .nav-link .fab {
 	color: var(--black);
 }
@@ -155,3 +151,7 @@ blockquote a {
 h5.post-title a:visited {
 	color: #949494 !important;
 }
+
+.comment-actions > * {
+	color: var(--gray-500);
+}

files/assets/css/catalog.css

@@ -13,7 +13,7 @@
 		font-size: 18px;
 	}
 
-    #frontpage .post-meta, #frontpage .post-actions {
+	#frontpage .post-meta, .post-actions button, .post-actions a {
 		font-size:14px;
 	}
 }

files/assets/css/coffee.css

@@ -66,10 +66,6 @@ blockquote {
 	color: var(--black) !important;
 }
 
-.modal .comment-actions a {
-	color: var(--gray-200);
-}
-
 .navbar-light .navbar-nav .nav-link .fa, .navbar-light .navbar-nav .nav-link .fas, .navbar-light .navbar-nav .nav-link .far, .navbar-light .navbar-nav .nav-link .fab {
 	color: var(--black);
 }
@@ -107,3 +103,7 @@ blockquote {
 h5.post-title a:visited {
 	color: #949494 !important;
 }
+
+.comment-actions > * {
+	color: var(--gray-200);
+}

files/assets/css/fontawesome.css

@@ -363,3 +363,4 @@
 .fa-landscape:before{content:"\e1b5"}
 .fa-user-ninja:before{content:"\f504"}
 .fa-club:before{content:"\f327"}
+.fa-shirt:before{content:"\f553"}

files/assets/css/main-dev.css

@@ -3,9 +3,18 @@
  *               Live Debootstrap               *
  ************************************************/
 
+/**
+ * Q: WHAT!!! MY CHANGE ISNT APPLYING!!!
+ * A: Not all files are adapted for this main-dev.css file,
+ *    The only known pages with these applications are login.html and sign_up.html
+ */
 
 /* TODO move to html ref for compatibility */
-@import url("fontawesome.css");
+/* Commented out due to main.css */
+/* @import url("fontawesome.css"); */
+
+/* TEMP */
+@import url("midnight.css");
 
 @charset "UTF-8";
 *, *::before, *::after {
@@ -33,7 +42,7 @@ html, body {
  * make a regular link, undo these for specific areas like post content, etc */
 a, a:visited, a:hover, a:active {
     text-decoration: none;
-    color: var(--primary, #000);
+    color: var(--primary, #805ad5);
 }
 
 /* Font stuff */
@@ -133,6 +142,35 @@ nav {
     padding-top: 0;
 }
 
+#login .splash-wrapper
+{
+    transition: .4s;
+}
+
+/* Make login mobile */
+@media (max-width: 800px) {
+    #login .splash-wrapper
+    {
+        z-index: -999;
+        position: absolute;
+        display: block;
+        right: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        filter: contrast(0.4) blur(12px) sepia(20%) saturate(180%) brightness(30%);
+    }
+    #login input
+    {
+        background-color: transparent;
+    }
+    #login h1,
+    #login p
+    {
+        text-align:  center;
+    }
+}
+
 #register-form-container {
     display: flex;
     flex: 1;
@@ -160,7 +198,7 @@ nav {
     width: 100%;
     height: 100%;
     background-color: rgba(127,127,127,.25);
-    background-image: linear-gradient(135deg,rgba(30,30,36,0.1) 0%,var(--primary) 150%);
+    background-image: linear-gradient(135deg,rgba(30,30,36,0.1) 0%,var(--primary, #805ad5) 150%);
     z-index: 50;
 }
 

files/assets/css/main.css

@@ -8,6 +8,15 @@
 
 @import url("fontawesome.css");
 @charset "UTF-8";
+button {
+	background: none;
+	border: none;
+	padding: 0;
+	margin: 0;
+	color: var(--primary);
+	text-decoration: none;
+	background-color: transparent;
+}
 *, *::before, *::after {
 	box-sizing: border-box;
 }
@@ -221,28 +230,28 @@ template {
 [hidden] {
 	display: none !important;
 }
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1, h2, h3, h4, h5, h6 {
 	margin-top: 1rem;
 	margin-bottom: 1rem;
 	font-weight: 600;
 	line-height: 1.2;
 }
-h1, .h1 {
+h1 {
 	font-size: 2.5rem;
 }
-h2, .h2 {
+h2 {
 	font-size: 2rem;
 }
-h3, .h3 {
+h3 {
 	font-size: 1.75rem;
 }
-h4, .h4 {
+h4 {
 	font-size: 1.5rem;
 }
-h5, .h5 {
+h5 {
 	font-size: 1.25rem;
 }
-h6, .h6 {
+h6 {
 	font-size: 1rem;
 }
 hr {
@@ -2283,6 +2292,12 @@ a.bg-light:hover, a.bg-light:focus, button.bg-light:hover, button.bg-light:focus
 .ml-4, .mx-4 {
 	margin-left: 1.5rem !important;
 }
+.mr-5, .mx-5 {
+	margin-right: 3rem !important;
+}
+.ml-5, .mx-5 {
+	margin-left: 3rem !important;
+}
 .mt-5, .my-5 {
 	margin-top: 3rem !important;
 }
@@ -3588,23 +3603,14 @@ small, .small {
 .modal .post-actions .list-group-item:focus, .modal .post-actions .list-group-item:hover {
 	background-color: var(--gray-300);
 }
-.modal .post-actions a, .post-actions button {
-	color: var(--black);
-	font-size: 1rem;
-}
 .modal .post-actions .fa, .modal .post-actions .fas, .modal .post-actions .far {
 	width: 1.25rem;
 	font-size: 1rem;
 }
-.post-actions {
-	position: relative;
-	color: var(--muted);
-	font-weight: 600;
-	font-size: 12px;
-}
 .post-actions .fa, .post-actions .fas, .post-actions .far {
 	font-size: 12px;
 	margin-right: 0.5rem;
+	margin-left: 0.5rem;
 	width: 1rem;
 }
 .post-actions .voting .fa, .post-actions .voting .fas, .post-actions .voting .far {
@@ -3616,9 +3622,6 @@ small, .small {
 .post-actions .dropdown-item:hover .fa, .post-actions .dropdown-item:hover .fas {
 	color: var(--gray);
 }
-.post-actions a, .post-actions button:hover .fa, .post-actions a, .post-actions button:hover .fas {
-	color: var(--black);
-}
 .post-actions:hover, .post-actions:focus {
 	z-index: 4;
 }
@@ -3724,10 +3727,12 @@ small, .small {
 }
 .post-actions a, .post-actions button {
 	color: var(--gray-100);
+	font-weight: 600;
+	font-size: 12px;
 	text-decoration: none;
 	text-transform: none;
 }
-.post-actions a, .post-actions button:hover {
+.post-actions a:hover, .post-actions button:hover {
 	color: var(--black);
 }
 .post-actions .dropdown-item:hover {
@@ -3805,10 +3810,6 @@ small, .small {
 .modal .comment-actions .list-group-item:focus, .modal .comment-actions .list-group-item:hover {
 	background-color: var(--gray-300) !important;
 }
-.modal .comment-actions a {
-	color: var(--gray-100);
-	font-size: 1rem;
-}
 .modal .comment-actions .fa, .modal .comment-actions .fas, .modal .comment-actions .far {
 	width: 1.25rem;
 	font-size: 1rem;
@@ -3842,9 +3843,6 @@ small, .small {
 .comment-actions .dropdown-item:hover .fa, .comment-actions .dropdown-item:hover .fas, .comment-actions .dropdown-item:hover .far {
 	color: var(--black);
 }
-.comment-actions a:hover .fa, .comment-actions a:hover .fas, .comment-actions a:hover .far {
-	color: var(--black);
-}
 .comment-actions .fas.fa-ellipsis-h {
 	font-size: 1.25rem;
 	vertical-align: bottom;
@@ -3864,13 +3862,6 @@ small, .small {
 .comment-actions .list-inline .list-inline-item .dropdown-item:active {
 	color: var(--black);
 }
-.comment-actions a {
-	color: var(--gray-100);
-	text-decoration: none;
-}
-.comment-actions a:hover, .comment-actions .copy-link:hover {
-	color: var(--black);
-}
 .comment-actions .dropdown-item:hover {
 	color: var(--black);
 }
@@ -4383,13 +4374,6 @@ pre .com, code .com {
 	.post-meta {
 		font-size: 1rem;
 		padding-left: 3px;
-}
-	.post-actions {
-		font-weight: 400;
-}
-	.post-actions a, .post-actions button {
-		font-size: 1rem;
-		color: var(--gray-200);
 }
 	.post-actions .fa, .post-actions .fas, .post-actions .far {
 		font-size: 1rem;
@@ -4859,7 +4843,7 @@ img[src="/i/hand.webp"]+img {
 	transform-origin: bottom center;
 	margin-top: 10%;
 	text-align: center;
-    object-fit: cover;
+	object-fit: contain;
 }
 img[src="/i/hand.webp"]+img[src^="/pp/"], img[src="/i/hand.webp"]+img[src$="/pic"] {
 	border-radius: 50%;
@@ -5059,28 +5043,25 @@ img[glow]:not([data-src]) {
 	display: none;
 }
 
-.awards-wrapper a {
+.awards-wrapper > div {
 	cursor: pointer;
 	padding: 15px !important;
 	text-align: center;
 	text-transform: none!important;
 }
 
-.awards-wrapper a i {
+.awards-wrapper > div > i {
 	font-size: 25px;
 }
 
-.awards-wrapper a.disabled {
+.awards-wrapper > div.disabled {
 	opacity: 0.6;
 }
 
-.awards-wrapper a:hover:not(.disabled), .awards-wrapper .picked {
+.awards-wrapper > div:hover:not(.disabled), .awards-wrapper .picked {
 	background-color: var(--primary)!important;
 }
 
-.awards-wrapper input[type="radio"]:checked+a {
-	background-color: var(--primary)!important;
-}
 
 .award-columns {
 	column-count: 2;
@@ -5215,7 +5196,7 @@ a.emojitab {
 .expandedimage {
 	width: fit-content;
 	width: -moz-fit-content;
-	max-width: 100% !important;
+	max-width: 80% !important;
 }
 
 .m-5 {
@@ -5682,7 +5663,6 @@ g {
 	border-radius:.35rem;
 }
 
-
 .pronouns {
 	font-size: 9px;
 	margin-left: 0.25rem;
@@ -5746,12 +5726,6 @@ g {
 	opacity: 0.65;
 }
 
-@media (max-width: 767.98px) {
-	.post-actions {
-		margin-top: -5px;
-	}
-}
-
 .ghostdiv
 {
 	display: block;
@@ -5823,10 +5797,6 @@ g {
 	text-shadow:-1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black !important;
 }
 
-.modal .comment-actions a {
-	font-weight: 600;
-}
-
 div.custom-control:last-of-type {
 	margin-bottom: 1rem;
 }
@@ -5877,7 +5847,7 @@ blockquote + blockquote, div > blockquote:first-child, blockquote:last-child {
 
 
 #searchparams-dropdown {
-	z-index: 100;
+	z-index: 1;
 }
 .contain {
 	-o-object-fit: contain;
@@ -5937,9 +5907,6 @@ div.markdown {
 }
 
 @media (min-width: 768px) {
-	.expandedimage {
-		max-width: 80% !important;
-	}
 	#speed-carot-modal .speed-modal-image
 	{
 		width: 50px;
@@ -5949,3 +5916,37 @@ div.markdown {
 		max-width: 90% !important
 	}	
 }
+
+.d-block {
+	display: block !important;
+}
+
+.popover-bio-div {
+	max-height: 50vh !important;
+	overflow: auto;
+	scrollbar-width: none;
+	-ms-overflow-style: none;
+}
+
+.popover-bio-div::-webkit-scrollbar {
+	background: transparent;
+}
+
+@media (max-width: 768px) {
+	.d-mob-none {
+		display: none !important;
+	}
+}
+
+.comment-actions > * {
+	color: var(--gray-100);
+	text-decoration: none;
+	text-align: left;
+	margin-bottom: 2px;
+	font-size: 1rem;
+	font-weight: 600;
+}
+
+.comment-actions *:hover {
+	color: var(--black);
+}

files/assets/css/rDrama.css

@@ -0,0 +1,7 @@
+.mod:before {
+	content: '(((';
+}
+
+.mod:after {
+	content: ')))';
+}

files/assets/css/win98.css

@@ -131,10 +131,6 @@ blockquote {
 	color: var(--muted) !important;
 }
 
-.modal-header, .modal .comment-actions a, .modal-title {
-	color: var(--white) !important;
-}
-
 .text-info
 {
 	color: var(--primary) !important;
@@ -169,3 +165,7 @@ blockquote {
 h5.post-title a:visited {
 	color: #5c5c5c !important;
 }
+
+.comment-actions > * {
+	color: var(--white);
+}

files/assets/emojis.json

@@ -35,6 +35,9 @@
 	{"name":"7","class":"Marsey Alphabet"},
 	{"name":"8","class":"Marsey Alphabet"},
 	{"name":"9","class":"Marsey Alphabet"},
+	{"name":"ialt","class":"Marsey Alphabet"},
+	{"name":"0alt","class":"Marsey Alphabet"},
+	{"name":"ccedilla","class":"Marsey Alphabet"},
 	{"name":"space","class":"Marsey Alphabet"},
 	{"name":"comma","class":"Marsey Alphabet","tags": [","]},
 	{"name":"period","class":"Marsey Alphabet","tags": [".","dot"]},
@@ -42,7 +45,10 @@
 	{"name":"exclamationpoint","class":"Marsey Alphabet","tags": ["!"]},
 	{"name":"at","class":"Marsey Alphabet","tags": ["@"]},
 	{"name":"pound","class":"Marsey Alphabet","tags": ["#","hashtag","octothorpe"]},
+	{"name":"percent","class":"Marsey Alphabet","tags": ["%"]},
+	{"name":"caret","class":"Marsey Alphabet","tags":["^"]},
 	{"name":"ampersand","class":"Marsey Alphabet","tags": ["&","and"]},
+	{"name":"asterisk","class":"Marsey Alphabet","tags": ["*","times"]},
 	{"name":"paren","class":"Marsey Alphabet","tags": ["(",")"]},
 	{"name":"brace", "class":"Marsey Alphabet", "tags": ["{","}","curly","bracket"]},
 	{"name":"equals","class":"Marsey Alphabet","tags": ["="]},
@@ -54,7 +60,9 @@
 	{"name":"emdash","class":"Marsey Alphabet","tags": ["-","—"]},
 	{"name":"underscore","class":"Marsey Alphabet","tags": ["_"]},
 	{"name":"colon", "class":"Marsey Alphabet", "tags": [":"]},
-	{"name":"slash","class":"Marsey Alphabet","tags": ["/","\\"]},
+	{"name":"apostrophe","class":"Marsey Alphabet","tags":["'"]},
+	{"name":"quotation","class":"Marsey Alphabet","tags":["\""]},
+	{"name":"slash","class":"Marsey Alphabet","tags": ["/","\\","division"]},
 	{"name":"vert", "class":"Marsey Alphabet", "tags": ["|","pipe","vbar","bar"]},
 	{"name":"tilde", "class":"Marsey Alphabet", "tags": ["~","similar","approx"]},
 	{"name":"angle","class":"Marsey Alphabet","tags": ["<",">","gt","lt"]},
@@ -126,16 +134,11 @@
 	{"name":"otimes", "class":"Marsey Alphabet", "tags": ["⊗","tensor","circled","product"]},
 	{"name":"trianglelefteq", "class":"Marsey Alphabet", "tags": ["⊴"]},
 	
-	{"name":"marseyflagarmenia","class":"Marsey Flags"},
-	{"name":"marseyflagelsalvador","class":"Marsey Flags"},
 	{"name":"marseyflagmaryland","class":"Marsey Flags"},
+	{"name":"marseyflagcalifornia","class":"Marsey Flags"},
 	{"name":"marseyflagtexas","class":"Marsey Flags"},
-	{"name":"marseyflagtuvalu","class":"Marsey Flags"},
-	{"name":"marseyflagvatican","class":"Marsey Flags"},
+	{"name":"marseyflageu","class":"Marsey Flags"},
 	{"name":"marseyflagafrica","class":"Marsey Flags"},
-	{"name":"marseyflagbahamas","class":"Marsey Flags"},
-	{"name":"marseyflagbahrain","class":"Marsey Flags"},
-	{"name":"marseyflagbarbados","class":"Marsey Flags"},
 	{"name":"marseyflagafghanistan","class":"Marsey Flags"},
 	{"name":"marseyflagalbania","class":"Marsey Flags"},
 	{"name":"marseyflagalgeria","class":"Marsey Flags"},
@@ -144,10 +147,14 @@
 	{"name":"marseyflagantarctica","class":"Marsey Flags"},
 	{"name":"marseyflagantiguaandbarbuda","class":"Marsey Flags"},
 	{"name":"marseyflagargentina","class":"Marsey Flags"},
+	{"name":"marseyflagarmenia","class":"Marsey Flags"},
 	{"name":"marseyflagaustralia","class":"Marsey Flags"},
 	{"name":"marseyflagaustria","class":"Marsey Flags"},
 	{"name":"marseyflagazerbaijan","class":"Marsey Flags"},
+	{"name":"marseyflagbahamas","class":"Marsey Flags"},
+	{"name":"marseyflagbahrain","class":"Marsey Flags"},
 	{"name":"marseyflagbangladesh","class":"Marsey Flags"},
+	{"name":"marseyflagbarbados","class":"Marsey Flags"},
 	{"name":"marseyflagbelarus","class":"Marsey Flags"},
 	{"name":"marseyflagbelgium","class":"Marsey Flags"},
 	{"name":"marseyflagbosnia","class":"Marsey Flags"},
@@ -160,6 +167,7 @@
 	{"name":"marseyflagcyprus","class":"Marsey Flags"},
 	{"name":"marseyflagdenmark","class":"Marsey Flags"},
 	{"name":"marseyflagegypt","class":"Marsey Flags"},
+	{"name":"marseyflagelsalvador","class":"Marsey Flags"},
 	{"name":"marseyflagestonia","class":"Marsey Flags"},
 	{"name":"marseyflagfinland","class":"Marsey Flags"},
 	{"name":"marseyflagfrance","class":"Marsey Flags"},
@@ -186,6 +194,7 @@
 	{"name":"marseyflagnorthkorea","class":"Marsey Flags"},
 	{"name":"marseyflagnorway","class":"Marsey Flags"},
 	{"name":"marseyflagpakistan","class":"Marsey Flags"},
+	{"name":"marseyflagpalau","class":"Marsey Flags"},
 	{"name":"marseyflagpalestine","class":"Marsey Flags"},
 	{"name":"marseyflagperu","class":"Marsey Flags"},
 	{"name":"marseyflagphillipines","class":"Marsey Flags"},
@@ -206,10 +215,12 @@
 	{"name":"marseyflagtajikistan","class":"Marsey Flags"},
 	{"name":"marseyflagthailand","class":"Marsey Flags"},
 	{"name":"marseyflagturkey","class":"Marsey Flags"},
+	{"name":"marseyflagtuvalu","class":"Marsey Flags"},
 	{"name":"marseyflaguae","class":"Marsey Flags"},
 	{"name":"marseyflaguk","class":"Marsey Flags"},
 	{"name":"marseyflagukraine","class":"Marsey Flags"},
 	{"name":"marseyflagus","class":"Marsey Flags"},
+	{"name":"marseyflagvatican","class":"Marsey Flags"},
 	{"name":"marseyflagvietnam","class":"Marsey Flags"},
 
 	{"name":"patyl","class":"Platy","tags":["quper","platypus","mersya","wombiezolf","doodle"]},
@@ -547,6 +558,8 @@
 	{"name":"threesome","class":"Classic"},
 	{"name":"throw","class":"Classic"},
 	{"name":"throwaway","class":"Classic"},
+	{"name":"thumbup","class":"Classic"},
+	{"name":"thumbdown","class":"Classic"},
 	{"name":"tickle","class":"Classic"},
 	{"name":"typing","class":"Classic"},
 	{"name":"uhuh","class":"Classic"},
@@ -638,6 +651,9 @@
 	{"name":"truestorybro","class":"Rage"},
 	{"name":"xallthey","class":"Rage"},
 	{"name":"yuno","class":"Rage"},
+	{"name":"antichrist","class":"Rage"},
+	{"name":"antichristfffuuuu","class":"Rage"},
+	{"name":"bluehelmet","class":"Rage"},
 
 	{"name":"afroblackjak","class":"Wojak"},
 	{"name":"altgirlblackjack","class":"Wojak"},
@@ -719,6 +735,7 @@
 	{"name":"chadlatino","tags": ["latinx"],"class":"Wojak"},
 	{"name":"chadlibleft","tags": ["libleft"],"class":"Wojak"},
 	{"name":"chadnordic","tags": ["nordic", "nazi"],"class":"Wojak"},
+	{"name":"chadmediterranean","class":"Wojak"},
 	{"name":"chadsikh","tags": ["sikh", "indian"],"class":"Wojak"},
 	{"name":"chadusa","tags": ["usa", "america", "freedom"],"class":"Wojak"},
 	{"name":"chadsoy","class":"Wojak","tags": ["soy"]},
@@ -738,6 +755,14 @@
 	{"name":"npc","class":"Wojak"},
 	{"name":"npcfront","class":"Wojak"},
 	{"name":"npcmaga","class":"Wojak"},
+	{"name":"chadbaby","class":"Wojak"},
+	{"name":"chadstalin","class":"Wojak"},
+	{"name":"chudette","class":"Wojak"},
+	{"name":"chudgrug","class":"Wojak"},
+	{"name":"chudnazi","class":"Wojak"},
+	{"name":"chudsmug","class":"Wojak"},
+	{"name":"soy4dchess","class":"Wojak"},
+	{"name":"soyjaktantrum","class":"Wojak"},
 	{"name":"psychojak","class":"Wojak"},
 	{"name":"ragejak","tags": ["mad"],"class":"Wojak"},
 	{"name":"ragemask","tags": ["mad"],"class":"Wojak"},
@@ -751,6 +776,29 @@
 	{"name":"tomboy","tags": ["trans"],"class":"Wojak"},
 	{"name":"zoomer","class":"Wojak"},
 	{"name":"zoomersoy","tags": ["soyjak"],"class":"Wojak"},
+	{"name":"asianenbyjak","class":"Wojak"},
+	{"name":"asiangirl","class":"Wojak"},
+	{"name":"asiantwinkjak","class":"Wojak"},
+	{"name":"bobateagirl","class":"Wojak"},
+	{"name":"chadasian2","class":"Wojak"},
+	{"name":"chadindianheadset","class":"Wojak"},
+	{"name":"chinesenobleman","class":"Wojak"},
+	{"name":"chinesepolitician","class":"Wojak"},
+	{"name":"chinesesoldierjak","class":"Wojak"},
+	{"name":"greendesigirl","class":"Wojak"},
+	{"name":"imperialjapanesesoldier","class":"Wojak"},
+	{"name":"indiandoomergirl","class":"Wojak"},
+	{"name":"kimjojongjak","class":"Wojak"},
+	{"name":"kimonogirl","class":"Wojak"},
+	{"name":"maojak","class":"Wojak"},
+	{"name":"mongoljak","class":"Wojak"},
+	{"name":"scaryasianwife","class":"Wojak"},
+	{"name":"shorthairasiangirl","class":"Wojak"},
+	{"name":"singaporeansoldierjak","class":"Wojak"},
+	{"name":"suprisedasianwife","class":"Wojak"},
+	{"name":"tiawanesesoldierjak","class":"Wojak"},
+	{"name":"witheredricefarmer","class":"Wojak"},
+	{"name":"yakuzajak","class":"Wojak"},
 
 	{"name":"russia","class":"Flags"},
 	{"name":"niger","class":"Flags"},
@@ -778,12 +826,41 @@
 	{"name":"sharkylove","class":"Sets"},
 	{"name":"sharkysad","class":"Sets"},
 	{"name":"sharkythink","class":"Sets"},
+	{"name":"sharkymegalodon","class":"Sets"},
+	{"name":"sharkydinosaur","class":"Sets"},
 	{"name":"tracenote","class":"Sets"},
 	{"name":"tracelove","class":"Sets"},
 	{"name":"traceberk","class":"Sets"},
 	{"name":"tracesmug","class":"Sets"},
 	{"name":"tracemad","class":"Sets"},
 	{"name":"tracesad","class":"Sets"},
+	{"name":"parrot","class":"Sets"},
+	{"name":"parrotaccessible","class":"Sets"},
+	{"name":"parrotcongaparty","class":"Sets"},
+	{"name":"parrotcop","class":"Sets"},
+	{"name":"parrotevil","class":"Sets"},
+	{"name":"parrotgithub","class":"Sets"},
+	{"name":"parrothmm","class":"Sets"},
+	{"name":"parrothypno","class":"Sets"},
+	{"name":"parrotimposter","class":"Sets"},
+	{"name":"parrotisrael","class":"Sets"},
+	{"name":"parrotkazakhstan","class":"Sets"},
+	{"name":"parrotmergetrain","class":"Sets"},
+	{"name":"parrotmoonwalking","class":"Sets"},
+	{"name":"parrotportalblue","class":"Sets"},
+	{"name":"parrotportalorange","class":"Sets"},
+	{"name":"parrotpumpkin","class":"Sets"},
+	{"name":"parrotrevolution","class":"Sets"},
+	{"name":"parrotrip","class":"Sets"},
+	{"name":"parrotscience","class":"Sets"},
+	{"name":"parrotshort","class":"Sets"},
+	{"name":"parrotsleeping","class":"Sets"},
+	{"name":"parrotslow","class":"Sets"},
+	{"name":"parrottrans","class":"Sets"},
+	{"name":"parrotultrafast","class":"Sets"},
+	{"name":"parrotunitedstatesofamerica","class":"Sets"},
+	{"name":"parrotwitnessprotection","class":"Sets"},
+	{"name":"parrotzombie","class":"Sets"},
 
 	{"name":"grillcastyes", "tags":["podcast", "chad"],"class":"Misc"},
     {"name":"ivoted", "tags":["democracy", "spider"],"class":"Misc"},
@@ -805,7 +882,13 @@
 	{"name":"chadsneedcapy", "tags":["capy", "aevann"],"class":"Misc"},
 	{"name":"chadthankskingcapy", "tags":["capy", "aevann", "thanks", "king"],"class":"Misc"},
 	{"name":"chadthanksqueencapy", "tags":["capy", "aevann", "thanks", "queen"],"class":"Misc"},
+	{"name":"chadnoproblemkingcapy","class":"Misc", "tags":["capy", "aevann", "no", "problem", "king", "np"]},
+	{"name":"chadnoproblemqueencapy","class":"Misc", "tags":["capy", "aevann", "no", "problem", "queen", "np"]},
 	{"name":"chadstevejobs","class":"Misc"},
+	{"name":"chadmusk","class":"Misc"},
+	{"name":"dinoyes","class":"Misc"},
+	{"name":"dinono","class":"Misc"},
+	{"name":"dinoconfused","class":"Misc"},
 	{"name":"breadmarsey","class":"Misc"},
 	{"name":"breadcapy","class":"Misc"},
 	{"name":"marseymummified","class":"Misc"},
@@ -816,8 +899,14 @@
 	{"name":"snoosurprise","class":"Misc"},
 	{"name":"snooupvote","class":"Misc"},
 	{"name":"snoothumbsup","class":"Misc"},
+	{"name":"brooksannoyed","tags":["darrell", "suv", "waukesha", "retard", "idiot", "annoyed", "irritated", "mask", "suit", "black"],"class":"Misc"},
+	{"name":"brookslaugh","class":"Misc"},
+	{"name":"brookscringe","class":"Misc"},
+	{"name":"brooksjustright","class":"Misc"},
+	{"name":"brookskiss","class":"Misc"},
 	{"name":"gimp","class":"Misc"},
 	{"name":"taddance","class":"Misc","tags":["terry","davis","templeos","dance"]},
+	{"name":"realisticelephant","class":"Misc","tags":["terry","davis","templeos"]},
 	{"name":"sher","class":"Misc"},
 	{"name":"xdoubt","class":"Misc"},
 	{"name":"gigachadjesus","tags": ["chad", "jesus", "christ"],"class":"Misc"},
@@ -832,14 +921,17 @@
 	{"name":"deuxwaifu","class":"Misc"},
 	{"name":"flairlessmong","class":"Misc"},
 	{"name":"hardislife","class":"Misc"},
+	{"name":"ben10","class":"Misc"},
 	{"name":"redditgigachad","tags": ["chad", "gigachad"],"class":"Misc"},
 	{"name":"rfybear","class":"Misc"},
 	{"name":"etika","class":"Misc"},
 	{"name":"sneed","class":"Misc"},
+	{"name":"sneedcat","class":"Misc"},
 	{"name":"retardedchildren","class":"Misc"},
 	{"name":"bruh","class":"Misc"},
 	{"name":"autism","class":"Misc"},
 	{"name":"doot","class":"Misc"},
+	{"name":"mussolini","class":"Misc"},
 	{"name":"kylieface","class":"Misc"},
 	{"name":"queenyes","class":"Misc"},
 	{"name":"wholesomeseal","class":"Misc"},
@@ -851,5 +943,15 @@
 	{"name":"pedobear", "class":"Misc"},
 	{"name":"kippy","class":"Misc"},
 	{"name":"onerat","class":"Misc"},
-	{"name":"gunt","class":"Misc"}
+	{"name":"bitchhaditcomin","class":"Misc"},
+	{"name":"duckdance", "class":"Misc"},
+	{"name":"stoning","class":"Misc"},
+	{"name":"stoningpills","class":"Misc"},
+	{"name":"srdinepoppy","class":"Misc"},
+	{"name":"gunt","class":"Misc"},
+	{"name":"sneedbuddy","class":"Misc"},
+	{"name":"chuckbuddy","class":"Misc"},
+	{"name":"soren","class":"Misc"},
+	{"name":"upsoren","class":"Misc"},
+	{"name":"downdonger","class":"Misc"}
 ]