Merge branch 'frost' into william

files/assets/CHRISTMAS/js/emoji_modal.js

@@ -102,7 +102,7 @@ const EMOJIS_STRINGS = [
 			marseypin: 'chapose pinned sticky',
 			marseyplaying: 'dramarama fish playful mischief srdine animated',
 			marseyplaying2: 'dramarama fish playful mischief srdine animated',
-			marseyplugged: 'altaccountjolteon electric technology gif animated plug',
+			marseyplugged: 'altaccountumbreon electric technology gif animated plug',
 			marseyponder: 'bartholomew_1 ponder orb wizard magician crystal ball',
 			marseypredator: 'geese_suck predator drone obama wedding military',
 			marseyraccoon: 'trashpanda trash panda',
@@ -145,7 +145,7 @@ const EMOJIS_STRINGS = [
 			marseyalien: 'chapose green man martian scepter',
 			marseyamazon: 'dramarama warehouse piss bottle driver wagecuck piss jug pissbottle pissjug wagie',
 			marseyandmarcus: 'bed sleeping cuddling cuddle marseyismywaifu',
-			marseyanime: 'altaccountflareon sayian weeb',
+			marseyanime: 'altaccountumbreon sayian weeb',
 			marseyannoyed: 'jellyfishjam pissed irritation reaction annoyance angry mad irritated stfu grr',
 			marseyanticarp: 'reaction fish carpathianflorist',
 			marseyantiwork: 'chiobu lazy laze bum unemployed animated',
@@ -172,12 +172,12 @@ const EMOJIS_STRINGS = [
 			marseybaphomet: 'threeletteragent halloween demon satan holiday evil devil',
 			marseybased: 'chiobu basado king chiobu redpilled reaction animated',
 			marseybateman: 'cynic bret easton ellis serial halloween patrick american psycho killer holiday blood murderer',
-			marseybath: 'altaccountflareon shower tub rubber duck',
+			marseybath: 'altaccountumbreon shower tub rubber duck',
 			marseybattered: 'altaccountumbreon blackeye domestic violence black eye marseyismywaifu bardfinn steve akins penny beaten bruised housewife',
 			marseybear: 'dramarama brian gabby murderer brianna',
 			marseybear2: 'chiobu ursine bear fursona skin animal costume furry fursuit',
 			marseybeggar: 'altaccountumbreon poor busking panhandler gofundme busker',
-			marseyben10: 'altaccountflareon ten anime cartoon lawlz',
+			marseyben10: 'altaccountumbreon ten anime cartoon lawlz',
 			marseybiden: 'altaccountumbreon ddd dementia daddy president sleepy joe',
 			marseybigbrain: 'chapose high iq highiq smart genius',
 			marseybigdog: 'tejanx bussy big dog poster',
@@ -301,7 +301,7 @@ const EMOJIS_STRINGS = [
 			marseyditzy: 'dramarama pokemon',
 			marseydizzy: 'altaccountumbreon puke nausea spinning vomit reaction nauseous sick rolling barf animated',
 			marseydog: 'chiobu puppy doggo fursona skin animal costume dog furry fursuit',
-			marseydolphin: 'altaccountflareon ocean goggles rainbow',
+			marseydolphin: 'altaccountumbreon ocean goggles rainbow',
 			marseydoomer: 'sylveon cigarette smoker despair depression alcoholic suicidal smoking depressing',
 			marseydoubt: 'dramarama suspicious sussy reaction sarcastic sarcasm',
 			marseydracula: 'jellyfishjam halloween fangs cape holiday vampire',
@@ -336,7 +336,7 @@ const EMOJIS_STRINGS = [
 			marseyflamethrower: 'vietname soldier fire',
 			marseyflamewar: 'troll fight fire reaction gasoline',
 			marseyflareon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyflareonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyflareonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyfloyd: 'dead blm chauvin fentanyl george',
 			marseyfocault: 'sylveon philosophy history',
 			marseyfox: 'chiobu fursona furry fursuit kitsune',
@@ -360,7 +360,7 @@ const EMOJIS_STRINGS = [
 			marseygivecrown: 'king based swole reaction muscles',
 			marseygiveup: 'chiobu despair reaction depression miserable fall over depressed falling over animated sad',
 			marseyglaceon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyglaceonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyglaceonpat: 'sylveon trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyglam: 'rocker pretty glamorous beautiful',
 			marseyglancing: 'eyes animated nervous paranoid',
 			marseyglow2: 'threeletteragent fbi mossad feds agent glownigger reaction glowie fed atf cia nsa',
@@ -416,13 +416,13 @@ const EMOJIS_STRINGS = [
 			marseyjohnson: 'feynmandidnothingwrong wig history',
 			marseyjoint: 'smoke weed marijuana reefer drugs smoking 420 pot',
 			marseyjolteon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyjolteonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyjolteonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyjones: 'dramamine tinfoil animated alex gay frogs conspiracy',
 			marseyjourno: 'cantwakeupjpg journoid media press photo camera journalist pic',
 			marseyjudge: 'fartbinn objection innocent hammer guilty gavel court overruled sustained',
 			marseyjunkie: 'chapose needles heroin reaction shooting up addicted shoot up syringe',
 			marseykaiser: 'uraniumdonger prussian history wwi rifle reich wilhelm germany soldier',
-			marseykfc: 'altaccountflareon col sanders colonel kentucky fried chicken',
+			marseykfc: 'altaccountumbreon col sanders colonel kentucky fried chicken',
 			marseykingcrown: 'chiobu based animated',
 			marseykink: 'altaccountumbreon bdsm sex kinkster dom pervert sub creeper latex fetish dildo pvc',
 			marseykitty: 'tejanx hellokitty animated hello kitty',
@@ -439,7 +439,7 @@ const EMOJIS_STRINGS = [
 			marseylaptop: 'chiobu notebook macbook computer',
 			marseylawlz: 'suprememe masterlawls zhcyid9 masterlawlz reaction glasses',
 			marseyleafeon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyleafeonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyleafeonpat: 'sylveon trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseylibleft: 'feynmandidnothingwrong unemployed protest riot anarcho capitalist antifa anarchist anarchy',
 			marseylibright: 'feynmandidnothingwrong libertarian anarcho wagecuck pedophile capitalist lolbert',
 			marseylifting: 'workout muscular work out bench swole working out gains benchpress weightlifting weights muscles',
@@ -604,8 +604,8 @@ const EMOJIS_STRINGS = [
 			marseyreindeer: 'cynic christmas santa rudolf capy cold aevann holiday animated walking',
 			marseyreindeer2: 'feynmandidnothingwrong santa christmas rudolf holiday',
 			marseyrentfree: 'kellere31 reaction no charge obsessed obsession',
-			marseyreportercnn: 'altaccountflareon reporter journalist journoid interviewer',
+			marseyreportercnn: 'altaccountumbreon reporter journalist journoid interviewer',
-			marseyreporterfox: 'altaccountflareon reporter journalist journoid interviewer',
+			marseyreporterfox: 'altaccountumbreon reporter journalist journoid interviewer',
 			marseyretard: 'kellere31 special ed retarded reaction slow sped drooling exceptional',
 			marseyrevolution: 'fartbinn marxist ussr marxism ccp hammer communist sickle communism proletariat juche kgb',
 			marseyrick: 'altaccountumbreon smart 150iq high iq reaction 150 iq morty',
@@ -667,7 +667,7 @@ const EMOJIS_STRINGS = [
 			marseysnoo: 'altaccountumbreon shaking redditor scared reaction nervous schizo reddit',
 			marseysob: 'chiobu tear crying depressed reaction sobbing depression sad cry animated tears',
 			marseysociety: 'altaccountumbreon batman joker capeshit jared leto',
-			marseysonic: 'altaccountflareon hedgehog blue',
+			marseysonic: 'altaccountumbreon hedgehog blue',
 			marseysoypoint: 'altaccountumbreon soyboy soy boy beard reaction pointing',
 			marseyspecial: 'chapose retard reaction slow special needs sped',
 			marseyspecialpat: 'petting retard reaction sped animated patting',
@@ -692,7 +692,7 @@ const EMOJIS_STRINGS = [
 			marseysus: 'seal_ion amogus among us stonetoss sussy baka amongus',
 			marseysweating: 'dramarama anxiety worried wipe scared worrying reaction anxious nervous stressed',
 			marseysylveon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseysylveonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseysylveonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseytaliban: 'mujahideen janniejihad islam afganistan shariah afghanistan muslim',
 			marseytalibanpat: 'mujahideen petting janniejihad terrorist islam reaction afganistan muslim animated patting',
 			marseytank: 'military ussr ccp communist authleft tank army communism china soviet',
@@ -731,14 +731,14 @@ const EMOJIS_STRINGS = [
 			marseytwins: 'chiobu halloween holiday flashing shining scary animated',
 			marseyuglyxmasweater: 'santa hat christmas ugly holiday',
 			marseyumbreon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyumbreonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyumbreonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyunabomber: 'kellere31 package industrial society delivery mail kaczynski uncle ted',
 			marseyunpettable: 'kellere31 dramamine fashy rightoid chud fashwave altright vaporwave',
 			marseyuwuw: 'chapose fursona furry fursuit',
 			marseyvampire: 'cantwakeupjpg undead sanguine horror spooky halloween fangs holiday monster',
 			marseyvan: 'libertarian pedobear free candy pedophile groomer lolbert chomo molester pedo toucher',
 			marseyvaporeon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyvaporeonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyvaporeonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyvaporwave: 'dramamine trippy 80s psychedelic animated retro',
 			marseyvaxmaxx: 'chapose mask coronavirus covid gigavax corona vaccine vaccination hazmat',
 			marseyvengeance: 'gigavaccinator gore undead shotgun horror halloween revenge monster bloody head wound holiday',
@@ -801,7 +801,7 @@ const EMOJIS_STRINGS = [
 	},
 	{
 		type: 'classic',
-		emojis: ['idhitit','2thumbsup','aliendj','ambulance','angry','angrywhip','argue','aroused','ashamed','badass','banana','band','banghead','batman','bigeyes','bite','blind','blowkiss','blush','bong','bounce','bow','breakheart','bs','cartwheel','cat','celebrate','chainsaw','cheers','clap','cold','confused','crazyeyes','cry','cthulhu','cute','d','daydream','ddr','deadpool','devilsmile','diddle','die','distress','disturbing','dizzy','domo','doughboy','drink','drool','dudeweedlmao','edward','electro','elephant','embarrassed','emo','emo2','evil','evilclown','evilgrin','facepalm','fap','flamethrower','flipbird','flirt','frown','gasp','glomp','go','gooby','grr','gtfo','guitar','haha','handshake','happydance','headbang','heart','heartbeat','hearts','highfive','hmm','hmph','holdhands','horny','hug','hugging','hugs','hump','humpbed','hysterical','ily','inlove','jason','jawdrop','jedi','jester','kaboom','kick','kiss','kitty','laughchair','lick','link','lol','lolbeat','loving','makeout','medal','megaman','megamanguitar','meow','metime','mooning','mummy','na','nauseous','nervous','ninja','nod','nono','omg','onfire','ooo','orly','p','paddle','panda','pandabutt','paranoid','party','pat','peek','pikachu','pimp','plzdie','poke','popcorn','pout','probe','puke','punch','quote','raccoon','roar','rofl','roflmao','rolleyes','sad','sadeyes','sadhug','samurai','sarcasm','scoot','scream','shmoopy','shrug','skull','slap','slapfight','sleepy','smackfish','smackhead','smh','smile','smoke','sonic','spank','sparta','sperm','spiderman','stab','star','stare','stfu','suicide','surprisehug','suspicious','sweat','swordfight','taco','talk2hand','tantrum','teehee','thinking','threesome','throw','throwaway','tickle','typing','uhuh','vampbat','viking','violin','vulgar','wah','wat','whip','whipping','wink','witch','wizard','woah','worm','woo','work','worship','wow','xd','yay','zzz']
+		emojis: ['idhitit','2thumbsup','aliendj','ambulance','angry','angrywhip','argue','aroused','ashamed','badass','banana','band','banghead','batman','bigeyes','bite','blind','blowkiss','blush','bong','bounce','bow','breakheart','bs','cartwheel','cat','celebrate','chainsaw','cheers','clap','cold','confused','crazyeyes','cry','cthulhu','cute','laughing','daydream','ddr','deadpool','devilsmile','diddle','die','distress','disturbing','dizzy','domo','doughboy','drink','drool','dudeweedlmao','edward','electro','elephant','embarrassed','emo','emo2','evil','evilclown','evilgrin','facepalm','fap','flamethrower','flipbird','flirt','frown','gasp','glomp','go','gooby','grr','gtfo','guitar','haha','handshake','happydance','headbang','heart','heartbeat','hearts','highfive','hmm','hmph','holdhands','horny','hug','hugging','hugs','hump','humpbed','hysterical','ily','inlove','jason','jawdrop','jedi','jester','kaboom','kick','kiss','kitty','laughchair','lick','link','lol','lolbeat','loving','makeout','medal','megaman','megamanguitar','meow','metime','mooning','mummy','na','nauseous','nervous','ninja','nod','nono','omg','onfire','ooo','orly','tongueout','paddle','panda','pandabutt','paranoid','party','pat','peek','pikachu','pimp','plzdie','poke','popcorn','pout','probe','puke','punch','quote','raccoon','roar','rofl','roflmao','rolleyes','sad','sadeyes','sadhug','samurai','sarcasm','scoot','scream','shmoopy','shrug','skull','slap','slapfight','sleepy','smackfish','smackhead','smh','smile','smoke','sonic','spank','sparta','sperm','spiderman','stab','star','stare','stfu','suicide','surprisehug','suspicious','sweat','swordfight','taco','talk2hand','tantrum','teehee','thinking','threesome','throw','throwaway','tickle','typing','uhuh','vampbat','viking','violin','vulgar','wah','wat','whip','whipping','wink','witch','wizard','woah','worm','woo','work','worship','wow','xd','yay','zzz']
 	},
 	{
 		type: 'rage',

files/assets/css/main.css

@@ -4472,7 +4472,7 @@ textarea {
 }
 }
 .container, .container-fluid {
-    padding-bottom: 30px;
+    padding-bottom: 50px;
 }
 .navbar {
     padding: 0.5rem 0.5rem 0.3rem 0.5rem;
@@ -4738,3 +4738,8 @@ lite-youtube.lyt-activated > .lty-playbtn {
 .ytp-pause-overlay-controls-hidden .ytp-pause-overlay, ytp-pause-overlay ytp-scroll-min {
     display: none!important;
 }
+
+table {
+    display: inline-block !important;
+    overflow: auto !important;
+}

files/assets/js/comments_v.js

@@ -24,17 +24,21 @@ function post_toast3(url, button1, button2) {
 	xhr.withCredentials=true;
 
 	xhr.onload = function() {
+		try {
 			let data = JSON.parse(xhr.response)
 			if (xhr.status >= 200 && xhr.status < 300 && !data['error']) {
 				document.getElementById('toast-post-success-text').innerText = data["message"];
 				new bootstrap.Toast(document.getElementById('toast-post-success')).show();
-			document.getElementById(button1).classList.toggle("d-md-inline-block");
+
-			document.getElementById(button2).classList.toggle("d-md-inline-block");
+				document.getElementById(button1).classList.toggle("d-none");
+				document.getElementById(button2).classList.toggle("d-none");
 			
 			} else {
 				if (data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
 				new bootstrap.Toast(document.getElementById('toast-post-error')).show();
 			}
+		}
+		catch(e) {new bootstrap.Toast(document.getElementById('toast-post-error')).show();}
 	};
 
 	xhr.send(form);

files/assets/js/emoji_modal.js

@@ -102,7 +102,7 @@ const EMOJIS_STRINGS = [
 			marseypin: 'chapose pinned sticky',
 			marseyplaying: 'dramarama fish playful mischief srdine animated',
 			marseyplaying2: 'dramarama fish playful mischief srdine animated',
-			marseyplugged: 'altaccountjolteon electric technology gif animated plug',
+			marseyplugged: 'altaccountumbreon electric technology gif animated plug',
 			marseyponder: 'bartholomew_1 ponder orb wizard magician crystal ball',
 			marseypredator: 'geese_suck predator drone obama wedding military',
 			marseyraccoon: 'trashpanda trash panda',
@@ -145,7 +145,7 @@ const EMOJIS_STRINGS = [
 			marseyalien: 'chapose green man martian scepter',
 			marseyamazon: 'dramarama warehouse piss bottle driver wagecuck piss jug pissbottle pissjug wagie',
 			marseyandmarcus: 'bed sleeping cuddling cuddle marseyismywaifu',
-			marseyanime: 'altaccountflareon sayian weeb',
+			marseyanime: 'altaccountumbreon sayian weeb',
 			marseyannoyed: 'jellyfishjam pissed irritation reaction annoyance angry mad irritated stfu grr',
 			marseyanticarp: 'reaction fish carpathianflorist',
 			marseyantiwork: 'chiobu lazy laze bum unemployed animated',
@@ -172,12 +172,12 @@ const EMOJIS_STRINGS = [
 			marseybaphomet: 'threeletteragent halloween demon satan holiday evil devil',
 			marseybased: 'chiobu basado king chiobu redpilled reaction animated',
 			marseybateman: 'cynic bret easton ellis serial halloween patrick american psycho killer holiday blood murderer',
-			marseybath: 'altaccountflareon shower tub rubber duck',
+			marseybath: 'altaccountumbreon shower tub rubber duck',
 			marseybattered: 'altaccountumbreon blackeye domestic violence black eye marseyismywaifu bardfinn steve akins penny beaten bruised housewife',
 			marseybear: 'dramarama brian gabby murderer brianna',
 			marseybear2: 'chiobu ursine bear fursona skin animal costume furry fursuit',
 			marseybeggar: 'altaccountumbreon poor busking panhandler gofundme busker',
-			marseyben10: 'altaccountflareon ten anime cartoon lawlz',
+			marseyben10: 'altaccountumbreon ten anime cartoon lawlz',
 			marseybiden: 'altaccountumbreon ddd dementia daddy president sleepy joe',
 			marseybigbrain: 'chapose high iq highiq smart genius',
 			marseybigdog: 'tejanx bussy big dog poster',
@@ -301,7 +301,7 @@ const EMOJIS_STRINGS = [
 			marseyditzy: 'dramarama pokemon',
 			marseydizzy: 'altaccountumbreon puke nausea spinning vomit reaction nauseous sick rolling barf animated',
 			marseydog: 'chiobu puppy doggo fursona skin animal costume dog furry fursuit',
-			marseydolphin: 'altaccountflareon ocean goggles rainbow',
+			marseydolphin: 'altaccountumbreon ocean goggles rainbow',
 			marseydoomer: 'sylveon cigarette smoker despair depression alcoholic suicidal smoking depressing',
 			marseydoubt: 'dramarama suspicious sussy reaction sarcastic sarcasm',
 			marseydracula: 'jellyfishjam halloween fangs cape holiday vampire',
@@ -336,7 +336,7 @@ const EMOJIS_STRINGS = [
 			marseyflamethrower: 'vietname soldier fire',
 			marseyflamewar: 'troll fight fire reaction gasoline',
 			marseyflareon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyflareonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyflareonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyfloyd: 'dead blm chauvin fentanyl george',
 			marseyfocault: 'sylveon philosophy history',
 			marseyfox: 'chiobu fursona furry fursuit kitsune',
@@ -360,7 +360,7 @@ const EMOJIS_STRINGS = [
 			marseygivecrown: 'king based swole reaction muscles',
 			marseygiveup: 'chiobu despair reaction depression miserable fall over depressed falling over animated sad',
 			marseyglaceon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyglaceonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyglaceonpat: 'sylveon trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyglam: 'rocker pretty glamorous beautiful',
 			marseyglancing: 'eyes animated nervous paranoid',
 			marseyglow2: 'threeletteragent fbi mossad feds agent glownigger reaction glowie fed atf cia nsa',
@@ -416,13 +416,13 @@ const EMOJIS_STRINGS = [
 			marseyjohnson: 'feynmandidnothingwrong wig history',
 			marseyjoint: 'smoke weed marijuana reefer drugs smoking 420 pot',
 			marseyjolteon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyjolteonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyjolteonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyjones: 'dramamine tinfoil animated alex gay frogs conspiracy',
 			marseyjourno: 'cantwakeupjpg journoid media press photo camera journalist pic',
 			marseyjudge: 'fartbinn objection innocent hammer guilty gavel court overruled sustained',
 			marseyjunkie: 'chapose needles heroin reaction shooting up addicted shoot up syringe',
 			marseykaiser: 'uraniumdonger prussian history wwi rifle reich wilhelm germany soldier',
-			marseykfc: 'altaccountflareon col sanders colonel kentucky fried chicken',
+			marseykfc: 'altaccountumbreon col sanders colonel kentucky fried chicken',
 			marseykingcrown: 'chiobu based animated',
 			marseykink: 'altaccountumbreon bdsm sex kinkster dom pervert sub creeper latex fetish dildo pvc',
 			marseykitty: 'tejanx hellokitty animated hello kitty',
@@ -439,7 +439,7 @@ const EMOJIS_STRINGS = [
 			marseylaptop: 'chiobu notebook macbook computer',
 			marseylawlz: 'suprememe masterlawls zhcyid9 masterlawlz reaction glasses',
 			marseyleafeon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyleafeonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyleafeonpat: 'sylveon trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseylibleft: 'feynmandidnothingwrong unemployed protest riot anarcho capitalist antifa anarchist anarchy',
 			marseylibright: 'feynmandidnothingwrong libertarian anarcho wagecuck pedophile capitalist lolbert',
 			marseylifting: 'workout muscular work out bench swole working out gains benchpress weightlifting weights muscles',
@@ -604,8 +604,8 @@ const EMOJIS_STRINGS = [
 			marseyreindeer: 'cynic christmas santa rudolf capy cold aevann holiday animated walking',
 			marseyreindeer2: 'feynmandidnothingwrong santa christmas rudolf holiday',
 			marseyrentfree: 'kellere31 reaction no charge obsessed obsession',
-			marseyreportercnn: 'altaccountflareon reporter journalist journoid interviewer',
+			marseyreportercnn: 'altaccountumbreon reporter journalist journoid interviewer',
-			marseyreporterfox: 'altaccountflareon reporter journalist journoid interviewer',
+			marseyreporterfox: 'altaccountumbreon reporter journalist journoid interviewer',
 			marseyretard: 'kellere31 special ed retarded reaction slow sped drooling exceptional',
 			marseyrevolution: 'fartbinn marxist ussr marxism ccp hammer communist sickle communism proletariat juche kgb',
 			marseyrick: 'altaccountumbreon smart 150iq high iq reaction 150 iq morty',
@@ -667,7 +667,7 @@ const EMOJIS_STRINGS = [
 			marseysnoo: 'altaccountumbreon shaking redditor scared reaction nervous schizo reddit',
 			marseysob: 'chiobu tear crying depressed reaction sobbing depression sad cry animated tears',
 			marseysociety: 'altaccountumbreon batman joker capeshit jared leto',
-			marseysonic: 'altaccountflareon hedgehog blue',
+			marseysonic: 'altaccountumbreon hedgehog blue',
 			marseysoypoint: 'altaccountumbreon soyboy soy boy beard reaction pointing',
 			marseyspecial: 'chapose retard reaction slow special needs sped',
 			marseyspecialpat: 'petting retard reaction sped animated patting',
@@ -692,7 +692,7 @@ const EMOJIS_STRINGS = [
 			marseysus: 'seal_ion amogus among us stonetoss sussy baka amongus',
 			marseysweating: 'dramarama anxiety worried wipe scared worrying reaction anxious nervous stressed',
 			marseysylveon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseysylveonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseysylveonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseytaliban: 'mujahideen janniejihad islam afganistan shariah afghanistan muslim',
 			marseytalibanpat: 'mujahideen petting janniejihad terrorist islam reaction afganistan muslim animated patting',
 			marseytank: 'military ussr ccp communist authleft tank army communism china soviet',
@@ -731,14 +731,14 @@ const EMOJIS_STRINGS = [
 			marseytwins: 'chiobu halloween holiday flashing shining scary animated',
 			marseyuglyxmasweater: 'santa hat christmas ugly holiday',
 			marseyumbreon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyumbreonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyumbreonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyunabomber: 'kellere31 package industrial society delivery mail kaczynski uncle ted',
 			marseyunpettable: 'kellere31 dramamine fashy rightoid chud fashwave altright vaporwave',
 			marseyuwuw: 'chapose fursona furry fursuit',
 			marseyvampire: 'cantwakeupjpg undead sanguine horror spooky halloween fangs holiday monster',
 			marseyvan: 'libertarian pedobear free candy pedophile groomer lolbert chomo molester pedo toucher',
 			marseyvaporeon: 'sylveon trick or treat pokemon halloween eevee costume holiday',
-			marseyvaporeonpat: 'trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
+			marseyvaporeonpat: 'chiobu trick or treat pokemon petting halloween eevee reaction costume holiday animated patting',
 			marseyvaporwave: 'dramamine trippy 80s psychedelic animated retro',
 			marseyvaxmaxx: 'chapose mask coronavirus covid gigavax corona vaccine vaccination hazmat',
 			marseyvengeance: 'gigavaccinator gore undead shotgun horror halloween revenge monster bloody head wound holiday',
@@ -801,7 +801,7 @@ const EMOJIS_STRINGS = [
 	},
 	{
 		type: 'classic',
-		emojis: ['idhitit','2thumbsup','aliendj','ambulance','angry','angrywhip','argue','aroused','ashamed','badass','banana','band','banghead','batman','bigeyes','bite','blind','blowkiss','blush','bong','bounce','bow','breakheart','bs','cartwheel','cat','celebrate','chainsaw','cheers','clap','cold','confused','crazyeyes','cry','cthulhu','cute','d','daydream','ddr','deadpool','devilsmile','diddle','die','distress','disturbing','dizzy','domo','doughboy','drink','drool','dudeweedlmao','edward','electro','elephant','embarrassed','emo','emo2','evil','evilclown','evilgrin','facepalm','fap','flamethrower','flipbird','flirt','frown','gasp','glomp','go','gooby','grr','gtfo','guitar','haha','handshake','happydance','headbang','heart','heartbeat','hearts','highfive','hmm','hmph','holdhands','horny','hug','hugging','hugs','hump','humpbed','hysterical','ily','inlove','jason','jawdrop','jedi','jester','kaboom','kick','kiss','kitty','laughchair','lick','link','lol','lolbeat','loving','makeout','medal','megaman','megamanguitar','meow','metime','mooning','mummy','na','nauseous','nervous','ninja','nod','nono','omg','onfire','ooo','orly','p','paddle','panda','pandabutt','paranoid','party','pat','peek','pikachu','pimp','plzdie','poke','popcorn','pout','probe','puke','punch','quote','raccoon','roar','rofl','roflmao','rolleyes','sad','sadeyes','sadhug','samurai','sarcasm','scoot','scream','shmoopy','shrug','skull','slap','slapfight','sleepy','smackfish','smackhead','smh','smile','smoke','sonic','spank','sparta','sperm','spiderman','stab','star','stare','stfu','suicide','surprisehug','suspicious','sweat','swordfight','taco','talk2hand','tantrum','teehee','thinking','threesome','throw','throwaway','tickle','typing','uhuh','vampbat','viking','violin','vulgar','wah','wat','whip','whipping','wink','witch','wizard','woah','worm','woo','work','worship','wow','xd','yay','zzz']
+		emojis: ['idhitit','2thumbsup','aliendj','ambulance','angry','angrywhip','argue','aroused','ashamed','badass','banana','band','banghead','batman','bigeyes','bite','blind','blowkiss','blush','bong','bounce','bow','breakheart','bs','cartwheel','cat','celebrate','chainsaw','cheers','clap','cold','confused','crazyeyes','cry','cthulhu','cute','laughing','daydream','ddr','deadpool','devilsmile','diddle','die','distress','disturbing','dizzy','domo','doughboy','drink','drool','dudeweedlmao','edward','electro','elephant','embarrassed','emo','emo2','evil','evilclown','evilgrin','facepalm','fap','flamethrower','flipbird','flirt','frown','gasp','glomp','go','gooby','grr','gtfo','guitar','haha','handshake','happydance','headbang','heart','heartbeat','hearts','highfive','hmm','hmph','holdhands','horny','hug','hugging','hugs','hump','humpbed','hysterical','ily','inlove','jason','jawdrop','jedi','jester','kaboom','kick','kiss','kitty','laughchair','lick','link','lol','lolbeat','loving','makeout','medal','megaman','megamanguitar','meow','metime','mooning','mummy','na','nauseous','nervous','ninja','nod','nono','omg','onfire','ooo','orly','tongueout','paddle','panda','pandabutt','paranoid','party','pat','peek','pikachu','pimp','plzdie','poke','popcorn','pout','probe','puke','punch','quote','raccoon','roar','rofl','roflmao','rolleyes','sad','sadeyes','sadhug','samurai','sarcasm','scoot','scream','shmoopy','shrug','skull','slap','slapfight','sleepy','smackfish','smackhead','smh','smile','smoke','sonic','spank','sparta','sperm','spiderman','stab','star','stare','stfu','suicide','surprisehug','suspicious','sweat','swordfight','taco','talk2hand','tantrum','teehee','thinking','threesome','throw','throwaway','tickle','typing','uhuh','vampbat','viking','violin','vulgar','wah','wat','whip','whipping','wink','witch','wizard','woah','worm','woo','work','worship','wow','xd','yay','zzz']
 	},
 	{
 		type: 'rage',

files/assets/js/header.js

@@ -26,15 +26,21 @@ function post_toast(url, reload, data) {
 	xhr.withCredentials=true;
 
 	xhr.onload = function() {
+		try {
 			let data = JSON.parse(xhr.response)
 			if (xhr.status >= 200 && xhr.status < 300 && !data['error']) {
 				document.getElementById('toast-post-success-text').innerText = data["message"];
 				new bootstrap.Toast(document.getElementById('toast-post-success')).show();
-			if (reload == 1) {location.reload(true)}
+
+				document.getElementById(button1).classList.toggle("d-none");
+				document.getElementById(button2).classList.toggle("d-none");
+			
 			} else {
 				if (data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
 				new bootstrap.Toast(document.getElementById('toast-post-error')).show();
 			}
+		}
+		catch(e) {new bootstrap.Toast(document.getElementById('toast-post-error')).show();}
 	};
 
 	xhr.send(form);

files/assets/js/post_toast2.js

@@ -15,6 +15,7 @@ function post_toast2(url, button1, button2) {
 	xhr.withCredentials=true;
 
 	xhr.onload = function() {
+		try {
 			let data = JSON.parse(xhr.response)
 			if (xhr.status >= 200 && xhr.status < 300 && !data['error']) {
 				document.getElementById('toast-post-success-text').innerText = data["message"];
@@ -27,6 +28,8 @@ function post_toast2(url, button1, button2) {
 				if (data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
 				new bootstrap.Toast(document.getElementById('toast-post-error')).show();
 			}
+		}
+		catch(e) {new bootstrap.Toast(document.getElementById('toast-post-error')).show();}
 	};
 
 	xhr.send(form);

files/helpers/discord.py

@@ -57,8 +57,8 @@ def set_nick(user, nick):
 	data={"nick": nick}
 	requests.patch(url, headers=headers, json=data, timeout=5)
 
-def send_message(message):
+def send_discord_message(message):
-	url=f"https://discordapp.com/api/channels/924485611715452940/messages"
 	headers = {"Authorization": f"Bot {BOT_TOKEN}"}
 	data={"content": message}
-	requests.post(url, headers=headers, data=data, timeout=5)
+	requests.post(f"https://discordapp.com/api/channels/924485611715452940/messages", headers=headers, data=data, timeout=5)
+	requests.post(f"https://discordapp.com/api/channels/924486091795484732/messages", headers=headers, data=data, timeout=5)

files/helpers/sanitize.py

@@ -212,14 +212,14 @@ def sanitize(sanitized, noimages=False):
 		t = params.get('t', params.get('start', [0]))[0]
 		if isinstance(t, str): t = t.replace('s','')
 
-		htmlsource = f'<lite-youtube videoid="{yt_id}" params="controls=0&modestbranding=1'
+		htmlsource = f'<lite-youtube videoid="{yt_id}" params="autoplay=1&modestbranding=1'
 		if t: htmlsource += f'&start={t}'
 		htmlsource += '"></lite-youtube>'
 
 		sanitized = sanitized.replace(replacing, htmlsource)
 	for i in re.finditer('>(https://.*?\.(mp4|webm|mov))</a></p>', sanitized):
 		sanitized = sanitized.replace(f'<p><a href="{i.group(1)}" rel="nofollow noopener noreferrer" target="_blank">{i.group(1)}</a></p>', f'<p><video controls preload="none" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
-	for i in re.finditer('<p>(https:.*?\.(mp4|webm))</p>', sanitized):
+	for i in re.finditer('<p>(https:.*?\.(mp4|webm|mov))</p>', sanitized):
 		sanitized = sanitized.replace(i.group(0), f'<p><video controls preload="none" class="embedvid"><source src="{i.group(1)}" type="video/{i.group(2)}"></video>')
 
 	for rd in ["https://reddit.com/", "https://new.reddit.com/", "https://www.reddit.com/", "https://redd.it/"]:

files/routes/admin.py

@@ -17,9 +17,11 @@ from files.__main__ import app, cache, limiter
 from .front import frontlist
 from files.helpers.discord import add_role
 from datetime import datetime
+import requests
 
 SITE_NAME = environ.get("SITE_NAME", "").strip()
 GUMROAD_ID = environ.get("GUMROAD_ID", "tfcvri").strip()
+GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", "").strip()
 
 if SITE_NAME == 'PCM': cc = "splash mountain"
 else: cc = "country club"
@@ -182,7 +184,7 @@ def remove_meme_admin(v, username):
 
 @app.post("/admin/monthly")
 @limiter.limit("1/day")
-@admin_level_required(2)
+@admin_level_required(3)
 @validate_formkey
 def monthly(v):
 	if 'pcm' in request.host or (SITE_NAME == 'Drama' and v.admin_level > 2) or ('rama' not in request.host and 'pcm' not in request.host):
@@ -208,12 +210,10 @@ def monthly(v):
 				elif u.patron == 3: procoins = 10000
 				elif u.patron == 4: procoins = 25000
 				elif u.patron == 5: procoins = 50000
+				else: print(u.username)
 				u.procoins += procoins
 				g.db.add(u)
-				
+				send_repeatable_notification(u.id, f"You were given {procoins} Marseybux for the month of {month}! You can use them to buy awards in the [shop](/shop).")
-				cid = notif_comment(f"You were given {procoins} Marseybux for the month of {month}! You can use them to buy awards in the [shop](/shop).")
-				add_notif(cid, u.id)
-
 		g.db.commit()
 	return {"message": "Monthly coins granted"}
 
@@ -224,7 +224,7 @@ def get_sidebar(v):
 
 	try:
 		with open(f'files/templates/sidebar_{SITE_NAME}.html', 'r') as f: sidebar = f.read()
-	except Exception:
+	except:
 		sidebar = None
 
 	return render_template('admin/sidebar.html', v=v, sidebar=sidebar)
@@ -250,7 +250,7 @@ def post_sidebar(v):
 
 	g.db.commit()
 
-	return render_template('admin/sidebar.html', v=v, sidebar=sidebar)
+	return render_template('admin/sidebar.html', v=v, sidebar=sidebar, msg='Sidebar edited successfully!')
 
 
 @app.get("/admin/shadowbanned")

files/routes/posts.py

@@ -7,7 +7,7 @@ from files.helpers.sanitize import *
 from files.helpers.filters import *
 from files.helpers.markdown import *
 from files.helpers.alerts import *
-from files.helpers.discord import send_message
+from files.helpers.discord import send_discord_message
 from files.helpers.const import *
 from files.classes import *
 from flask import *
@@ -103,11 +103,6 @@ def post_id(pid, anything=None, v=None):
 	try: pid = int(pid)
 	except Exception as e: pass
 
-	if request.host == 'rdrama.net' and pid in [BUG_THREAD, EMOJI_THREAD]: defaultsortingcomments = 'new'
-	elif v: defaultsortingcomments = v.defaultsortingcomments
-	else: defaultsortingcomments = "top"
-
-	sort = request.values.get("sort", defaultsortingcomments)
 
 	try: pid = int(pid)
 	except:
@@ -116,6 +111,11 @@ def post_id(pid, anything=None, v=None):
 
 	post = get_post(pid, v=v)
 
+	if 'megathread' in post.title.lower(): defaultsortingcomments = 'new'
+	elif v: defaultsortingcomments = v.defaultsortingcomments
+	else: defaultsortingcomments = "top"
+	sort = request.values.get("sort", defaultsortingcomments)
+
 	if post.club and not (v and (v.paid_dues or v.id == post.author_id)): abort(403)
 
 	if v:
@@ -786,7 +786,7 @@ def submit_post(v):
 			params = parse_qs(urlparse(url).query)
 			t = params.get('t', params.get('start', [0]))[0]
 			if isinstance(t, str): t = t.replace('s','')
-			embed = f'<lite-youtube videoid="{yt_id}" params="controls=0&modestbranding=1'
+			embed = f'<lite-youtube videoid="{yt_id}" params="autoplay=1&modestbranding=1'
 			if t: embed += f'&start={t}'
 			embed += '"></lite-youtube>'
 		elif app.config['SERVER_NAME'] in domain and "/post/" in url and "context" not in url:
@@ -1176,7 +1176,7 @@ def submit_post(v):
 	cache.delete_memoized(frontlist)
 	cache.delete_memoized(User.userpagelisting)
 	if v.admin_level > 1 and ("[changelog]" in new_post.title or "(changelog)" in new_post.title) and not new_post.private:
-		send_message(f"https://{site}{new_post.permalink}")
+		send_discord_message(f"https://{site}{new_post.permalink}")
 		cache.delete_memoized(changeloglist)
 
 	g.db.commit()

files/routes/settings.py

@@ -584,7 +584,7 @@ def verifiedcolor(v):
 @validate_formkey
 def settings_security_post(v):
 	if request.values.get("new_password"):
-		# if v.id == PW_ID: abort(403)
+		if v.id == PW_ID: abort(403)
 
 		if request.values.get("new_password") != request.values.get("cnf_password"):
 			return render_template("settings_security.html", v=v, error="Passwords do not match.")
@@ -601,7 +601,7 @@ def settings_security_post(v):
 
 		g.db.commit()
 
-		return render_template("settings_security.html", v=v, error="Your password has been changed.")
+		return render_template("settings_security.html", v=v, msg="Your password has been changed.")
 
 	if request.values.get("new_email"):
 

files/templates/CHRISTMAS/default.html

@@ -336,7 +336,7 @@
 <script src="/assets/CHRISTMAS/js/lite-youtube.js?a=1"></script>
 
 <script src="/assets/CHRISTMAS/js/gif_modal.js?a=1"></script>
-<script src="/assets/CHRISTMAS/js/emoji_modal.js?b=12"></script>
+<script src="/assets/CHRISTMAS/js/emoji_modal.js?a=14"></script>
 
 <script defer src="/assets/CHRISTMAS/js/popover.js?a=1"></script>
 

files/templates/CHRISTMAS/settings_profile.html

@@ -416,7 +416,7 @@
 <script src="/assets/CHRISTMAS/js/settings_profile.js?a=1"></script>
 
 <script src="/assets/CHRISTMAS/js/gif_modal.js?a=1"></script>
-<script src="/assets/CHRISTMAS/js/emoji_modal.js?b=12"></script>
+<script src="/assets/CHRISTMAS/js/emoji_modal.js?a=14"></script>
 
 <script>
 	document.onpaste = function(event) {

files/templates/admin/awards.html

@@ -64,6 +64,6 @@
 
 	<pre></pre>
 	{% if 'rdrama.net' not in request.host or v.admin_level > 2 %}
-		<div><a class="btn btn-success" role="button" onclick="post_toast('/admin/monthly')">Grant Monthly Marseybux</a></div>
+		<div><a class="btn btn-danger" role="button" onclick="post_toast('/admin/monthly')">Grant Monthly Marseybux</a></div>
 	{% endif %}
 {% endblock %}

files/templates/admin/sidebar.html

@@ -4,6 +4,18 @@
 
 {% block content %}
 
+{% if msg %}
+	<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
+		<i class="fas fa-check-circle my-auto" aria-hidden="true"></i>
+		<span>
+			{{msg}}
+		</span>
+		<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
+		</button>
+	</div>
+{% endif %}
+
 <div class="row my-5">
 	<div class="col col-md-8">
 		<div class="settings">

files/templates/authforms.html

@@ -15,7 +15,7 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -39,7 +39,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 
 </head>

files/templates/changelog.html

@@ -104,6 +104,6 @@
 </nav>
 {% endif %}
 
-<script src="/static/assets/js/post_toast2.js?a=4"></script>
+<script src="/static/assets/js/post_toast2.js?a=6"></script>
 
 {% endblock %}

files/templates/comments.html

@@ -844,7 +844,7 @@
 
 {% if v %}
 	<script src="/static/assets/js/marked.js?a=3"></script>
-	<script src="/static/assets/js/comments_v.js?a=4"></script>
+	<script src="/static/assets/js/comments_v.js?a=6"></script>
 {% endif %}
 
 <script src="/static/assets/js/clipboard.js?a=3"></script>

files/templates/default.html

@@ -7,7 +7,7 @@
 	<script src="/static/assets/js/bootstrap.js?a=3"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
 		<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 		{% if v.agendaposter %}
 			<style>
@@ -32,7 +32,7 @@
 		{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 
 	<meta charset="utf-8">
@@ -274,14 +274,8 @@
 		</div>
 		{% if request.path == '/' %}
 			{% block sidebar %}
-			<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
-				<div class="sidebar-section">
-					<img src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{range(1,95)|random()}}.webp?a=3" width=100%>
-					<a class="btn btn-primary btn-block mt-4" href="/submit">SUBMIT DRAMA!</a>
 				{% set template = "sidebar_" + environ.get("SITE_NAME") + ".html" %}
 				{% include template %}
-				</div>
-			</div>				
 			{% endblock %}
 		{% endif %}
 	</div>
@@ -324,7 +318,7 @@
 <script src="/static/assets/js/lozad.js?a=3"></script>
 
 {% if v %}
-	<script src="/static/assets/js/post_toast2.js?a=4"></script>
+	<script src="/static/assets/js/post_toast2.js?a=6"></script>
 	<script src="/static/assets/js/formatting.js?a=3"></script>
 	<script src="/static/assets/js/default.js?a=3"></script>
 {% endif %}

files/templates/emoji_modal.html

@@ -81,7 +81,7 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?a=10"></script>
+<script src="/static/assets/js/emoji_modal.js?a=14"></script>
 
 <style>
 	a.emojitab {

files/templates/formatting.html

@@ -59,7 +59,7 @@ You can use Markdown formatting:
 		<tr>
 			<td>Youtube Videos</td>
 			<td>https://youtube.com/watch?v=3Hecr51ByE4</td>
-			<td><lite-youtube videoid="3Hecr51ByE4" params="controls=0&modestbranding=1"></lite-youtube></td>
+			<td><lite-youtube videoid="3Hecr51ByE4" params="autoplay=1&modestbranding=1"></lite-youtube></td>
 		</tr>
 		<tr>
 			<td>Video Files</td>

files/templates/header.html

@@ -210,7 +210,7 @@
 	</div>
 </nav>
 
-<script src="/static/assets/js/header.js?a=4"></script>
+<script src="/static/assets/js/header.js?a=6"></script>
 
 <style>
 	.notif-count {

files/templates/log.html

@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% if v.agendaposter %}
 		<style>
 			html {
@@ -30,7 +30,7 @@
 	{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 {% endif %}
 
 <div class="row justify-content-around">

files/templates/login.html

@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=42">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
 	<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>

files/templates/login_2fa.html

@@ -14,7 +14,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/settings.html

@@ -34,7 +34,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% if v.agendaposter %}
 		<style>
 			html {
@@ -53,7 +53,7 @@
 				font-size: 11px !important
 			}
 		</style>
-	{% elif v.css %}
+	{% elif v.css and not request.path.startswith('/settings/css') %}
 		<link rel="stylesheet" href="/@{{v.username}}/css">
 	{% endif %}
 </head>

files/templates/settings2.html

@@ -39,10 +39,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 	{% endif %}
 </head>
 

files/templates/sidebar_Drama.html

@@ -1,3 +1,10 @@
+<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
+    <img src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{range(1,95)|random()}}.webp?a=3" width=100%>
+    <a class="btn btn-primary btn-block mt-4" href="/submit">SUBMIT DRAMA!</a>
+    <a class="btn btn-primary btn-block" href="/post/16583">EMOJI MEGATHREAD</a>
+    <a class="btn btn-primary btn-block" href="/post/18459">BUGS/SUGGESTIONS MEGATHREAD</a>
+    <a class="btn btn-primary btn-block" href="/post/32341">SIDEBAR ARTWORK MEGATHREAD</a>
+
     <p class="mt-4">Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.</p>
 
     <p>Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.</p>
@@ -30,3 +37,4 @@
     <h5>RULE 5 </h5>All rules can and likely will be ignored at admin discretion. Be funny, or at least compelling, and pretty much anything legal is fine.<br><br>
 
     Okay I think that’s all, thanks for reading! No one cares about your dumb <I>free speech</I> or whatever, go to Gab or something if you want to screech about amendments and stuff. Rules are not hard and fast, and janitorial abuse is inherent to the platform. So is ban evasion. Have fun or log out, both are easy!
+</div>

files/templates/sign_up.html

@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/sign_up_failed_ref.html

@@ -32,7 +32,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 
 </head>
 

files/templates/submission.html

@@ -117,7 +117,7 @@
 <meta property="og:author" name="author" content="{{'@'+comment_info.author.username}}" >
 <meta property="og:title" content="{{'@'+comment_info.author.username}} comments on {{p.plaintitle(v)}} - {{'SITE_NAME' | app_config}}" >
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/static/assets/images/{{'SITE_NAME' | app_config}}/preview.gif{% endif %}" >
-{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm')) %}
+{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov')) %}
 	<meta property="og:video" content="{{ p.realurl(v) }}" >
 {% endif %}
 <meta property="og:url" content="{{comment_info.permalink | full_link}}" >
@@ -146,7 +146,7 @@
 {% if p.author %}<meta property="og:author" name="author" content="{{'@'+p.author.username}}" >{% endif %}
 <meta property="og:title" content="{{p.plaintitle(v)}} - {{'SITE_NAME' | app_config}}" >
 <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{'SITE_NAME' | app_config}}/static/assets/images/{{'SITE_NAME' | app_config}}/preview.gif{% endif %}" >
-{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm')) %}
+{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov')) %}
 <meta property="og:video" content="{{ p.realurl(v) }}" >
 {% endif %}
 <meta property="og:url" content="{{p.permalink | full_link}}" >
@@ -373,7 +373,7 @@
 
 					<div id="post-body" class="post-body mt-3">
 						{% if p.realurl(v) %}
-							{% if not p.embed_url and not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm'))) %}
+							{% if not p.embed_url and not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov'))) %}
 								<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
 									<div class="d-flex d-md-none justify-content-between align-items-center border rounded p-2{% if p.realbody(v) %} mb-3{% endif %}">
 										<span>{{p.domain|truncate(30, True)}}</span>
@@ -630,7 +630,7 @@
 
 		</div>
 
-		{% if not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm'))) %}
+		{% if not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov'))) %}
 			<div class="row no-gutters d-md-none">
 				<div class="col">
 					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}"></a>

files/templates/submit.html

@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=42"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=46"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=3">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -50,7 +50,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=42">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=46">
 			<link rel="stylesheet" href="/static/assets/css/{{'DEFAULT_THEME' | app_config}}.css?a=3">
 		{% endif %}
 		{% endblock %}