diff --git a/files/assets/images/emojis/marseyaoc.webp b/files/assets/images/emojis/marseyaoc.webp new file mode 100644 index 000000000..290251672 Binary files /dev/null and b/files/assets/images/emojis/marseyaoc.webp differ diff --git a/files/assets/images/emojis/marseybrave.webp b/files/assets/images/emojis/marseybrave.webp new file mode 100644 index 000000000..7bf7e8635 Binary files /dev/null and b/files/assets/images/emojis/marseybrave.webp differ diff --git a/files/assets/images/emojis/marseycoin.webp b/files/assets/images/emojis/marseycoin.webp new file mode 100644 index 000000000..64a537ec8 Binary files /dev/null and b/files/assets/images/emojis/marseycoin.webp differ diff --git a/files/assets/images/emojis/marseycopeseethedilate.webp b/files/assets/images/emojis/marseycopeseethedilate.webp new file mode 100644 index 000000000..d20e23657 Binary files /dev/null and b/files/assets/images/emojis/marseycopeseethedilate.webp differ diff --git a/files/assets/images/emojis/marseyeldritch.webp b/files/assets/images/emojis/marseyeldritch.webp new file mode 100644 index 000000000..e5fbd951a Binary files /dev/null and b/files/assets/images/emojis/marseyeldritch.webp differ diff --git a/files/assets/images/emojis/marseyjiangshi.webp b/files/assets/images/emojis/marseyjiangshi.webp new file mode 100644 index 000000000..575c64a27 Binary files /dev/null and b/files/assets/images/emojis/marseyjiangshi.webp differ diff --git a/files/assets/images/emojis/marseymayo.webp b/files/assets/images/emojis/marseymayo.webp new file mode 100644 index 000000000..d5e28dd56 Binary files /dev/null and b/files/assets/images/emojis/marseymayo.webp differ diff --git a/files/assets/images/emojis/marseynintendo.webp b/files/assets/images/emojis/marseynintendo.webp new file mode 100644 index 000000000..0ea5a8583 Binary files /dev/null and b/files/assets/images/emojis/marseynintendo.webp differ diff --git a/files/assets/images/emojis/marseyracist.webp b/files/assets/images/emojis/marseyracist.webp new file mode 100644 index 000000000..59a7d0600 Binary files /dev/null and b/files/assets/images/emojis/marseyracist.webp differ diff --git a/files/assets/images/emojis/marseyspooky.webp b/files/assets/images/emojis/marseyspooky.webp index 1ab59e7e3..a49107417 100644 Binary files a/files/assets/images/emojis/marseyspooky.webp and b/files/assets/images/emojis/marseyspooky.webp differ diff --git a/files/assets/images/emojis/marseysrdine2.webp b/files/assets/images/emojis/marseysrdine2.webp new file mode 100644 index 000000000..bba735122 Binary files /dev/null and b/files/assets/images/emojis/marseysrdine2.webp differ diff --git a/files/assets/images/emojis/marseywtf2.webp b/files/assets/images/emojis/marseywtf2.webp new file mode 100644 index 000000000..031f2763b Binary files /dev/null and b/files/assets/images/emojis/marseywtf2.webp differ diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 359a4d940..e503f1c73 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -129,10 +129,6 @@ post_reply=function(id){ if (xhr.status==200) { commentForm=document.getElementById('comment-form-space-'+id); commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src'); - var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); - myToast.hide(); - var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); - myToast.show(); } else { var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); @@ -161,10 +157,6 @@ comment_edit=function(id){ commentForm=document.getElementById('comment-text-'+id); commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src'); document.getElementById('cancel-edit-'+id).click() - var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); - myToast.hide(); - var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); - myToast.show(); } else { var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); @@ -194,10 +186,6 @@ post_comment=function(fullname){ if (xhr.status==200) { commentForm=document.getElementById('comment-form-space-'+fullname); commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src'); - var myToast = new bootstrap.Toast(document.getElementById('toast-post-error')); - myToast.hide(); - var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); - myToast.show(); } else { var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 549e31794..9b913094d 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -13,7 +13,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', - 'marseylongpost','marseyminimalism','marseyminimalism2','marseymonk','marseypharoah','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','marseycrying2','marseydio','marseydragon','marseyfans','marseyfine','marseygrilling2','marseyhead','marseyjapenese','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','marseyhungry','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','marseycock','marseycontryclub','marseycool2','marseycrusader','marseycut','marseydaemon','marseydeuxfoid','marseydevil','marseyditzy','marseydoubt','marseyeyes','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','marseyspittake','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','marseylong1','marseylong2','marseylong3','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','marseyking','marseykkk','marseylawlz','marseylifting','marseylizard','marseylolcow','marseymanlet','marseymaoist','marseymcarthur','marseymermaid','marseymommy','marseymouse','marseymyeisha','marseyneckbeard','marseyniqab','marseynpc','marseynun','marseynut','marseyorthodox','marseyowow','marseypainter','marseypanties','marseypat','marseypeacekeeper','marseypharaoh','marseypickle','marseypinochet','marseypipe','marseypirate','marseypoggers','marseypope','marseyproctologist','marseypsycho','marseyqoomer','marseyradioactive','marseyrat','marseyrealwork','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'] + 'marseyaoc','marseybrave','marseycoin','marseycopeseethedilate','marseyeldritch','marseyjiangshi','marseymayo','marseynintendo','marseyracist','marseysrdine2','marseywtf2','marseylongpost','marseyminimalism','marseyminimalism2','marseymonk','marseypharoah','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','marseycrying2','marseydio','marseydragon','marseyfans','marseyfine','marseygrilling2','marseyhead','marseyjapenese','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','marseyhungry','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','marseycock','marseycontryclub','marseycool2','marseycrusader','marseycut','marseydaemon','marseydeuxfoid','marseydevil','marseyditzy','marseydoubt','marseyeyes','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','marseyspittake','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','marseylong1','marseylong2','marseylong3','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','marseyking','marseykkk','marseylawlz','marseylifting','marseylizard','marseylolcow','marseymanlet','marseymaoist','marseymcarthur','marseymermaid','marseymommy','marseymouse','marseymyeisha','marseyneckbeard','marseyniqab','marseynpc','marseynun','marseynut','marseyorthodox','marseyowow','marseypainter','marseypanties','marseypat','marseypeacekeeper','marseypharaoh','marseypickle','marseypinochet','marseypipe','marseypirate','marseypoggers','marseypope','marseyproctologist','marseypsycho','marseyqoomer','marseyradioactive','marseyrat','marseyrealwork','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', @@ -25,7 +25,7 @@ const EMOJIS_STRINGS = [ }, { 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: ['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', diff --git a/files/routes/comments.py b/files/routes/comments.py index 8d152ed8d..d4b39ff22 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -237,7 +237,7 @@ def api_comment(v): file=request.files["file"] if not file.content_type.startswith('image/'): return {"error": "That wasn't an image!"}, 400 - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) url = request.host_url[:-1] + process_image(name) @@ -635,7 +635,7 @@ def edit_comment(cid, v): file=request.files["file"] if not file.content_type.startswith('image/'): return {"error": "That wasn't an image!"}, 400 - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) url = request.host_url[:-1] + process_image(name) diff --git a/files/routes/posts.py b/files/routes/posts.py index 8b505830a..d328afc02 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -487,7 +487,7 @@ def thumbnail_thread(pid): db.close() return - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' with open(name, "wb") as file: for chunk in image_req.iter_content(1024): @@ -797,7 +797,7 @@ def submit_post(v): ), 403 if file.content_type.startswith('image/'): - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) new_post.url = request.host_url[:-1] + process_image(name) diff --git a/files/routes/settings.py b/files/routes/settings.py index 24148b612..f905a8060 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -112,7 +112,7 @@ def settings_profile_post(v): if request.headers.get("Authorization"): return {"error": f"Image files only"}, 400 else: return render_template("settings_profile.html", v=v, error=f"Image files only."), 400 - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) url = request.host_url[:-1] + process_image(name) @@ -506,13 +506,13 @@ def settings_images_profile(v): file = request.files["profile"] - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) highres = request.host_url[:-1] + process_image(name) if not highres: abort(400) - name2 = name.replace('.gif', '_resized.gif') + name2 = name.replace('.gif', 'r.gif') copyfile(name, name2) imageurl = request.host_url[:-1] + process_image(name2, True) @@ -537,7 +537,7 @@ def settings_images_banner(v): file = request.files["banner"] - name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(8)}.gif' + name = f'/hostedimages/{int(time.time())}{secrets.token_urlsafe(2)}.gif' file.save(name) imageurl = request.host_url[:-1] + process_image(name) diff --git a/files/templates/comments.html b/files/templates/comments.html index d115ddd48..6b1afc197 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -33,7 +33,7 @@ {% if v %} {% include "award_modal.html" %} - + {% endif %} @@ -221,7 +221,7 @@ {% if c.parent_comment_id and not standalone and level<=7 %}{{ c.parent_comment.author.username }}{% endif %} -  {{c.age_string}} +  {{c.age_string}} {% if c.edited_utc %} · Edited {{c.edited_string}} {% endif %} diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 34ea0a574..7562fa980 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -1,4 +1,4 @@ - +