diff --git a/files/assets/images/emojis/autism.webp b/files/assets/images/emojis/autism.webp new file mode 100644 index 000000000..a9c8c6c5f Binary files /dev/null and b/files/assets/images/emojis/autism.webp differ diff --git a/files/assets/images/emojis/bruh.webp b/files/assets/images/emojis/bruh.webp new file mode 100644 index 000000000..91e96cefb Binary files /dev/null and b/files/assets/images/emojis/bruh.webp differ diff --git a/files/assets/images/emojis/clueless.webp b/files/assets/images/emojis/clueless.webp new file mode 100644 index 000000000..c2d3ab559 Binary files /dev/null and b/files/assets/images/emojis/clueless.webp differ diff --git a/files/assets/images/emojis/doot.webp b/files/assets/images/emojis/doot.webp new file mode 100644 index 000000000..75b5a9821 Binary files /dev/null and b/files/assets/images/emojis/doot.webp differ diff --git a/files/assets/images/emojis/idhitit.webp b/files/assets/images/emojis/idhitit.webp new file mode 100644 index 000000000..2755ad988 Binary files /dev/null and b/files/assets/images/emojis/idhitit.webp differ diff --git a/files/assets/images/emojis/marseybadluck.webp b/files/assets/images/emojis/marseybadluck.webp new file mode 100644 index 000000000..df23eb574 Binary files /dev/null and b/files/assets/images/emojis/marseybadluck.webp differ diff --git a/files/assets/images/emojis/marseyblackfacexmas.webp b/files/assets/images/emojis/marseyblackfacexmas.webp new file mode 100644 index 000000000..8021ff4d8 Binary files /dev/null and b/files/assets/images/emojis/marseyblackfacexmas.webp differ diff --git a/files/assets/images/emojis/marseycensored.webp b/files/assets/images/emojis/marseycensored.webp new file mode 100644 index 000000000..08c2132fd Binary files /dev/null and b/files/assets/images/emojis/marseycensored.webp differ diff --git a/files/assets/images/emojis/marseycherokee.webp b/files/assets/images/emojis/marseycherokee.webp new file mode 100644 index 000000000..2844680dc Binary files /dev/null and b/files/assets/images/emojis/marseycherokee.webp differ diff --git a/files/assets/images/emojis/marseychristmasbulb.webp b/files/assets/images/emojis/marseychristmasbulb.webp new file mode 100644 index 000000000..e78241b54 Binary files /dev/null and b/files/assets/images/emojis/marseychristmasbulb.webp differ diff --git a/files/assets/images/emojis/marseycleonpeterson.webp b/files/assets/images/emojis/marseycleonpeterson.webp new file mode 100644 index 000000000..879f43447 Binary files /dev/null and b/files/assets/images/emojis/marseycleonpeterson.webp differ diff --git a/files/assets/images/emojis/marseycomradehandshake.webp b/files/assets/images/emojis/marseycomradehandshake.webp new file mode 100644 index 000000000..76cd18310 Binary files /dev/null and b/files/assets/images/emojis/marseycomradehandshake.webp differ diff --git a/files/assets/images/emojis/marseycrucified.webp b/files/assets/images/emojis/marseycrucified.webp new file mode 100644 index 000000000..4d710e50e Binary files /dev/null and b/files/assets/images/emojis/marseycrucified.webp differ diff --git a/files/assets/images/emojis/marseydeadhorse.webp b/files/assets/images/emojis/marseydeadhorse.webp new file mode 100644 index 000000000..7bb4e203b Binary files /dev/null and b/files/assets/images/emojis/marseydeadhorse.webp differ diff --git a/files/assets/images/emojis/marseyeldritch2.webp b/files/assets/images/emojis/marseyeldritch2.webp new file mode 100644 index 000000000..f892788bd Binary files /dev/null and b/files/assets/images/emojis/marseyeldritch2.webp differ diff --git a/files/assets/images/emojis/marseyfattie.webp b/files/assets/images/emojis/marseyfattie.webp new file mode 100644 index 000000000..06d3f37a1 Binary files /dev/null and b/files/assets/images/emojis/marseyfattie.webp differ diff --git a/files/assets/images/emojis/marseyfrozenchosen.webp b/files/assets/images/emojis/marseyfrozenchosen.webp new file mode 100644 index 000000000..58fcff371 Binary files /dev/null and b/files/assets/images/emojis/marseyfrozenchosen.webp differ diff --git a/files/assets/images/emojis/marseyglowaward.webp b/files/assets/images/emojis/marseyglowaward.webp new file mode 100644 index 000000000..2e067a2f2 Binary files /dev/null and b/files/assets/images/emojis/marseyglowaward.webp differ diff --git a/files/assets/images/emojis/marseyhappytears.webp b/files/assets/images/emojis/marseyhappytears.webp new file mode 100644 index 000000000..c58e755ce Binary files /dev/null and b/files/assets/images/emojis/marseyhappytears.webp differ diff --git a/files/assets/images/emojis/marseyimposter.webp b/files/assets/images/emojis/marseyimposter.webp new file mode 100644 index 000000000..ad5956854 Binary files /dev/null and b/files/assets/images/emojis/marseyimposter.webp differ diff --git a/files/assets/images/emojis/marseykweenxmas.webp b/files/assets/images/emojis/marseykweenxmas.webp new file mode 100644 index 000000000..debe95ff7 Binary files /dev/null and b/files/assets/images/emojis/marseykweenxmas.webp differ diff --git a/files/assets/images/emojis/marseylaptop.webp b/files/assets/images/emojis/marseylaptop.webp new file mode 100644 index 000000000..0a05bb32a Binary files /dev/null and b/files/assets/images/emojis/marseylaptop.webp differ diff --git a/files/assets/images/emojis/marseyliquidator.webp b/files/assets/images/emojis/marseyliquidator.webp new file mode 100644 index 000000000..c3e3958cc Binary files /dev/null and b/files/assets/images/emojis/marseyliquidator.webp differ diff --git a/files/assets/images/emojis/marseynoyouglow.webp b/files/assets/images/emojis/marseynoyouglow.webp new file mode 100644 index 000000000..c004f9923 Binary files /dev/null and b/files/assets/images/emojis/marseynoyouglow.webp differ diff --git a/files/assets/images/emojis/marseyparty1.webp b/files/assets/images/emojis/marseyparty1.webp new file mode 100644 index 000000000..f4bae0e08 Binary files /dev/null and b/files/assets/images/emojis/marseyparty1.webp differ diff --git a/files/assets/images/emojis/marseyparty2.webp b/files/assets/images/emojis/marseyparty2.webp new file mode 100644 index 000000000..677dede03 Binary files /dev/null and b/files/assets/images/emojis/marseyparty2.webp differ diff --git a/files/assets/images/emojis/marseyparty3.webp b/files/assets/images/emojis/marseyparty3.webp new file mode 100644 index 000000000..65e489852 Binary files /dev/null and b/files/assets/images/emojis/marseyparty3.webp differ diff --git a/files/assets/images/emojis/marseyraging.webp b/files/assets/images/emojis/marseyraging.webp new file mode 100644 index 000000000..4928d4e0e Binary files /dev/null and b/files/assets/images/emojis/marseyraging.webp differ diff --git a/files/assets/images/emojis/marseyrare.webp b/files/assets/images/emojis/marseyrare.webp new file mode 100644 index 000000000..6507cc9a0 Binary files /dev/null and b/files/assets/images/emojis/marseyrare.webp differ diff --git a/files/assets/images/emojis/marseyreindeer.webp b/files/assets/images/emojis/marseyreindeer.webp new file mode 100644 index 000000000..c13ea241d Binary files /dev/null and b/files/assets/images/emojis/marseyreindeer.webp differ diff --git a/files/assets/images/emojis/marseyreindeer2.webp b/files/assets/images/emojis/marseyreindeer2.webp new file mode 100644 index 000000000..fc9000554 Binary files /dev/null and b/files/assets/images/emojis/marseyreindeer2.webp differ diff --git a/files/assets/images/emojis/marseyrevolution.webp b/files/assets/images/emojis/marseyrevolution.webp index 4cb605892..40b6b6dce 100644 Binary files a/files/assets/images/emojis/marseyrevolution.webp and b/files/assets/images/emojis/marseyrevolution.webp differ diff --git a/files/assets/images/emojis/marseyroo.webp b/files/assets/images/emojis/marseyroo.webp new file mode 100644 index 000000000..00364bff3 Binary files /dev/null and b/files/assets/images/emojis/marseyroo.webp differ diff --git a/files/assets/images/emojis/marseysanta.webp b/files/assets/images/emojis/marseysanta.webp new file mode 100644 index 000000000..63238a6b8 Binary files /dev/null and b/files/assets/images/emojis/marseysanta.webp differ diff --git a/files/assets/images/emojis/marseysanta2.webp b/files/assets/images/emojis/marseysanta2.webp new file mode 100644 index 000000000..114a5fe11 Binary files /dev/null and b/files/assets/images/emojis/marseysanta2.webp differ diff --git a/files/assets/images/emojis/marseysteer.webp b/files/assets/images/emojis/marseysteer.webp new file mode 100644 index 000000000..f850b23a4 Binary files /dev/null and b/files/assets/images/emojis/marseysteer.webp differ diff --git a/files/assets/images/emojis/marseysuffragette.webp b/files/assets/images/emojis/marseysuffragette.webp new file mode 100644 index 000000000..82f0f06a6 Binary files /dev/null and b/files/assets/images/emojis/marseysuffragette.webp differ diff --git a/files/assets/images/emojis/soymad.webp b/files/assets/images/emojis/soymad.webp new file mode 100644 index 000000000..460b24a08 Binary files /dev/null and b/files/assets/images/emojis/soymad.webp differ diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 6767f27e5..fb16bf3d7 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -277,7 +277,7 @@ const EMOJIS_STRINGS = [ emojis: ['marseylaugh','marseyblowkiss','marseyshook','marseythumbsup','marseylove','marseyreading','marseywave','marseyjamming','marseyready','marseyscarf','marseymad','marseycry','marseyinabox','marseysad','marseyexcited','marseysleep','marseyangel','marseydead','marseyparty','marseyrain','marseyagree','marseydisagree','marseyjam','marseygasp','marseytwerking','marseysipping','marseyshrug','marseyglow','marseycope','marseyseethe','marseymerchant','marseyno','marseywalking','marseyhearts','marseybegging','marseytrans2','marseygigaretard','marseysneed','marseybaited','marseyeyeroll','marseydepressed','marseypat','marseyking','marseylong1','marseylong2','marseylong3', - 'marseykys','chudsey','marseyakumu','marseybadger','marseyben10','marseycalarts','marseycheesehead','marseychristmaself','marseychristmastree','marseycoal','marseydolphin','marseyelephant','marseyfeelsgood','marseyhomofascist','marseyhomosupremacist','marseyinshallah','marseykfc','marseypilgrim','marseypresents','marseyracistgrandpa','marseyrevolution','marseyrs','marseysalty','marseyshroom','marseysonic','marseyteaparty','marseytears','marseyturkey','marseyuglyxmasweater','marseytalibanpat','marseyanime','marseyanticarp','marseyarmy','marseyaward','marseybateman','marseybath','marseybear2','marseybigdog','marseybunny','marseycat','marseychristmas','marseycow','marseydeadinside','marseydog','marseyfrog2','marseygondola','marseyhippo','marseylion','marseymyspacetom','marseynails','marseyobese','marseyobesescale','marseypanda2','marseypig','marseyprotestno','marseyprotestyes','marseyreportercnn','marseyreporterfox','marseyropeyourself','marseyropeyourself2','marseysalad','marseysalat','marseysheep','marseytiger','marseytrollcrazy','marseytrollgun','marseytroublemaker','marseyvietnam','marseyairquotes','marseybyeceps','marseycarpcrying','marseycatgirljanny','marseydisabled','marseyegg_irl','marseyfrog','marseyhope','marseymao','marseymoose','marseypunisher','marseytoilet','thinbluefeline','marseycatgirl2','marseycatgirl3','marseycapywalking','marseyatsume','marseybeggar','marseyceiling','marseyclapping','marseydab','marseydealwithit','marseyduck','marseyduck2','marseyflareon','marseyflareonpat','marseyfox','marseyfreezepeach','marseyfrozen','marseyglaceon','marseyglaceonpat','marseygroomer2','marseyhacker2','marseyhillary','marseyinvisible','marseyjolteon','marseyjolteonpat','marseyleafeon','marseyleafeonpat','marseynoyou','marseypedobear','marseyplanecrash','marseypleading','marseypoor','marseyschrodinger','marseysulk','marseytheorist','marseyvaporeon','marseyvaporeonpat','marseywheredrama2','marseyspecialpat','marseyautism','marseybaphomet','marseybear','marseybrap','marseybrianna','marseybrianna2','marseyemo','marseyespeon','marseyespeonheadpat','marseyglow2','marseyhannibal','marseyhypno','marseykingcrown','marseyliondanc','marseyllama','marseyllama1','marseyllama2','marseyllama3','marseyniggawut','marseyorthodoxpat','marseypirate2','marseypumpkinglow','marseyrussiadolls','marseysnappypat','marseysylveon','marseysylveonpat','marseytime','marseytrickortreat','marseytrollolol','marseytwins','marseyumbreon','marseyumbreonpat','mersyapat','marchipmunklove','marseyban','marseycheerup','marseyfry','marseygroomer','marseymalding','marseyplush','marseysalutenavy','marseytunaktunak','marseyza','marsheep','marchipmunk','marseybased','marseydawnbreaker','marseyfurry','marseyhorseshoe','marseypop2','marseysheepdog','marseywallst','marsheen','marseyantiwork','marseycarppat','marseydrama','marseygiveup','marseykitty','marseymini','marseyteruteru','marseyyass','marsheepnpc','marseyfuckoffcarp','marseyneet','marseyxoxo','marseychungus','marseypopcorntime','mersya2','marseycontemplate','marseysob','mersya','marseyderp','marseytinfoil2','marseylovedrama','marseytv','marseyloveyou','marseywheredrama','firecat','marseyannoyed','marseybye','marseycapypat','marseycheeky','marseydicklet','marseydisgust','marseydracula','marseydrone','marseygossip','marseykween','marseymugshot','marseymutt','marseyneon','marseynerd','marseyoceania','marseyohno','marseyramen','marseyrave','marseysadge','marseysalutearmy','marseysalutecop','marseyshy','marseysonofman','marseytroll2','marseyvibing','marseywendy','marseyhungry','marseyaoc','marseybrave','marseycoin','marseycopeseethedilate','marseyeldritch','marseyjiangshi','marseymayo','marseynintendo','marseyracist','marseysrdine2','marseywtf2','marseylongpost','marseylongpost2','marseyminimalism','marseyminimalism2','marseymonk','marseypharaoh','marseypharaoh2','marseything','marseydarwin','marseygodel','marseyjudge','marseykiwipat','marseynyan','marseypaint','marseyplaty','marseypostmodern','marseyprisma','marseyrussel','marseystinky','marseywagie','karlmarxey','marsey300','marsey666','marsey666black','marseycapitalistmanlet','marseychad','marseychucky','marseyclown3','marseycolossal','marseydream','marseyhappening','marseyhellraiser','marseyit','marseyjason','marseyjesus','marseyjourno','marseykiwi','marseykiwi2','marseyliondance','marseymati','marseyneat','marseynightmare','marseynosleep','marseypepe2','marseypumpking','marseysaint','marseysaw','marseysharingan','marseyshark','marseysigh','marseysmug3','marseytrad','marcerberus','marscientist','marseyamazon','marseybug2','marseycapy','marseyclown2','marseycrying','marseydio','marseydragon','marseyfans','marseyfine','marseygrilling2','marseyhead','marseyjeans','marseymancer','marseymexican','marseypikachu','marseypikachu2','marseysmug2','marseyspit','marseysweating','marseywoah','marseywolf','marseyyes','marseyzombie','mcmarsey','owlsey','marfield','marlion','marppy','marseyargentina','marseyascii2','marseyayy','marseybaby','marseybackstab','marseybigbrain','marseybiker','marseyblackface','marseybug','marseycarp2','marseycarp3','marseycreepy','marseydetective','marseyfellowkids','marseygandalf','marseygigachad','marseyhandsup','marseyjapanese','marseykink','marseylowpoly','marseyminion','marseymodelo2','marseymorph','marseyonacid','marseypearlclutch','marseypearlclutch2','marseypenguin','marseypride','marseypunching','marseyseven','marseysexylibrarian','marseyshapiro','marseyshiftyeyes','marseyshooting','marseysjw','marseysmoothbrain','marseysniff','marseyspecial','marseysuper','marseythinkorino','marseythroatsinging','marseywarhol','marseyweeb','marseywinner','marseywtf','mlm','plarsy','marseyalice','marseyalien','marseyascii','marseybait','marseyballerina','marseyblueanime','marseybluehands','marseybowl','marseybruh','marseybuff','marseycountryclub','marseycool2','marseycrusader','marseycut','marseydaemon','marseydeuxfoid','marseydevil','marseyditzy','marseydoubt','marseyunpettable','marseyfeynman','marseyfocault','marseyfrozenpat','marseygarfield','marseygivecrown','marseygodzilla','marseygunned','marseyheathcliff','marseyheavymetal','marseyhoodwink','marseyjoint','marseymissing','marseymodelo','marseymonke','marseynooo','marseynpc2','marseyoctopus','marseypepe','marseypimp','marseypixel','marseypretty','marseypumpkin','marseypumpkin2','marseypumpkin3','marseypumpkin4','marseypumpkincloak','marseyquadmagyar','marseyrpgcharacter','marseysartre','marseyscared','marseyskater','marseyskeleton','marseyskeleton2','marseysmudge','marseysombrero','marseyspider2','marseyspirit','marseyspooky','marseyspookysmile','marseystars','marseystonetoss','marseythegrey','marseyvaporwave','marseywise','marseywitch','marseywords','marseywords2','marseywut','marseyyikes','marseywhirlyhat','marsey173','marseycthulhu','marseycuck','marseyemperor','marseyface','marseyjohnson','marseykneel','marseymummy','marseymummy2','marseypanda','marseypumpkin','marseyskeletor','marseystein','marseyvampire','marseyvengeance','marseywitch3','marseypop','marseyqueenlizard','marseybane','marseybog','marseybux','marseycommitted','marseydizzy','marseyfunko','marseyhealthy','marseykaiser','marseykyle','marseymask','marseymeds','marseykvlt','marseyn8','marseynietzsche','marseyobey','marseypatriot','marseypedo','marseypony','marseypuke','marseyqueen','marseyrage','marseysnek','marseytinfoil','marseywitch2','marseycenter','marseyauthleft','marseyauthright','marseylibleft','marseylibright','marseybinladen','marseycool','marseyjanny2','marseyjones','marseynapoleon','marseysanders','marseysnoo','marseysoypoint','marseybiting','marseyblush','marseybountyhunter','marseycoonass','marseyfinger','marseyglancing','marseyhappy','marseyluther','marseypizzashill','marseypokerface','marseypopcorn','marseyrasta','marseysad2','marseysmirk','marseysurprised','marseythomas','marseywitch','marseyyawn','marcusfootball','marje','marmsey','marsey1984','marsey420','marsey4chan','marsey69','marseyakshually','marseyandmarcus','marseyasian','marseybattered','marseybiden','marseybingus','marseyblm','marseybluecheck','marseybong','marseybooba','marseyboomer','marseybrainlet','marseybride','marseyburger','marseybush','marseycamus','marseycanned','marseycarp','marseycatgirl','marseychef','marseychonker','marseyclown','marseycomrade','marseyconfused','marseycoomer','marseycop','marseycorn','marseycowboy','marseycumjar1','marseycumjar2','marseycumjar3','marseycwc','marseydespair','marseydeux','marseydildo','marseydoomer','marseydrunk','marseydynamite','marseyfacepalm','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyflamewar','marseyfloyd','marseyfug','marseyghost','marseygift','marseygigavaxxer','marseyglam','marseygodfather','marseygoodnight','marseygrass','marseygrilling','marseyhacker','marseyhmm','marseyhmmm','marseyilluminati','marseyira','marseyisis','marseyjanny','marseyjunkie','marseykkk','marseylawlz','marseylifting','marseylizard','marseylolcow','marseymanlet','marseymaoist','marseymcarthur','marseymermaid','marseymouse','marseymyeisha','marseyneckbeard','marseyniqab','marseynpc','marseynun','marseynut','marseyorthodox','marseyowow','marseypainter','marseypanties','marseypeacekeeper','marseypickle','marseypinochet','marseypipe','marseypirate','marseypoggers','marseypope','marseyproctologist','marseypsycho','marseyqoomer','marseyradioactive','marseyrat','marseyreich','marseyrentfree','marseyretard','marseyrick','marseyrope','marseyrowling','marseysadcat','marseysick','marseyschizo','marseyshisha','marseysmug','marseysociety','marseyspider','marseysrdine','marseystroke','marseysus','marseytaliban','marseytank','marseytankushanka','marseytea','marseythonk','marseytrain','marseytrans','marseytroll','marseytrump','marseyunabomber','marseyuwuw','marseyvan','marseyvaxmaxx','marseyworried','marseyxd','marseyyeezus','marseyzoomer','marseyzwei','marsoy','marsoyhype'] + 'marseybadluck','marseyblackfacexmas','marseycensored','marseycherokee','marseychristmasbulb','marseycleonpeterson','marseycomradehandshake','marseycrucified','marseydeadhorse','marseyeldritch2','marseyfattie','marseyfrozenchosen','marseyglowaward','marseyhappytears','marseyimposter','marseykweenxmas','marseylaptop','marseyliquidator','marseynoyouglow','marseyparty1','marseyparty2','marseyparty3','marseyraging','marseyrare','marseyreindeer','marseyreindeer2','marseyroo','marseysanta','marseysanta2','marseysteer','marseysuffragette','marseykys','chudsey','marseyakumu','marseybadger','marseyben10','marseycalarts','marseycheesehead','marseychristmaself','marseychristmastree','marseycoal','marseydolphin','marseyelephant','marseyfeelsgood','marseyhomofascist','marseyhomosupremacist','marseyinshallah','marseykfc','marseypilgrim','marseypresents','marseyracistgrandpa','marseyrevolution','marseyrs','marseysalty','marseyshroom','marseysonic','marseyteaparty','marseytears','marseyturkey','marseyuglyxmasweater','marseytalibanpat','marseyanime','marseyanticarp','marseyarmy','marseyaward','marseybateman','marseybath','marseybear2','marseybigdog','marseybunny','marseycat','marseychristmas','marseycow','marseydeadinside','marseydog','marseyfrog2','marseygondola','marseyhippo','marseylion','marseymyspacetom','marseynails','marseyobese','marseyobesescale','marseypanda2','marseypig','marseyprotestno','marseyprotestyes','marseyreportercnn','marseyreporterfox','marseyropeyourself','marseyropeyourself2','marseysalad','marseysalat','marseysheep','marseytiger','marseytrollcrazy','marseytrollgun','marseytroublemaker','marseyvietnam','marseyairquotes','marseybyeceps','marseycarpcrying','marseycatgirljanny','marseydisabled','marseyegg_irl','marseyfrog','marseyhope','marseymao','marseymoose','marseypunisher','marseytoilet','thinbluefeline','marseycatgirl2','marseycatgirl3','marseycapywalking','marseyatsume','marseybeggar','marseyceiling','marseyclapping','marseydab','marseydealwithit','marseyduck','marseyduck2','marseyflareon','marseyflareonpat','marseyfox','marseyfreezepeach','marseyfrozen','marseyglaceon','marseyglaceonpat','marseygroomer2','marseyhacker2','marseyhillary','marseyinvisible','marseyjolteon','marseyjolteonpat','marseyleafeon','marseyleafeonpat','marseynoyou','marseypedobear','marseyplanecrash','marseypleading','marseypoor','marseyschrodinger','marseysulk','marseytheorist','marseyvaporeon','marseyvaporeonpat','marseywheredrama2','marseyspecialpat','marseyautism','marseybaphomet','marseybear','marseybrap','marseybrianna','marseybrianna2','marseyemo','marseyespeon','marseyespeonheadpat','marseyglow2','marseyhannibal','marseyhypno','marseykingcrown','marseyliondanc','marseyllama','marseyllama1','marseyllama2','marseyllama3','marseyniggawut','marseyorthodoxpat','marseypirate2','marseypumpkinglow','marseyrussiadolls','marseysnappypat','marseysylveon','marseysylveonpat','marseytime','marseytrickortreat','marseytrollolol','marseytwins','marseyumbreon','marseyumbreonpat','mersyapat','marchipmunklove','marseyban','marseycheerup','marseyfry','marseygroomer','marseymalding','marseyplush','marseysalutenavy','marseytunaktunak','marseyza','marsheep','marchipmunk','marseybased','marseydawnbreaker','marseyfurry','marseyhorseshoe','marseypop2','marseysheepdog','marseywallst','marsheen','marseyantiwork','marseycarppat','marseydrama','marseygiveup','marseykitty','marseymini','marseyteruteru','marseyyass','marsheepnpc','marseyfuckoffcarp','marseyneet','marseyxoxo','marseychungus','marseypopcorntime','mersya2','marseycontemplate','marseysob','mersya','marseyderp','marseytinfoil2','marseylovedrama','marseytv','marseyloveyou','marseywheredrama','firecat','marseyannoyed','marseybye','marseycapypat','marseycheeky','marseydicklet','marseydisgust','marseydracula','marseydrone','marseygossip','marseykween','marseymugshot','marseymutt','marseyneon','marseynerd','marseyoceania','marseyohno','marseyramen','marseyrave','marseysadge','marseysalutearmy','marseysalutecop','marseyshy','marseysonofman','marseytroll2','marseyvibing','marseywendy','marseyhungry','marseyaoc','marseybrave','marseycoin','marseycopeseethedilate','marseyeldritch','marseyjiangshi','marseymayo','marseynintendo','marseyracist','marseysrdine2','marseywtf2','marseylongpost','marseylongpost2','marseyminimalism','marseyminimalism2','marseymonk','marseypharaoh','marseypharaoh2','marseything','marseydarwin','marseygodel','marseyjudge','marseykiwipat','marseynyan','marseypaint','marseyplaty','marseypostmodern','marseyprisma','marseyrussel','marseystinky','marseywagie','karlmarxey','marsey300','marsey666','marsey666black','marseycapitalistmanlet','marseychad','marseychucky','marseyclown3','marseycolossal','marseydream','marseyhappening','marseyhellraiser','marseyit','marseyjason','marseyjesus','marseyjourno','marseykiwi','marseykiwi2','marseyliondance','marseymati','marseyneat','marseynightmare','marseynosleep','marseypepe2','marseypumpking','marseysaint','marseysaw','marseysharingan','marseyshark','marseysigh','marseysmug3','marseytrad','marcerberus','marscientist','marseyamazon','marseybug2','marseycapy','marseyclown2','marseycrying','marseydio','marseydragon','marseyfans','marseyfine','marseygrilling2','marseyhead','marseyjeans','marseymancer','marseymexican','marseypikachu','marseypikachu2','marseysmug2','marseyspit','marseysweating','marseywoah','marseywolf','marseyyes','marseyzombie','mcmarsey','owlsey','marfield','marlion','marppy','marseyargentina','marseyascii2','marseyayy','marseybaby','marseybackstab','marseybigbrain','marseybiker','marseyblackface','marseybug','marseycarp2','marseycarp3','marseycreepy','marseydetective','marseyfellowkids','marseygandalf','marseygigachad','marseyhandsup','marseyjapanese','marseykink','marseylowpoly','marseyminion','marseymodelo2','marseymorph','marseyonacid','marseypearlclutch','marseypearlclutch2','marseypenguin','marseypride','marseypunching','marseyseven','marseysexylibrarian','marseyshapiro','marseyshiftyeyes','marseyshooting','marseysjw','marseysmoothbrain','marseysniff','marseyspecial','marseysuper','marseythinkorino','marseythroatsinging','marseywarhol','marseyweeb','marseywinner','marseywtf','mlm','plarsy','marseyalice','marseyalien','marseyascii','marseybait','marseyballerina','marseyblueanime','marseybluehands','marseybowl','marseybruh','marseybuff','marseycountryclub','marseycool2','marseycrusader','marseycut','marseydaemon','marseydeuxfoid','marseydevil','marseyditzy','marseydoubt','marseyunpettable','marseyfeynman','marseyfocault','marseyfrozenpat','marseygarfield','marseygivecrown','marseygodzilla','marseygunned','marseyheathcliff','marseyheavymetal','marseyhoodwink','marseyjoint','marseymissing','marseymodelo','marseymonke','marseynooo','marseynpc2','marseyoctopus','marseypepe','marseypimp','marseypixel','marseypretty','marseypumpkin','marseypumpkin2','marseypumpkin3','marseypumpkin4','marseypumpkincloak','marseyquadmagyar','marseyrpgcharacter','marseysartre','marseyscared','marseyskater','marseyskeleton','marseyskeleton2','marseysmudge','marseysombrero','marseyspider2','marseyspirit','marseyspooky','marseyspookysmile','marseystars','marseystonetoss','marseythegrey','marseyvaporwave','marseywise','marseywitch','marseywords','marseywords2','marseywut','marseyyikes','marseywhirlyhat','marsey173','marseycthulhu','marseycuck','marseyemperor','marseyface','marseyjohnson','marseykneel','marseymummy','marseymummy2','marseypanda','marseypumpkin','marseyskeletor','marseystein','marseyvampire','marseyvengeance','marseywitch3','marseypop','marseyqueenlizard','marseybane','marseybog','marseybux','marseycommitted','marseydizzy','marseyfunko','marseyhealthy','marseykaiser','marseykyle','marseymask','marseymeds','marseykvlt','marseyn8','marseynietzsche','marseyobey','marseypatriot','marseypedo','marseypony','marseypuke','marseyqueen','marseyrage','marseysnek','marseytinfoil','marseywitch2','marseycenter','marseyauthleft','marseyauthright','marseylibleft','marseylibright','marseybinladen','marseycool','marseyjanny2','marseyjones','marseynapoleon','marseysanders','marseysnoo','marseysoypoint','marseybiting','marseyblush','marseybountyhunter','marseycoonass','marseyfinger','marseyglancing','marseyhappy','marseyluther','marseypizzashill','marseypokerface','marseypopcorn','marseyrasta','marseysad2','marseysmirk','marseysurprised','marseythomas','marseywitch','marseyyawn','marcusfootball','marje','marmsey','marsey1984','marsey420','marsey4chan','marsey69','marseyakshually','marseyandmarcus','marseyasian','marseybattered','marseybiden','marseybingus','marseyblm','marseybluecheck','marseybong','marseybooba','marseyboomer','marseybrainlet','marseybride','marseyburger','marseybush','marseycamus','marseycanned','marseycarp','marseycatgirl','marseychef','marseychonker','marseyclown','marseycomrade','marseyconfused','marseycoomer','marseycop','marseycorn','marseycowboy','marseycumjar1','marseycumjar2','marseycumjar3','marseycwc','marseydespair','marseydeux','marseydildo','marseydoomer','marseydrunk','marseydynamite','marseyfacepalm','marseyfamily','marseyfbi','marseyfeet','marseyfeminist','marseyflamethrower','marseyflamewar','marseyfloyd','marseyfug','marseyghost','marseygift','marseygigavaxxer','marseyglam','marseygodfather','marseygoodnight','marseygrass','marseygrilling','marseyhacker','marseyhmm','marseyhmmm','marseyilluminati','marseyira','marseyisis','marseyjanny','marseyjunkie','marseykkk','marseylawlz','marseylifting','marseylizard','marseylolcow','marseymanlet','marseymaoist','marseymcarthur','marseymermaid','marseymouse','marseymyeisha','marseyneckbeard','marseyniqab','marseynpc','marseynun','marseynut','marseyorthodox','marseyowow','marseypainter','marseypanties','marseypeacekeeper','marseypickle','marseypinochet','marseypipe','marseypirate','marseypoggers','marseypope','marseyproctologist','marseypsycho','marseyqoomer','marseyradioactive','marseyrat','marseyreich','marseyrentfree','marseyretard','marseyrick','marseyrope','marseyrowling','marseysadcat','marseysick','marseyschizo','marseyshisha','marseysmug','marseysociety','marseyspider','marseysrdine','marseystroke','marseysus','marseytaliban','marseytank','marseytankushanka','marseytea','marseythonk','marseytrain','marseytrans','marseytroll','marseytrump','marseyunabomber','marseyuwuw','marseyvan','marseyvaxmaxx','marseyworried','marseyxd','marseyyeezus','marseyzoomer','marseyzwei','marsoy','marsoyhype'] }, { type:'platy', @@ -285,27 +285,27 @@ const EMOJIS_STRINGS = [ }, { type: 'tay', - emojis: ['taylove','tayaaa', 'tayadmire', 'taycat', 'taycelebrate', 'taychefkiss', 'taychristmas', 'tayclap', 'taycold', 'taycrown', 'tayflex', 'tayflirt', 'taygrimacing', 'tayhappy', 'tayheart', 'tayhmm', 'tayhuh', 'tayhyperdab', 'tayjammin', 'taylaugh', 'taymindblown', 'tayno', 'taynod', 'taypeace', 'taypray', 'tayrun', 'tayscrunch', 'tayshake', 'tayshrug', 'taysilly', 'tayslide', 'taysmart', 'taystop', 'taytantrum', 'taytea', 'taythink', 'tayvibin', 'taywhat', 'taywine', 'taywine2', 'taywink', 'tayyes'] + emojis: ['taylove','tayaaa','tayadmire','taycat','taycelebrate','taychefkiss','taychristmas','tayclap','taycold','taycrown','tayflex','tayflirt','taygrimacing','tayhappy','tayheart','tayhmm','tayhuh','tayhyperdab','tayjammin','taylaugh','taymindblown','tayno','taynod','taypeace','taypray','tayrun','tayscrunch','tayshake','tayshrug','taysilly','tayslide','taysmart','taystop','taytantrum','taytea','taythink','tayvibin','taywhat','taywine','taywine2','taywink','tayyes'] }, { type: 'classic', - emojis: ['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','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'] }, { type: 'rage', - emojis: ['troll', 'bitchplease', 'spit', 'challengeaccepted', 'contentiouscereal', 'cryingatcuteness', 'derp', 'derpcornsyrup', 'derpcrying', 'derpcute', 'derpdumb', 'derpeuphoria', 'derpinahd', 'derpinapokerface', 'derpinasnickering', 'derpprocessing', 'derprealization', 'derpsnickering', 'derptalking', 'derpthinking', 'derpthumbsup', 'derpunimpressed', 'derpwhy', 'donotwant', 'epicfacefeatures', 'fancywithwine', 'fffffffuuuuuuuuuuuu', 'flipthetable', 'foreveralone', 'foreveralonehappy', 'hewillnever', 'idontknow', 'interuptedreading', 'iseewhatyoudidthere', 'killherkillher', 'ledesire', 'leexcited', 'legenius', 'lelolidk', 'lemiddlefinger', 'lemindblown', 'leokay', 'lepanicrunning', 'lepokerface', 'lepokerface2', 'lerageface', 'leseriousface', 'likeaboss', 'lolface', 'longwhiskers', 'manymiddlefingers', 'megusta', 'motherfucker', 'motherofgod', 'mysides', 'ohgodwhy', 'pervertedspiderman', 'picard', 'ragestrangle', 'rukiddingme', 'tfwyougettrolled', 'trollolol', 'truestorybro', 'xallthey', 'yuno'] + emojis: ['clueless','troll','bitchplease','spit','challengeaccepted','contentiouscereal','cryingatcuteness','derp','derpcornsyrup','derpcrying','derpcute','derpdumb','derpeuphoria','derpinahd','derpinapokerface','derpinasnickering','derpprocessing','derprealization','derpsnickering','derptalking','derpthinking','derpthumbsup','derpunimpressed','derpwhy','donotwant','epicfacefeatures','fancywithwine','fffffffuuuuuuuuuuuu','flipthetable','foreveralone','foreveralonehappy','hewillnever','idontknow','interuptedreading','iseewhatyoudidthere','killherkillher','ledesire','leexcited','legenius','lelolidk','lemiddlefinger','lemindblown','leokay','lepanicrunning','lepokerface','lepokerface2','lerageface','leseriousface','likeaboss','lolface','longwhiskers','manymiddlefingers','megusta','motherfucker','motherofgod','mysides','ohgodwhy','pervertedspiderman','picard','ragestrangle','rukiddingme','tfwyougettrolled','trollolol','truestorybro','xallthey','yuno'] }, { type: 'wojak', - emojis: ['boomerportrait','soycry', 'punchjak', 'seethejak', 'chadyes', 'chadno', 'abusivewife', 'ancap', 'bardfinn', 'bloomer', 'boomer', 'boomermonster', 'brainletbush', 'brainletcaved', 'brainletchair', 'brainletchest', 'brainletmaga', 'brainletpit', 'chad', 'chadarab', 'chadasian', 'chadblack', 'chadjesus', 'chadjew', 'chadjihadi', 'chadlatino', 'chadlibleft', 'chadnordic', 'chadsikh', 'chadusa', 'coomer', 'doomer', 'doomerfront', 'doomergirl', 'ethot', 'fatbrain', 'fatpriest', 'femboy', 'gogetter', 'grug', 'monke', 'nazijak', 'npc', 'npcfront', 'npcmaga', 'psychojak', 'ragejak', 'ragemask', 'ramonajak', 'soyjackwow', 'soyjak', 'soyjakfront', 'soyjakhipster', 'soyjakmaga', 'soyjakyell', 'tomboy', 'zoomer', 'zoomersoy'] + emojis: ['soymad','boomerportrait','soycry','punchjak','seethejak','chadyes','chadno','abusivewife','ancap','bardfinn','bloomer','boomer','boomermonster','brainletbush','brainletcaved','brainletchair','brainletchest','brainletmaga','brainletpit','chad','chadarab','chadasian','chadblack','chadjesus','chadjew','chadjihadi','chadlatino','chadlibleft','chadnordic','chadsikh','chadusa','coomer','doomer','doomerfront','doomergirl','ethot','fatbrain','fatpriest','femboy','gogetter','grug','monke','nazijak','npc','npcfront','npcmaga','psychojak','ragejak','ragemask','ramonajak','soyjackwow','soyjak','soyjakfront','soyjakhipster','soyjakmaga','soyjakyell','tomboy','zoomer','zoomersoy'] }, { type: 'flags', - emojis: ['niger', 'lgbt', 'saudi', 'animesexual', 'blacknation', 'blm', 'blueline', 'dreamgender', 'fatpride', 'incelpride', 'israel', 'kazakhstan', 'landlordlove', 'scalperpride', 'superstraight', 'trans', 'translord', 'transracial', 'usa'] + emojis: ['niger','lgbt','saudi','animesexual','blacknation','blm','blueline','dreamgender','fatpride','incelpride','israel','kazakhstan','landlordlove','scalperpride','superstraight','trans','translord','transracial','usa'] }, { type: 'misc', - emojis: ['kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox', 'gigachad', 'gigachad2', 'gigachad3'] + emojis: ['bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3'] }, ] diff --git a/files/classes/comment.py b/files/classes/comment.py index 8cc74a091..d299cc3bb 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -392,7 +392,15 @@ class Comment(Base): @lazy def ordered_flags(self): return self.flags.order_by(CommentFlag.id).all() - + def options_html(self, v): + html = "" + for o in self.options: + html += f'
'
+		return html
 
 class Notification(Base):
 
diff --git a/files/classes/user.py b/files/classes/user.py
index 79031f88a..67d3aa392 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -15,7 +15,7 @@ from .clients import *
 from files.__main__ import Base, cache
 from files.helpers.security import *
 import random
-from os import environ, remove
+from os import environ, remove, path
 
 site = environ.get("DOMAIN").strip()
 site_name = environ.get("SITE_NAME").strip()
@@ -466,18 +466,29 @@ class User(Base):
 
 		return data
 
-	def ban(self, admin=None, reason=None, days=0):
+	def deletepfp(self):
+		if self.highres and '/images/' in self.highres:
+			image = '/images/' + self.highres.split('/images/')[1]
+			if path.exists(image): remove(image)
+		if self.profileurl and '/images/' in self.profileurl:
+			image = '/images/' + self.profileurl.split('/images/')[1]
+			if path.exists(image): remove(image)
+		self.highres = None
+		self.profileurl = None
 
+	def deletebanner(self):
+		if self.bannerurl and '/images/' in self.bannerurl:
+			image = '/images/' + self.bannerurl.split('/images/')[1]
+			if path.exists(image): remove(image)
+		self.bannerurl = None
+
+	def ban(self, admin=None, reason=None, days=0):
 		if days > 0:
 			ban_time = int(time.time()) + (days * 86400)
 			self.unban_utc = ban_time
 		else:
-			if self.highres and '/images/' in self.highres: remove('/images/' + self.highres.split('/images/')[1])
-			if self.profileurl and '/images/' in self.profileurl: remove('/images/' + self.profileurl.split('/images/')[1])
-			if self.bannerurl and '/images/' in self.bannerurl: remove('/images/' + self.bannerurl.split('/images/')[1])
-
-			self.bannerurl = None
-			self.profileurl = None
+			self.deletepfp()
+			self.deletebanner()
 			if self.discord_id: remove_user(self)
 
 		self.is_banned = admin.id if admin else AUTOJANNY_ID
diff --git a/files/helpers/const.py b/files/helpers/const.py
index cadfd2596..221e36564 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -53,8 +53,8 @@ SLURS = {
 	"kill yourself": "keep yourself safe",
 	"kys": "keep yourself safe",
 	"kyle": "Kylie",
-	"nig": "🏀",
-	"nigger": "🏀",
+	"nig": "BIPOC",
+	"nigger": "BIPOC",
 	"rapist": "male feminist",
 	"steve akins": "penny verity oaken",
 	"trannie": "🚂🚃🚃",
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index fd1fb1132..5a6efa8a5 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -165,26 +165,28 @@ def sanitize(sanitized, noimages=False):
 
 	if start in sanitized and end in sanitized and start in sanitized.split(end)[0] and end in sanitized.split(start)[1]: sanitized = sanitized.replace(start, '').replace(end, '')
 	
-	for i in re.finditer("[^a]>\s*(:!?\w+:\s*)+<\/", sanitized):
+	for i in re.finditer("[^a]>\s*(:[!#]?\w+:\s*)+<\/", sanitized):
 		old = i.group(0)
 		if 'marseylong1' in old or 'marseylong2' in old or 'marseyllama1' in old or 'marseyllama2' in old: new = old.lower().replace(">", " class='mb-0'>")
 		else: new = old.lower()
 		for i in re.finditer('(?', new)
-			
-					if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
-					else: session["favorite_emojis"][emoji] = 1
+				classes = 'class="bigemoji mirrored" '
+				remoji = emoji[1:]
+			elif emoji.startswith("#"):
+				classes = ""
+				remoji = emoji[1:]
+			else:
+				classes = 'class="bigemoji" '
+				remoji = emoji
 
-			elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-				new = re.sub(f'(?', new)
+			if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'):
+				new = re.sub(f'(?', new)
+
+				if remoji in session["favorite_emojis"]: session["favorite_emojis"][remoji] += 1
+				else: session["favorite_emojis"][remoji] = 1
 					
-				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
-				else: session["favorite_emojis"][emoji] = 1
-
 		sanitized = sanitized.replace(old, new)
 
 
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 7bc45fead..09fb995d7 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -754,14 +754,9 @@ def ban_user(user_id, v):
 
 	if user.admin_level >= v.admin_level: abort(403)
 
-	if 'form' in request.values:
-		days = float(request.values.get("days")) if request.values.get('days') else 0
-		reason = sanitize(request.values.get("reason", ""))[:256]
-		message = request.values.get("reason", "").strip()[:256]
-	else:
-		days = float(request.values.get("days")) if request.values.get('days') else 0
-		reason = sanitize(request.values.get("reason", ""))[:256]
-		message = request.values.get("reason", "").strip()[:256]
+	days = float(request.values.get("days")) if request.values.get('days') else 0
+	reason = sanitize(request.values.get("reason", ""))[:256]
+	message = request.values.get("reason", "").strip()[:256]
 
 	if not user: abort(400)
 	
diff --git a/files/routes/awards.py b/files/routes/awards.py
index c29346ae1..1dff45b95 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -803,7 +803,7 @@ def award_comment(cid, v):
 @admin_level_required(2)
 def admin_userawards_get(v):
 
-	if request.host == 'rdrama.net' and v.admin_level != 3: return render_template("admin/awards.html", awards=list(AWARDS3.values()), v=v)
+	if v.admin_level != 3: return render_template("admin/awards.html", awards=list(AWARDS3.values()), v=v)
 	return render_template("admin/awards.html", awards=list(AWARDS.values()), v=v) 
 
 @app.post("/admin/awards")
@@ -850,5 +850,5 @@ def admin_userawards_post(v):
 
 	g.db.commit()
 
-	if request.host == 'rdrama.net' and v.admin_level != 3: return render_template("admin/awards.html", awards=list(AWARDS3.values()), v=v)
+	if v.admin_level != 3: return render_template("admin/awards.html", awards=list(AWARDS3.values()), v=v)
 	return render_template("admin/awards.html", awards=list(AWARDS.values()), v=v) 
\ No newline at end of file
diff --git a/files/routes/comments.py b/files/routes/comments.py
index b0f6131d9..c0144f45a 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -646,6 +646,18 @@ def edit_comment(cid, v):
 			body = body.replace('I ', f'@{v.username} ')
 			body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
 
+		if not c.options:
+			for i in re.finditer('\s*\$\$([^\$\n]+)\$\$\s*', body):
+				body = body.replace(i.group(0), "")
+				c_option = Comment(author_id=AUTOPOLLER_ID,
+					parent_submission=c.parent_submission,
+					parent_comment_id=c.id,
+					level=c.level+1,
+					body_html=filter_title(i.group(1)),
+					upvotes=0
+					)
+				g.db.add(c_option)
+
 		body_html = sanitize(CustomRenderer().render(mistletoe.Document(body)))
 
 		if v.marseyawarded and len(list(re.finditer('>[^<\s+]|[^>\s+]<', body_html))) > 0: return {"error":"You can only type marseys!"}, 403
@@ -816,7 +828,7 @@ def edit_comment(cid, v):
 
 		g.db.commit()
 
-	return c.body_html
+	return c.body_html + c.options_html(v)
 
 
 @app.post("/delete/comment/")
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 4d57c2ac7..24830b2f8 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -275,6 +275,17 @@ def edit_post(pid, v):
 			body = body.replace('I ', f'@{v.username} ')
 			body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')
 
+		if not p.options.count():
+			for i in re.finditer('\s*\$\$([^\$\n]+)\$\$\s*', body):
+				body = body.replace(i.group(0), "")
+				c = Comment(author_id=AUTOPOLLER_ID,
+					parent_submission=p.id,
+					level=1,
+					body_html=filter_title(i.group(1)),
+					upvotes=0
+					)
+				g.db.add(c)
+
 		body_html = sanitize(CustomRenderer().render(mistletoe.Document(body)))
 
 		bans = filter_comment_html(body_html)
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 0401c2108..c36112e70 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -504,7 +504,7 @@ def gumroad(v):
 
 	if v.email not in emails: return {"error": "Email not found"}, 404
 
-	response = response[0]
+	response = requests.get('https://api.gumroad.com/v2/sales', data=data, timeout=5).json()["sales"][0]
 	tier = tiers[response["variants_and_quantity"]]
 	if v.patron == tier: return {"error": f"{patron} rewards already claimed"}, 400
 
@@ -762,13 +762,11 @@ def settings_images_banner(v):
 @validate_formkey
 def settings_delete_profile(v):
 
-	if v.highres and '/images/' in v.highres: os.remove('/images/' + v.highres.split('/images/')[1])
-	if v.profileurl and '/images/' in v.profileurl: os.remove('/images/' + v.profileurl.split('/images/')[1])
+	if v.profileurl or v.highres:
+		v.deletepfp()
+		g.db.add(v)
+		g.db.commit()
 
-	v.highres = None
-	v.profileurl = None
-	g.db.add(v)
-	g.db.commit()
 	return render_template("settings_profile.html", v=v,
 						   msg="Profile picture successfully removed.")
 
@@ -779,8 +777,7 @@ def settings_delete_profile(v):
 def settings_delete_banner(v):
 
 	if v.bannerurl:
-		if '/images/' in v.bannerurl: os.remove('/images/' + v.bannerurl.split('/images/')[1])
-		v.bannerurl = None
+		v.deletebanner()
 		g.db.add(v)
 		g.db.commit()
 
diff --git a/files/routes/votes.py b/files/routes/votes.py
index 3b3b574bd..a03e16ca0 100644
--- a/files/routes/votes.py
+++ b/files/routes/votes.py
@@ -101,7 +101,7 @@ def api_vote_post(post_id, new, v):
 		post.author.coins += 1
 		post.author.truecoins += 1
 		g.db.add(post.author)
-		real = bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor
+		real = bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor and not v.agendaposter and not v.shadowbanned
 		vote = Vote(user_id=v.id,
 					vote_type=new,
 					submission_id=post_id,
@@ -169,7 +169,7 @@ def api_vote_comment(comment_id, new, v):
 		comment.author.coins += 1
 		comment.author.truecoins += 1
 		g.db.add(comment.author)
-		real = bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor
+		real = (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor) and not v.agendaposter and not v.shadowbanned
 		vote = CommentVote(user_id=v.id,
 						vote_type=new,
 						comment_id=comment_id,
diff --git a/files/templates/comment_failed.html b/files/templates/comment_failed.html
index aca4ece1e..88cc22826 100644
--- a/files/templates/comment_failed.html
+++ b/files/templates/comment_failed.html
@@ -29,9 +29,9 @@
 				 
 
 				
- - - + + +
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 9dc726543..de4b6f1b9 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -84,7 +84,7 @@ - +