diff --git a/files/assets/CHRISTMAS/js/emoji_modal.js b/files/assets/CHRISTMAS/js/emoji_modal.js index f913b8bf1..c5eee48ad 100644 --- a/files/assets/CHRISTMAS/js/emoji_modal.js +++ b/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', - marseyreporterfox: 'altaccountflareon reporter journalist journoid interviewer', + marseyreportercnn: 'altaccountumbreon 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', diff --git a/files/assets/css/main.css b/files/assets/css/main.css index bfc1e26fd..e5350ed37 100644 --- a/files/assets/css/main.css +++ b/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; @@ -4737,4 +4737,9 @@ 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; } \ No newline at end of file diff --git a/files/assets/images/emojis/laughing.webp b/files/assets/images/emojis/laughing.webp new file mode 100644 index 000000000..2803c0259 Binary files /dev/null and b/files/assets/images/emojis/laughing.webp differ diff --git a/files/assets/images/emojis/tongueout.webp b/files/assets/images/emojis/tongueout.webp new file mode 100644 index 000000000..84f6d86fd Binary files /dev/null and b/files/assets/images/emojis/tongueout.webp differ diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 3984ebd31..a8f2ec88d 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -24,17 +24,21 @@ function post_toast3(url, button1, button2) { xhr.withCredentials=true; xhr.onload = function() { - 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"); + 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(); - } else { - if (data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - new bootstrap.Toast(document.getElementById('toast-post-error')).show(); + 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); diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 93d844adb..2a68654b1 100644 --- a/files/assets/js/emoji_modal.js +++ b/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', - marseyreporterfox: 'altaccountflareon reporter journalist journoid interviewer', + marseyreportercnn: 'altaccountumbreon 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', diff --git a/files/assets/js/header.js b/files/assets/js/header.js index 946c4cd8e..107f07dc4 100644 --- a/files/assets/js/header.js +++ b/files/assets/js/header.js @@ -26,15 +26,21 @@ function post_toast(url, reload, data) { xhr.withCredentials=true; xhr.onload = function() { - 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)} - } else { - if (data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - new bootstrap.Toast(document.getElementById('toast-post-error')).show(); + 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-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); diff --git a/files/assets/js/post_toast2.js b/files/assets/js/post_toast2.js index 4a2f23667..24c303aa0 100644 --- a/files/assets/js/post_toast2.js +++ b/files/assets/js/post_toast2.js @@ -15,18 +15,21 @@ function post_toast2(url, button1, button2) { xhr.withCredentials=true; xhr.onload = function() { - 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(); + 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-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(); + 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); diff --git a/files/helpers/const.py b/files/helpers/const.py index b395f1e2a..36cfb7b68 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -168,7 +168,6 @@ if SITE == 'rdrama.net': DONGER_ID = 541 FARTBINN_ID = 2256 BUG_THREAD = 29748 - EMOJI_THREAD = 16583 WELCOME_MSG = "Hi there! It's me, your soon-to-be favorite rDrama user @carpathianflorist here to give you a brief rundown on some of the sick features we have here. You'll probably want to start by following me, though. So go ahead and click my name and then smash that Follow button. This is actually really important, so go on. Hurry.\n\nThanks!\n\nNext up: If you're a member of the media, similarly just shoot me a DM and I'll set about verifying you and then we can take care of your sad journalism stuff.\n\n**FOR EVERYONE ELSE**\n\n Begin by navigating to [the settings page](https://rdrama.net/settings/profile) (we'll be prettying this up so it's less convoluted soon, don't worry) and getting some basic customization done.\n\n### Themes\n\nDefinitely change your theme right away, the default one (Midnight) is pretty enough, but why not use something *exotic* like Win98, or *flashy* like Tron? Even Coffee is super tasteful and way more fun than the default. More themes to come when we get around to it!\n\n### Avatar/pfp\n\nYou'll want to set this pretty soon; without uploading one, I put together a randomly-assigned selection of 180ish pictures of furries, ugly goths, mujahideen, anime girls, and My Little Ponys which are used by everyone who was too lazy to set a pfp. Set the banner too while you're at it. Your profile is important!\n\n### Flairs\n\nSince you're already on the settings page, you may as well set a flair, too. As with your username, you can - obviously - choose the color of this, either with a hex value or just from the preset colors. And also like your username, you can change this at any time. [Paypigs](https://marsey1.gumroad.com/l/tfcvri) can even further relive the glory days of 90s-00s internet and set obnoxious signatures.\n\n### PROFILE ANTHEMS\n\nSpeaking of profiles, hey, remember MySpace? Do you miss autoplaying music assaulting your ears every time you visited a friend's page? Yeah, we brought that back. Enter a YouTube URL, wait a few seconds for it to process, and then BAM! you've got a profile anthem which people cannot mute. Unless they spend 20,000 dramacoin in the shop for a mute button. Which you can then remove from your profile by spending 40,000 dramacoin on an unmuteable anthem. Get fucked poors!\n\n### Dramacoin?\n\nDramacoin is basically our take on the karma system. Except unlike the karma system, it's not gay and boring and stupid and useless. Dramacoin can be spent at [Marsey's Dramacoin Emporium](https://rdrama.net/shop) on upgrades to your user experience (many more coming than what's already listed there), and best of all on tremendously annoying awards to fuck with your fellow dramautists. We're always adding more, so check back regularly in case you happen to miss one of the announcement posts. Holiday-themed awards are currently unavailable while we resolve an internal dispute, but they **will** return, no matter what some other janitors insist.\n\nLike karma, dramacoin is obtained by getting upvotes on your threads and comments. *Unlike* karma, it's also obtained by getting downvotes on your threads and comments. Downvotes don't really do anything here - they pay the same amount of dramacoin and they increase thread/comment ranking just the same as an upvote. You just use them to express petty disapproval and hopefully start a fight. Because all votes are visible here. To hell with your anonymity.\n\nDramacoin can also be traded amongst users from their profiles. Note that there is a 3% transaction fee.\n\n**Dramacoin and shop items cannot be purchased with real money and this will not change.** Though we are notoriously susceptible to bribes, so definitely shoot your shot. It'll probably go well, honestly.\n\n### Badges\n\nRemember all those neat little metallic icons you saw on my profile when you were following me? If not, scroll back up and go have a look. And doublecheck to make sure you pressed the Follow button. Anyway, those are badges. You earn them by doing a variety of things. Some of them even offer benefits, like discounts at the shop. A [complete list of badges and their requirements can be found here](https://rdrama.net/badges), though I add more pretty regularly, so keep an eye on the changelog.\n\n### Other stuff\n\nWe're always adding new features, and we take a fun-first approach to development. If you have a suggestion for something that would be fun, funny, annoying - or best of all, some combination of all three - definitely make a thread about it. Or just DM me if you're shy. Weirdo. Anyway there's also the [leaderboards](https://rdrama.net/leaderboard), boring stuff like two-factor authentication you can toggle on somewhere in the settings page (psycho), the ability to save posts and comments, close to a thousand emojis already (several hundred of which are rDrama originals), and on and on and on and on. This is just the basics, mostly to help you get acquainted with some of the things you can do here to make it more easy on the eyes, customizable, and enjoyable. If you don't enjoy it, just go away! We're not changing things to suit you! Get out of here loser! And no, you can't delete your account :na:\n\nI love you.
*xoxo Carp* đź’‹" elif SITE == "pcmemes.net": PW_ID = 0 @@ -194,7 +193,6 @@ elif SITE == "pcmemes.net": DONGER_ID = 0 FARTBINN_ID = 0 BUG_THREAD = 4103 - EMOJI_THREAD = 0 WELCOME_MSG = "Welcome to pcmemes.net! Don't forget to turn off the slur filter [here](/settings/content#slurreplacer)" else: PW_ID = 0 @@ -220,7 +218,6 @@ else: DONGER_ID = 0 FARTBINN_ID = 0 BUG_THREAD = 0 - EMOJI_THREAD = 0 WELCOME_MSG = f"Welcome to {SITE}!" PUSHER_INSTANCE_ID = '02ddcc80-b8db-42be-9022-44c546b4dce6' diff --git a/files/helpers/discord.py b/files/helpers/discord.py index 9eeade0f1..7ebacadca 100644 --- a/files/helpers/discord.py +++ b/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): - url=f"https://discordapp.com/api/channels/924485611715452940/messages" +def send_discord_message(message): headers = {"Authorization": f"Bot {BOT_TOKEN}"} data={"content": message} - requests.post(url, headers=headers, data=data, timeout=5) \ No newline at end of file + 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) \ No newline at end of file diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index c5ca2fc2e..068b43322 100644 --- a/files/helpers/sanitize.py +++ b/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'' sanitized = sanitized.replace(replacing, htmlsource) for i in re.finditer('>(https://.*?\.(mp4|webm|mov))

', sanitized): sanitized = sanitized.replace(f'

{i.group(1)}

', f'

') - for i in re.finditer('

(https:.*?\.(mp4|webm))

', sanitized): + for i in re.finditer('

(https:.*?\.(mp4|webm|mov))

', sanitized): sanitized = sanitized.replace(i.group(0), f'

') for rd in ["https://reddit.com/", "https://new.reddit.com/", "https://www.reddit.com/", "https://redd.it/"]: diff --git a/files/routes/admin.py b/files/routes/admin.py index 24e9d137c..230ab1bfc 100644 --- a/files/routes/admin.py +++ b/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) - - 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) - + 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).") 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") diff --git a/files/routes/posts.py b/files/routes/posts.py index 3fda95d66..b07aa48dd 100644 --- a/files/routes/posts.py +++ b/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'' 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() diff --git a/files/routes/settings.py b/files/routes/settings.py index 8c78a80b3..f59822572 100644 --- a/files/routes/settings.py +++ b/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"): diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index fe963fa4d..4b3926ffa 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -336,7 +336,7 @@ - + diff --git a/files/templates/CHRISTMAS/settings_profile.html b/files/templates/CHRISTMAS/settings_profile.html index ac53534ed..c702cfb69 100644 --- a/files/templates/CHRISTMAS/settings_profile.html +++ b/files/templates/CHRISTMAS/settings_profile.html @@ -416,7 +416,7 @@ - + + {% endblock %} \ No newline at end of file diff --git a/files/templates/comments.html b/files/templates/comments.html index e7254fbcd..27950766e 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -844,7 +844,7 @@ {% if v %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 55277f43e..4f4115874 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} @@ -274,14 +274,8 @@ {% if request.path == '/' %} {% block sidebar %} -

-
- - SUBMIT DRAMA! - {% set template = "sidebar_" + environ.get("SITE_NAME") + ".html" %} - {% include template %} -
-
+ {% set template = "sidebar_" + environ.get("SITE_NAME") + ".html" %} + {% include template %} {% endblock %} {% endif %} @@ -324,7 +318,7 @@ {% if v %} - + {% endif %} diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index a7651f8eb..ab403230c 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -81,7 +81,7 @@ - + - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index b17fedd52..3c09e6299 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 557840a1c..fdec5c774 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index bfd918fca..b1d25548f 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - {% elif v.css %} + {% elif v.css and not request.path.startswith('/settings/css') %} {% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 0ff6c9a7a..348541c4b 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -39,10 +39,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html index 07fedc12f..fc09e7858 100644 --- a/files/templates/sidebar_Drama.html +++ b/files/templates/sidebar_Drama.html @@ -1,32 +1,40 @@ -

Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.

- -

Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.

- -

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.

- - What we want - - - -
RULE 1
No sexualizing minors even as a “joke.” There is zero tolerance for pedo shit here. Go to Reddit if you want that.

- -
RULE 2
No doxxing ANYONE.

- -
RULE 3
Using alts to game dramacoin will get you banned.

- -
RULE 4
We’re all doing this for fun. Don’t make this “not fun.”

- -
RULE 5
All rules can and likely will be ignored at admin discretion. Be funny, or at least compelling, and pretty much anything legal is fine.

- - Okay I think that’s all, thanks for reading! No one cares about your dumb free speech 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! \ No newline at end of file +
+ + SUBMIT DRAMA! + EMOJI MEGATHREAD + BUGS/SUGGESTIONS MEGATHREAD + SIDEBAR ARTWORK MEGATHREAD + +

Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.

+ +

Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.

+ +

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.

+ + What we want + + + +
RULE 1
No sexualizing minors even as a “joke.” There is zero tolerance for pedo shit here. Go to Reddit if you want that.

+ +
RULE 2
No doxxing ANYONE.

+ +
RULE 3
Using alts to game dramacoin will get you banned.

+ +
RULE 4
We’re all doing this for fun. Don’t make this “not fun.”

+ +
RULE 5
All rules can and likely will be ignored at admin discretion. Be funny, or at least compelling, and pretty much anything legal is fine.

+ + Okay I think that’s all, thanks for reading! No one cares about your dumb free speech 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! +
\ No newline at end of file diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index b37f916d1..a47849d87 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 4bb78653c..c730cc365 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submission.html b/files/templates/submission.html index 778d3b750..6540425d1 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -117,7 +117,7 @@ -{% 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')) %} {% endif %} @@ -146,7 +146,7 @@ {% if p.author %}{% 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')) %} {% endif %} @@ -373,7 +373,7 @@
{% 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'))) %}
{{p.domain|truncate(30, True)}} @@ -630,7 +630,7 @@
- {% 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'))) %}
diff --git a/files/templates/submit.html b/files/templates/submit.html index f10c2aa44..1ab8fbe0c 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}