diff --git a/files/assets/CHRISTMAS/js/emoji_modal.js b/files/assets/CHRISTMAS/js/emoji_modal.js index f913b8bf1..9b379f656 100644 --- a/files/assets/CHRISTMAS/js/emoji_modal.js +++ b/files/assets/CHRISTMAS/js/emoji_modal.js @@ -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,7 +416,7 @@ 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', @@ -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', @@ -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/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/emoji_modal.js b/files/assets/js/emoji_modal.js index 93d844adb..6f651d4eb 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -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,7 +416,7 @@ 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', @@ -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', @@ -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/routes/settings.py b/files/routes/settings.py index 8c78a80b3..3939e93c6 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.") diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index fe963fa4d..4761ef8d4 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..9d48dce07 100644 --- a/files/templates/CHRISTMAS/settings_profile.html +++ b/files/templates/CHRISTMAS/settings_profile.html @@ -416,7 +416,7 @@ - + +