diff --git a/files/assets/images/badges/109.webp b/files/assets/images/badges/109.webp deleted file mode 100644 index 6c4a80242..000000000 Binary files a/files/assets/images/badges/109.webp and /dev/null differ diff --git a/files/assets/images/badges/marseyfag.webp b/files/assets/images/badges/marseyfag.webp deleted file mode 100644 index 6d8c34a04..000000000 Binary files a/files/assets/images/badges/marseyfag.webp and /dev/null differ diff --git a/files/assets/images/emojis/marseyfag.webp b/files/assets/images/emojis/marseyfag.webp deleted file mode 100644 index 6d8c34a04..000000000 Binary files a/files/assets/images/emojis/marseyfag.webp and /dev/null differ diff --git a/files/assets/images/emojis/marseylaugh.webp b/files/assets/images/emojis/marseylaugh.webp index e28dcb1ea..622f40115 100644 Binary files a/files/assets/images/emojis/marseylaugh.webp and b/files/assets/images/emojis/marseylaugh.webp differ diff --git a/files/assets/images/emojis/marseytranny.webp b/files/assets/images/emojis/marseytranny.webp deleted file mode 100644 index e52240f26..000000000 Binary files a/files/assets/images/emojis/marseytranny.webp and /dev/null differ diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index acfe18dfa..32251d868 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -1,140 +1,109 @@ -let marseys, EMOJIS_STRINGS, commentFormID; - -function commentForm(form) { - commentFormID = form; -}; +let loaded = false; function loadEmojis(form) { - const xhr = new XMLHttpRequest(); - xhr.open("GET", '/marsey_list', true); - xhr.setRequestHeader('xhr', 'xhr'); - var f = new FormData() - xhr.onload = function() { - marseys = JSON.parse(xhr.response) - EMOJIS_STRINGS = [ - { - type:'marsey', - emojis: marseys - }, - { - type:'platy', - emojis: ['plarsy','platyabused','platyblizzard','platyboxer','platydevil','platyfear','platygirlmagic','platygolong','platyhaes','platyking','platylove','platyneet','platyold','platypatience','platypopcorn','platyrich','platysarcasm','platysilly','platysleeping','platythink','platytired','platytuxedomask','platyblush','platybruh','platycaveman','platycheer','platydown','platyeyes','platyheart','platylol','platymicdrop','platynooo','platysalute','platyseethe','platythumbsup','platywave'] - }, - { - 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'] - }, - { - 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','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', - emojis: ['trolldespair','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: ['sciencejak','soyjakanimeglasses','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'] - }, - { - type: 'wolf', - emojis: ['wolfangry','wolfbrains','wolfcry','wolfdead','wolfdevilish','wolffacepalm','wolfhappy','wolfidea','wolfkoala','wolflaugh','wolflove','wolfmeditate','wolfphone','wolfrainbow','wolfroses','wolfsad','wolfsfear','wolfsleep','wolftear','wolfthink','wolfthumbsup','wolfupsidedown','wolfvictory','wolfwave','wolfwink'] - }, - { - type: 'misc', - emojis: ['etika','sneed','retardedchildren','bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3'] - }, - ] + if (loaded == false) + { + const xhr = new XMLHttpRequest(); + xhr.open("GET", '/marsey_list', true); + xhr.setRequestHeader('xhr', 'xhr'); + var f = new FormData(); + xhr.onload = function() { + const emojis = { + 'marsey': JSON.parse(xhr.response), + + 'platy': ['plarsy','platyabused','platyblizzard','platyboxer','platydevil','platyfear','platygirlmagic','platygolong','platyhaes','platyking','platylove','platyneet','platyold','platypatience','platypopcorn','platyrich','platysarcasm','platysilly','platysleeping','platythink','platytired','platytuxedomask','platyblush','platybruh','platycaveman','platycheer','platydown','platyeyes','platyheart','platylol','platymicdrop','platynooo','platysalute','platyseethe','platythumbsup','platywave'], + + 'tay': ['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'], + + 'classic': ['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'], + + 'rage': ['trolldespair','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'], + + 'wojak': ['sciencejak','soyjakanimeglasses','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'], + + 'flags': ['niger','lgbt','saudi','animesexual','blacknation','blm','blueline','dreamgender','fatpride','incelpride','israel','kazakhstan','landlordlove','scalperpride','superstraight','trans','translord','transracial','usa'], + + 'wolf': ['wolfangry','wolfbrains','wolfcry','wolfdead','wolfdevilish','wolffacepalm','wolfhappy','wolfidea','wolfkoala','wolflaugh','wolflove','wolfmeditate','wolfphone','wolfrainbow','wolfroses','wolfsad','wolfsfear','wolfsleep','wolftear','wolfthink','wolfthumbsup','wolfupsidedown','wolfvictory','wolfwave','wolfwink'], + + 'misc': ['etika','sneed','retardedchildren','bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3']} + + document.getElementById('EMOJIS_favorite').setAttribute('data-form-destination', form) + + const commentBox = document.getElementById(form); + commentBox.setAttribute('data-curr-pos', commentBox.selectionStart); - let search_bar = document.getElementById("emoji_search"); - let search_container = document.getElementById('emoji-tab-search') - - const fav = document.getElementById('EMOJIS_favorite') - fav.setAttribute('data-form-destination', form) - - const commentBox = document.getElementById(form); - commentBox.setAttribute('data-curr-pos', commentBox.selectionStart); - - if (fav.innerHTML == "") - { - let str = "" - const favorite_emojis = JSON.parse(localStorage.getItem("favorite_emojis")) - if (favorite_emojis) + if (document.getElementById('EMOJIS_favorite').innerHTML == "") { - const sortable = Object.fromEntries( - Object.entries(favorite_emojis).sort(([,a],[,b]) => b-a) - ); - - for (const emoji of Object.keys(sortable).slice(0, 25)) - str += `` - - fav.innerHTML = str + let str = "" + const favorite_emojis = JSON.parse(localStorage.getItem("favorite_emojis")) + if (favorite_emojis) + { + const sortable = Object.fromEntries( + Object.entries(favorite_emojis).sort(([,a],[,b]) => b-a) + ); + + for (const emoji of Object.keys(sortable).slice(0, 25)) + str += `` + + document.getElementById('EMOJIS_favorite').innerHTML = str + } } - } - if (search_bar.value == "") { - - const marseys = document.getElementById("EMOJIS_marsey") - if (marseys.innerHTML == "") + if (document.getElementById("EMOJIS_marsey").innerHTML == "") { - for (let i = 0; i < EMOJIS_STRINGS.length; i++) { - let type = EMOJIS_STRINGS[i].type - let container = document.getElementById(`EMOJIS_${type}`) + for (const [k, v] of Object.entries(emojis)) { + let container = document.getElementById(`EMOJIS_${k}`) let str = '' - let arr = EMOJIS_STRINGS[i].emojis - if (i == 0) + if (k == 'marsey') { - for (const [key, value] of Object.entries(arr)) { + for (const key of Object.keys(v)) { str += ``; } } else { - for (let j = 0; j < arr.length; j++) { - str += ``; + for (let j = 0; j < v.length; j++) { + str += ``; } } container.innerHTML = str - search_container.innerHTML = "" + document.getElementById('emoji-tab-search').innerHTML = "" } } - } else { - let str = '' - for (let i = 0; i < EMOJIS_STRINGS.length; i++) { - let arr = EMOJIS_STRINGS[i].emojis - - let container = document.getElementById(`EMOJIS_${EMOJIS_STRINGS[i].type}`) - for (let j = 0; j < arr.length; j++) { - if (arr[j].match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(arr[j])) { - str += ``; - } - } - - if (i == 0) - { - let arr2 = EMOJIS_STRINGS[i].emojis; - for (const [key, value] of Object.entries(arr2)) { - if (str.includes(`'${key}'`)) continue; - if (key.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(key) || value.match(search_bar.value.toLowerCase())) { - str += ``; - } - } - container.innerHTML = "" - } - } - search_container.innerHTML = str + loaded == true; } - search_bar.oninput = function () { - loadEmojis(form); - }; - }; - xhr.send(f); + xhr.send(f); + } } + +document.getElementById("emoji_search").oninput = function () { + let str = '' + for (let i = 0; i < emojis.length; i++) { + let arr = emojis[i].emojis + + let container = document.getElementById(`EMOJIS_${emojis[i].type}`) + for (let j = 0; j < arr.length; j++) { + if (arr[j].match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(arr[j])) { + str += ``; + } + } + if (i == 0) + { + let arr2 = emojis[i].emojis; + for (const [key, value] of Object.entries(arr2)) { + if (str.includes(`'${key}'`)) continue; + if (key.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(key) || value.match(search_bar.value.toLowerCase())) { + str += ``; + } + } + container.innerHTML = "" + } + } + document.getElementById('emoji-tab-search').innerHTML = str +} + + function getEmoji(searchTerm) { const form = document.getElementById('EMOJIS_favorite').getAttribute('data-form-destination') const commentBox = document.getElementById(form); diff --git a/files/assets/js/gif_modal.js b/files/assets/js/gif_modal.js index 5e264d01d..a659c9d84 100644 --- a/files/assets/js/gif_modal.js +++ b/files/assets/js/gif_modal.js @@ -1,3 +1,9 @@ +let commentFormID; + +function commentForm(form) { + commentFormID = form; +}; + async function getGif(searchTerm) { if (searchTerm !== undefined) { diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 8619cd3a6..b8132a4f1 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -86,7 +86,7 @@ - +