diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index aa7edb9e1..f57e03078 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -64,7 +64,7 @@ @media (max-width: 768px) { .wholesome {animation: sealX 6s alternate} .wholesome img {animation: sealY 7s alternate} - .train, .scooter {animation: train 6s;} + .train, .scooter {animation: train 6s;} } /*confetti*/ diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 154188d89..dad2b590d 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -214,7 +214,7 @@ .fa-ankh:before{content:"\f644"} .fa-quotes:before{content:"\e234"} -/* do not remove - fixes hand, talking, marsey-love components +/* do not remove - fixes hand, talking, marsey-love components from breaking out of the comment box */ .comment-text a > img, img[data-user-submitted], .preview > img { @@ -7098,7 +7098,7 @@ div.markdown { height: 100% !important; width: 100% !important; max-width: 100vw !important; - } + } } .user-signature video { @@ -7489,7 +7489,7 @@ button, .btn { margin-bottom: 10px; width: 250px; height: 150px; - background-size: contain !important; + background-size: contain !important; background-repeat: no-repeat !important; } @@ -7528,7 +7528,7 @@ button, .btn { } .chud-5:after { height: 65px; - } + } } #cursormarsey { @@ -7633,7 +7633,7 @@ button, .btn { 15% {transform: scale(1);} 50% {transform: scale(0.8);} 100% {transform: scale(0.8);} -} +} #cursormarsey-heart { animation: animateHeart 0.3s infinite; diff --git a/files/assets/css/orgy.css b/files/assets/css/orgy.css index 59a4c51b1..13368bb40 100644 --- a/files/assets/css/orgy.css +++ b/files/assets/css/orgy.css @@ -34,7 +34,7 @@ lite-youtube { @media (max-width: 992px) { #orgy-file-container { - width: 100% !important; + width: 100% !important; } #orgy-title { display: none; @@ -82,5 +82,5 @@ body > .container { } #orgy-file-container > iframe { - aspect-ratio: 16/9; + aspect-ratio: 16/9; } diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js index c149369b8..f939a8bc6 100644 --- a/files/assets/js/chat.js +++ b/files/assets/js/chat.js @@ -290,7 +290,7 @@ ta.addEventListener("input", function() { else if (text && !is_typing) { is_typing = true; socket.emit('typing', true); - timer_id = setTimeout(remove_typing, 2000); + timer_id = setTimeout(remove_typing, 2000); } }) diff --git a/files/assets/js/core.js b/files/assets/js/core.js index adebc6b6c..f8ce25c7d 100644 --- a/files/assets/js/core.js +++ b/files/assets/js/core.js @@ -496,13 +496,13 @@ function handle_files(input, newfiles) { if (!oldfiles[ta.id]) { oldfiles[ta.id] = new DataTransfer(); } - + for (const file of newfiles) { oldfiles[ta.id].items.add(file); } input.files = oldfiles[ta.id].files; - + if (input.files.length > 20) { window.alert("You can't upload more than 20 files at one time!") @@ -518,9 +518,9 @@ function handle_files(input, newfiles) { autoExpand(ta) - if (typeof checkForRequired === "function") + if (typeof checkForRequired === "function") checkForRequired(); - if (typeof savetext === "function") + if (typeof savetext === "function") savetext(); if (typeof submit_save_files === "function") { const array = [] @@ -631,7 +631,7 @@ if (screen_width <= 768) { object = expandImageModal if (gbrowser != 'iphone') object = document - + if (object) { object.addEventListener('shown.bs.modal', function (e) { location.hash = `m-${e.target.id}`; @@ -642,7 +642,7 @@ if (screen_width <= 768) { history.back(); } }); - + addEventListener('hashchange', function () { if (!location.hash.startsWith("#m-")) { const curr_modal = bootstrap.Modal.getInstance(document.getElementsByClassName('show')[0]) diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 41de53c03..d163c43d8 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -522,7 +522,7 @@ function insertGhostDivs(element) { i.after(pseudo_div); i.addEventListener('input', update_speed_emoji_modal, false); i.addEventListener('keydown', speed_carot_navigate, false); - }); + }); } function loadEmojis(inputTargetIDName) diff --git a/files/assets/js/markdown.js b/files/assets/js/markdown.js index 9247342e6..b199de3aa 100644 --- a/files/assets/js/markdown.js +++ b/files/assets/js/markdown.js @@ -67,7 +67,7 @@ function replace_image(match, prefix, url) { const MODIFIERS = { PAT: 1, - TALKING: 2, + TALKING: 2, LARGE: 3, REVERSED: 4, USER: 5, @@ -90,7 +90,7 @@ const findAllEmoteEndings = (word) => { currEndings.push(MODIFIERS.PAT); continue; } - + if(currWord.endsWith('talking')) { if(currEndings.indexOf(MODIFIERS.TALKING) !== -1) { hasReachedNonModifer = true; @@ -100,7 +100,7 @@ const findAllEmoteEndings = (word) => { currEndings.push(MODIFIERS.TALKING); continue; } - + if(currWord.endsWith('genocide')) { if(currEndings.indexOf(MODIFIERS.GENOCIDE) !== -1) { hasReachedNonModifer = true; @@ -123,7 +123,7 @@ const findAllEmoteEndings = (word) => { hasReachedNonModifer = true; } - + return [currEndings, currWord]; } @@ -161,9 +161,9 @@ function markdown(t) { if (old.includes('marseyrandom')) continue; if (old.includes('marseyrandom')) continue let emoji = old.replace(/[:]/g,'').toLowerCase(); - + const modifiers = new Set(); - + let length = emoji.length; if(emoji.includes('!!')) modifiers.add(MODIFIERS.REVERSED_MODIFIER); emoji = emoji.replaceAll('!', ''); @@ -180,13 +180,13 @@ function markdown(t) { const isTalkingFirst = endingModifiers.indexOf(MODIFIERS.PAT) > endingModifiers.indexOf(MODIFIERS.TALKING); endingModifiers.forEach(modifiers.add, modifiers) - + if (emoji.startsWith('@')) { emoji = emoji.slice(1); modifiers.add(MODIFIERS.USER); } - - + + if (emoji === 'marseyunpettable') { modifiers.delete(MODIFIERS.PAT); if (!isTalkingFirst) { diff --git a/files/assets/js/profile_song.js b/files/assets/js/profile_song.js index 47713b969..72c0e94c7 100644 --- a/files/assets/js/profile_song.js +++ b/files/assets/js/profile_song.js @@ -74,7 +74,7 @@ else play_audio(audio); document.addEventListener('click', (e) => { if (e.target.id.startsWith("toggle-anthem")) - return + return if (audio.paused) play_audio(audio); }, {once : true}); } diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js index 0ffd56c92..3445dcea7 100644 --- a/files/assets/js/submit.js +++ b/files/assets/js/submit.js @@ -279,7 +279,7 @@ function submit_restore_files(kind, id) { oldfiles["post-text"] = new DataTransfer(); for (const file of files) { oldfiles["post-text"].items.add(file); - } + } } }; } diff --git a/files/classes/user.py b/files/classes/user.py index 478a923ab..432287323 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -382,7 +382,7 @@ class User(Base): return True if self.new_user: return True - return False + return False @property @lazy @@ -885,7 +885,7 @@ class User(Base): @lazy def group_memberships(self): return [x[0] for x in g.db.query(GroupMembership.group_name).filter( - GroupMembership.user_id == self.id, + GroupMembership.user_id == self.id, GroupMembership.approved_utc != None, ).order_by(GroupMembership.group_name)] diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 8652978ea..fbdc3dc59 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -937,11 +937,11 @@ approved_embed_hosts = [ 'pomf2.lain.la/f', 'i.giphy.com/media', 'media.giphy.com/media', # used by the GIF Modal - 'media0.giphy.com/media', - 'media1.giphy.com/media', - 'media2.giphy.com/media', - 'media3.giphy.com/media', - 'media4.giphy.com/media', + 'media0.giphy.com/media', + 'media1.giphy.com/media', + 'media2.giphy.com/media', + 'media3.giphy.com/media', + 'media4.giphy.com/media', 'media.tenor.com', 'c.tenor.com', 'thumbs.gfycat.com', @@ -1101,11 +1101,11 @@ HEADERS = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/ GIRL_NAMES = { 'A': ['Ashley', 'Alexis', 'Alyssa', 'Abigail', 'Anna', 'Amanda', 'Alexandra', 'Allison', 'Amber', 'Andrea', 'Autumn', 'Angela', 'Alexa', 'Alexandria', 'Amy', 'Ariana', 'Audrey', 'Angel', 'Alicia', 'Adriana', 'Arianna', 'Ana', 'Angelica', 'Angelina', 'Alexia', 'Alejandra', 'Avery', 'Ashlyn', 'Ava', 'Alondra', 'Ariel', 'Amaya', 'Abby', 'Amelia', 'Aaliyah', 'April', 'Adrianna', 'Asia', 'Aubrey', 'Alison', 'Allyson', 'Alexus', 'Alana', 'Alissa', 'Aliyah', 'Anne', 'Annie', 'Anastasia', 'Ashlee', 'Alaina', 'Addison', 'Ashleigh', 'Ashton', 'Anahi', 'Ashlynn', 'Allie', 'Alisha', 'Alice', 'Abbey', 'Alayna', 'Ayanna', 'Annika', 'Alyson', 'Annabelle', 'Alina', 'Angelique', 'Aurora', 'Alma', 'Ann', 'Alanna', 'Angie', 'Amari', 'Aileen', 'Athena', 'Adrienne', 'Arielle', 'Abbigail', 'Aimee', 'Alivia', 'Amya', 'Aspen', 'Aniya', 'Anya', 'Abbie', 'Araceli', 'Aleah', 'Ally', 'Alisa', 'Antonia', 'Anika', 'Alessandra', 'Aisha', 'Ayana', 'America', 'Abigayle', 'Aliya', 'Alena', 'Aylin', 'Aniyah', 'Alia', 'Anita', 'Alexandrea', 'Annette', 'Amani', 'Armani', 'Anissa', 'Aubree', 'Ansley', 'Alysa', 'Alize', 'Amara', 'Arlene', 'Aiyana', 'Allyssa', 'Adeline', 'Annalise', 'Amira', 'Alexys', 'Abril', 'Ayla', 'Asha', 'Aryanna', 'Anaya', 'Arely', 'Alysha', 'Aracely', 'Alex', 'Ali', 'Alycia', 'Anjali', 'Amiya', 'Aja', 'Annabel', 'Aliza', 'Ashly', 'Abigale', 'Abagail', 'Aria', 'Ashtyn', 'Annamarie', 'Amina', 'Antoinette'], - 'B': ['Brianna', 'Brooke', 'Brittany', 'Bailey', 'Breanna', 'Briana', 'Britney', 'Brittney', 'Bethany', 'Bianca', 'Brenda', 'Brooklyn', 'Bridget', 'Brenna', 'Bryanna', 'Baylee', 'Brandi', + 'B': ['Brianna', 'Brooke', 'Brittany', 'Bailey', 'Breanna', 'Briana', 'Britney', 'Brittney', 'Bethany', 'Bianca', 'Brenda', 'Brooklyn', 'Bridget', 'Brenna', 'Bryanna', 'Baylee', 'Brandi', 'Brandy', 'Bailee', 'Brisa', 'Barbara', 'Brooklynn', 'Breana', 'Brynn', 'Blanca', 'Bria', 'Beatriz', 'Brianne', 'Brielle', 'Bella', 'Brook', 'Berenice', 'Baby', 'Bridgette', 'Bryana', 'Brionna', 'Bonnie', 'Belen', 'Beatrice', 'Blair', 'Breonna', 'Breanne'], - 'C': ['Chloe', 'Courtney', 'Caroline', 'Christina', 'Caitlin', 'Catherine', 'Claire', 'Cheyenne', 'Cassandra', 'Cassidy', 'Caitlyn', 'Crystal', 'Chelsea', 'Cynthia', 'Carly', 'Camryn', 'Claudia', 'Cameron', 'Casey', 'Christine', 'Cierra', 'Cindy', 'Carolina', 'Camille', 'Carmen', 'Celeste', 'Ciara', 'Cecilia', 'Charlotte', 'Carolyn', 'Callie', 'Clarissa', 'Cristina', 'Cassie', 'Clara', 'Cheyanne', 'Cara', 'Carla', 'Carley', 'Carissa', 'Colleen', 'Charity', 'Chelsey', 'Cora', 'Chasity', 'Carlie', 'Carrie', 'Chyna', 'Clare', 'Cristal', 'Corinne', 'Ciera', 'Carina', 'Christian', 'Cayla', 'Candace', 'Celia', 'Calista', 'Carlee', 'Carson', 'Camila', 'Christy', 'Celine', 'Chandler', 'Candice', 'Carol', 'Casandra', 'Carli', 'Catalina', 'Celina', 'Cecelia', 'Chaya', 'Christa', 'Citlalli', 'Chanel', 'Cali', 'Caitlynn', 'Christiana', 'Cortney', 'Caleigh', + 'C': ['Chloe', 'Courtney', 'Caroline', 'Christina', 'Caitlin', 'Catherine', 'Claire', 'Cheyenne', 'Cassandra', 'Cassidy', 'Caitlyn', 'Crystal', 'Chelsea', 'Cynthia', 'Carly', 'Camryn', 'Claudia', 'Cameron', 'Casey', 'Christine', 'Cierra', 'Cindy', 'Carolina', 'Camille', 'Carmen', 'Celeste', 'Ciara', 'Cecilia', 'Charlotte', 'Carolyn', 'Callie', 'Clarissa', 'Cristina', 'Cassie', 'Clara', 'Cheyanne', 'Cara', 'Carla', 'Carley', 'Carissa', 'Colleen', 'Charity', 'Chelsey', 'Cora', 'Chasity', 'Carlie', 'Carrie', 'Chyna', 'Clare', 'Cristal', 'Corinne', 'Ciera', 'Carina', 'Christian', 'Cayla', 'Candace', 'Celia', 'Calista', 'Carlee', 'Carson', 'Camila', 'Christy', 'Celine', 'Chandler', 'Candice', 'Carol', 'Casandra', 'Carli', 'Catalina', 'Celina', 'Cecelia', 'Chaya', 'Christa', 'Citlalli', 'Chanel', 'Cali', 'Caitlynn', 'Christiana', 'Cortney', 'Caleigh', 'Chantel', 'Cielo', 'Cydney'], - 'D': ['Destiny', 'Danielle', 'Diana', 'Daisy', 'Daniela', 'Diamond', 'Desiree', 'Delaney', 'Dominique', 'Dakota', 'Deanna', 'Dana', 'Destinee', 'Denise', 'Deja', 'Daniella', 'Deborah', 'Devin', 'Destiney', 'Destini', + 'D': ['Destiny', 'Danielle', 'Diana', 'Daisy', 'Daniela', 'Diamond', 'Desiree', 'Delaney', 'Dominique', 'Dakota', 'Deanna', 'Dana', 'Destinee', 'Denise', 'Deja', 'Daniella', 'Deborah', 'Devin', 'Destiney', 'Destini', 'Dulce', 'Desirae', 'Daphne', 'Devon', 'Donna', 'Delilah', 'Devyn', 'Diane', 'Damaris', 'Dorothy', 'Drew', 'Darlene', 'Dasia', 'Dariana', 'Dianna', 'Darby', 'Darian', 'Dayana', 'Dallas', 'Deasia', 'Dawn', 'Dejah', 'Daisha', 'Destany', 'Daija', 'Delia', 'Dayna'], 'E': ['Emily', 'Elizabeth', 'Emma', 'Erin', 'Erica', 'Erika', 'Evelyn', 'Esmeralda', 'Elena', 'Elise', 'Ella', 'Eva', 'Esther', 'Emilee', 'Ellie', 'Eleanor', 'Eliza', 'Elisabeth', 'Ellen', 'Emely', 'Emilie', 'Elaina', 'Elisa', 'Eden', 'Esperanza', 'Eliana', 'Eve', 'Ebony', 'Edith', 'Elaine', 'Essence', 'Emilia', 'Eileen', 'Ericka', 'Estrella', 'Elissa', 'Elyse', 'Eryn', 'Elyssa', 'Elsa', 'Emmalee', 'Estefania', 'Emerald'], 'F': ['Faith', 'Fatima', 'Francesca', 'Felicity', 'Fiona', 'Felicia', 'Fernanda', 'Frances', 'Fabiola'], @@ -1113,19 +1113,19 @@ GIRL_NAMES = { 'H': ['Hannah', 'Haley', 'Hailey', 'Heather', 'Hope', 'Hayley', 'Hanna', 'Holly', 'Haylee', 'Hallie', 'Heaven', 'Helen', 'Heidi', 'Haleigh', 'Harley', 'Hailee', 'Hunter', 'Halle', 'Halie', 'Hana', 'Haylie', 'Helena', 'Hayden', 'Harmony', 'Hailie', 'Haven', 'Hillary', 'Hazel', 'Hadley'], 'I': ['Isabella', 'Isabel', 'Isabelle', 'Imani', 'Ivy', 'India', 'Iris', 'Irene', 'Isis', 'Itzel', 'Izabella', 'Iliana', 'Isabela', 'Ingrid', 'Ivana', 'Iyana'], 'J': ['Jessica', 'Jennifer', 'Jasmine', 'Julia', 'Jordan', 'Jenna', 'Jacqueline', 'Jada', 'Jade', 'Jillian', 'Jocelyn', 'Jamie', 'Jordyn', 'Julie', 'Jasmin', 'Jazmin', 'Jazmine', 'Joanna', 'Juliana', 'Julianna', 'Jayla', 'Jaqueline', 'Josephine', 'Josie', 'Jacquelyn', 'Jenny', 'Julissa', 'Jaden', 'Jessie', 'Janet', 'Jane', 'Jayda', 'Jaclyn', 'Joy', 'Johanna', 'Janelle', 'Janae', 'Justine', 'Jayden', 'Julianne', 'Justice', 'Jewel', 'Judith', 'Jaelyn', 'Juliet', 'Jadyn', 'Joselyn', 'Juliette', 'Jazlyn', 'Jazmyn', 'Joyce', 'Janessa', 'Jalyn', 'Jaida', 'Jenifer', 'Jacey', 'Jackeline', 'Jaime', 'Jaiden', 'Janice', 'Jaquelin', 'Jeanette', 'Jacklyn', 'Jesse', 'Jolie', 'Juanita', 'Jaycee', 'Jasmyn', 'Jaylin', 'Joelle', 'Joana', 'Jazmyne', 'Jakayla', 'Jana', 'Joanne', 'Janiya', 'Jena', 'Jailyn', 'Jayde', 'Jill'], - 'K': ['Kayla', 'Kaitlyn', 'Katherine', 'Katelyn', 'Kimberly', 'Kaylee', 'Kelsey', 'Kathryn', 'Katie', 'Kylie', 'Kelly', 'Kiara', 'Kennedy', 'Kristen', 'Karen', 'Kaitlin', 'Karina', 'Kendra', 'Kendall', 'Kara', 'Kylee', 'Kyra', 'Karla', 'Kathleen', 'Kristina', 'Kate', 'Katelynn', 'Kyla', 'Katrina', 'Kirsten', 'Kiana', 'Kassandra', 'Kira', 'Kristin', 'Kailey', 'Kassidy', 'Katlyn', 'Kamryn', 'Krystal', 'Kayleigh', 'Kaitlynn', 'Kierra', 'Kaylie', 'Kasey', 'Krista', 'Kaleigh', 'Kali', 'Karissa', 'Kelsie', 'Kiersten', 'Kiera', 'Kaylin', 'Kiley', 'Kaila', 'Kailee', 'Kenya', 'Kaley', 'Kelli', 'Kyleigh', 'Kaylyn', 'Kailyn', 'Karlee', 'Keely', 'Katelin', 'Kianna', 'Kacie', 'Karli', 'Kayley', 'Katarina', 'Kellie', 'Kaelyn', 'Kathy', 'Katharine', 'Karlie', 'Kourtney', 'Kenzie', 'Karly', 'Kristine', 'Kaylynn', 'Kelsi', 'Kaya', 'Kayli', 'Kallie', 'Kasandra', 'Kari', 'Kaylah', 'Kennedi', 'Karley', 'Kristy', 'Kiarra', 'Kacey', 'Keara', 'Kalyn', 'Kaela', 'Katia', 'Kinsey', 'Kaia', 'Katerina', 'Keira', 'Kaci', 'Kameron', 'Katy', 'Kirstin', + 'K': ['Kayla', 'Kaitlyn', 'Katherine', 'Katelyn', 'Kimberly', 'Kaylee', 'Kelsey', 'Kathryn', 'Katie', 'Kylie', 'Kelly', 'Kiara', 'Kennedy', 'Kristen', 'Karen', 'Kaitlin', 'Karina', 'Kendra', 'Kendall', 'Kara', 'Kylee', 'Kyra', 'Karla', 'Kathleen', 'Kristina', 'Kate', 'Katelynn', 'Kyla', 'Katrina', 'Kirsten', 'Kiana', 'Kassandra', 'Kira', 'Kristin', 'Kailey', 'Kassidy', 'Katlyn', 'Kamryn', 'Krystal', 'Kayleigh', 'Kaitlynn', 'Kierra', 'Kaylie', 'Kasey', 'Krista', 'Kaleigh', 'Kali', 'Karissa', 'Kelsie', 'Kiersten', 'Kiera', 'Kaylin', 'Kiley', 'Kaila', 'Kailee', 'Kenya', 'Kaley', 'Kelli', 'Kyleigh', 'Kaylyn', 'Kailyn', 'Karlee', 'Keely', 'Katelin', 'Kianna', 'Kacie', 'Karli', 'Kayley', 'Katarina', 'Kellie', 'Kaelyn', 'Kathy', 'Katharine', 'Karlie', 'Kourtney', 'Kenzie', 'Karly', 'Kristine', 'Kaylynn', 'Kelsi', 'Kaya', 'Kayli', 'Kallie', 'Kasandra', 'Kari', 'Kaylah', 'Kennedi', 'Karley', 'Kristy', 'Kiarra', 'Kacey', 'Keara', 'Kalyn', 'Kaela', 'Katia', 'Kinsey', 'Kaia', 'Katerina', 'Keira', 'Kaci', 'Kameron', 'Katy', 'Kirstin', 'Kori', 'Katlynn', 'Kaylan', 'Kenna', 'Keeley', 'Kenia'], 'L': ['Lauren', 'Laura', 'Leslie', 'Leah', 'Lindsey', 'Lily', 'Lillian', 'Lydia', 'Lindsay', 'Lauryn', 'Lisa', 'Liliana', 'Logan', 'Lucy', 'Linda', 'Lizbeth', 'Lacey', 'Lesly', 'Litzy', 'Layla', 'Lilly', 'Lesley', 'Lexi', 'Larissa', 'Lucia', 'Lorena', 'Leilani', 'Luz', 'Lena', 'Lexie', 'Leticia', 'Laurel', 'Leila', 'Leanna', 'Lyndsey', 'Laila', 'Lea', 'Lexus', 'Lizeth', 'Loren', 'Laney', 'Lizette', 'Lilian', 'Lila', 'Lillie', 'Lia', 'Lyric', 'Liana', 'London', 'Lara', 'Lisette', 'Lori', 'Lilliana', 'Lourdes', 'Luisa', 'Leann', 'Laisha'], 'M': ['Madison', 'Megan', 'Morgan', 'Maria', 'Mackenzie', 'Mary', 'Michelle', 'Madeline', 'Makayla', 'Melissa', 'Mariah', 'Marissa', 'Mia', 'Molly', 'Mikayla', 'Margaret', 'Miranda', 'Maya', 'Melanie', 'Madelyn', 'Mckenzie', 'Meghan', 'Michaela', 'Monica', 'Mya', 'Mckenna', 'Maggie', 'Makenzie', 'Mallory', 'Macy', 'Makenna', 'Miriam', 'Madeleine', 'Mercedes', 'Meredith', 'Marisa', 'Mariana', 'Monique', 'Marina', 'Meagan', 'Martha', 'Marie', 'Mikaela', 'Madalyn', 'Marisol', 'Melody', 'Mckayla', 'Maddison', 'Madisyn', 'Madyson', 'Mayra', 'Macie', 'Malia', 'Marilyn', 'Marlene', 'Macey', 'Miracle', 'Madelynn', 'Melina', 'Maia', 'Maritza', 'Mollie', 'Montana', 'Mara', 'Micaela', 'Micah', 'Madilyn', 'Maribel', 'Madisen', 'Margarita', 'Moriah', 'Mariam', 'Meaghan', 'Marley', 'Melinda', 'Marian', 'Mariela', 'Maura', 'Mattie', 'Maci', 'Maegan', 'Maeve', 'Marianna', 'Myah', 'Monserrat', 'Maranda', 'Michele', 'Magdalena', 'Mireya', 'Misty', 'Martina', 'Maryam', 'Myra', 'Marlee', 'Mandy', 'Maiya', 'Melisa', 'Marlen'], - 'N': ['Nicole', 'Natalie', 'Naomi', 'Nina', 'Natalia', 'Nancy', 'Nadia', 'Natasha', 'Nia', 'Noelle', 'Nichole', + 'N': ['Nicole', 'Natalie', 'Naomi', 'Nina', 'Natalia', 'Nancy', 'Nadia', 'Natasha', 'Nia', 'Noelle', 'Nichole', 'Nora', 'Nathalie', 'Nikki', 'Nicolette', 'Noemi', 'Nayeli', 'Nataly', 'Noelia', 'Nya', 'Nyah', 'Nikita', 'Nadine', 'Norma', 'Nyasia', 'Neha'], 'O': ['Olivia', 'Odalys'], 'P': ['Paige', 'Payton', 'Peyton', 'Patricia', 'Priscilla', 'Paola', 'Precious', 'Phoebe', 'Pamela', 'Paris', 'Paulina', 'Piper', 'Perla', 'Paula', 'Presley', 'Princess', 'Parker', 'Patience', 'Paloma'], 'Q': ['Quinn'], - 'R': ['Rachel', 'Rebecca', 'Riley', 'Rebekah', 'Raven', 'Rachael', 'Ruby', 'Reagan', 'Rylee', 'Rose', 'Rosa', 'Ruth', 'Raquel', 'Renee', 'Rhiannon', 'Regan', 'Regina', 'Ryan', 'Reyna', 'Robin', 'Raegan', 'Rosemary', 'Rylie', 'Robyn', 'Rosalinda', 'Rebeca', 'Rocio', 'Reilly', 'Rachelle', 'Ryleigh', 'Ryann', 'Reina', 'Randi', 'Reanna', 'Rita', 'Reese', + 'R': ['Rachel', 'Rebecca', 'Riley', 'Rebekah', 'Raven', 'Rachael', 'Ruby', 'Reagan', 'Rylee', 'Rose', 'Rosa', 'Ruth', 'Raquel', 'Renee', 'Rhiannon', 'Regan', 'Regina', 'Ryan', 'Reyna', 'Robin', 'Raegan', 'Rosemary', 'Rylie', 'Robyn', 'Rosalinda', 'Rebeca', 'Rocio', 'Reilly', 'Rachelle', 'Ryleigh', 'Ryann', 'Reina', 'Randi', 'Reanna', 'Rita', 'Reese', 'Roxanne', 'Raina', 'Rhianna', 'Rayna'], 'S': ['Sarah', 'Samantha', 'Sydney', 'Savannah', 'Stephanie', 'Sophia', 'Sierra', 'Sara', 'Shelby', 'Sabrina', 'Skylar', 'Summer', 'Shannon', 'Sophie', 'Sofia', 'Selena', 'Serena', 'Savanna', 'Sadie', 'Skyler', 'Sandra', 'Sidney', 'Shania', 'Shayla', 'Susan', 'Sharon', 'Serenity', 'Sasha', 'Skye', 'Sage', 'Sylvia', 'Sonia', 'Shyanne', 'Sydnee', 'Sydni', 'Sarai', 'Shayna', 'Simone', 'Savanah', 'Stacy', 'Sienna', 'Sandy', 'Stella', 'Skyla', 'Salma', 'Sydnie', 'Stacey', 'Sheila', 'Shawna', 'Sally', 'Susana', 'Shea', 'Stephany', 'Savana', 'Shyann', 'Shaina', 'Selina', 'Sarina', 'Shaylee', 'Sheridan', 'Shakira', 'Shirley', 'Silvia', 'Stefanie', 'Samara', 'Sonya', 'Shaniya', 'Saige', 'Scarlett', 'Sky'], - 'T': ['Taylor', 'Trinity', 'Tiffany', 'Tara', 'Tatiana', 'Tori', 'Tessa', 'Tabitha', 'Teresa', 'Tiana', 'Tiara', 'Talia', 'Tatyana', 'Tia', 'Tyler', 'Tamara', 'Theresa', 'Tatum', 'Tamia', 'Tyra', 'Taryn', 'Tania', 'Tianna', 'Tayler', 'Tierra', + 'T': ['Taylor', 'Trinity', 'Tiffany', 'Tara', 'Tatiana', 'Tori', 'Tessa', 'Tabitha', 'Teresa', 'Tiana', 'Tiara', 'Talia', 'Tatyana', 'Tia', 'Tyler', 'Tamara', 'Theresa', 'Tatum', 'Tamia', 'Tyra', 'Taryn', 'Tania', 'Tianna', 'Tayler', 'Tierra', 'Toni', 'Tess', 'Tanya', 'Tina', 'Thalia', 'Tracy', 'Teagan', 'Tatianna', 'Taya', 'Trisha'], 'U': ['Unique'], 'V': ['Victoria', 'Vanessa', 'Veronica', 'Valerie', 'Valeria', 'Vivian', 'Virginia', 'Viviana', 'Valentina', 'Violet'], diff --git a/files/helpers/media.py b/files/helpers/media.py index c23da7765..4902d187b 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -170,7 +170,7 @@ def process_video(file, v): ) g.db.add(media) - if SITE == 'watchpeopledie.tv': + if SITE == 'watchpeopledie.tv': return f'https://videos.{SITE}' + new.split('/videos')[1] else: return f"{SITE_FULL}{new}" diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index fd55efb36..11df8414e 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -235,7 +235,7 @@ def find_all_emote_endings(word): endings.append('pat') word = word[:-3] continue - + if word.endswith('talking'): if 'talking' in endings: is_non_ending_found = True @@ -251,7 +251,7 @@ def find_all_emote_endings(word): endings.append('genocide') word = word[:-8] continue - + if word.endswith('love'): if 'love' in endings: is_non_ending_found = True @@ -261,7 +261,7 @@ def find_all_emote_endings(word): continue is_non_ending_found = True - + return endings, word @@ -312,17 +312,17 @@ def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False): hand_html = f'' if is_patted and emoji != 'marseyunpettable' else '' talking_html = f'' if is_talking else '' - loved_html = f':{old}::{old}:' + loved_html = f':{old}::{old}:' genocide_attr = ' cide' if is_genocided else '' - + modifier_html = '' if (is_talking and is_patted): - modifier_html = f'{talking_html}{hand_html}' if is_talking_first else f'{hand_html}{talking_html}' - elif (is_patted): + modifier_html = f'{talking_html}{hand_html}' if is_talking_first else f'{hand_html}{talking_html}' + elif (is_patted): modifier_html = hand_html elif (is_talking): modifier_html = talking_html - + if(is_loved): modifier_html = f'{modifier_html}{loved_html}' @@ -506,7 +506,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis a.string = tag["src"] tag.replace_with(a) continue - + del tag["g"] del tag["glow"] del tag["party"] @@ -570,7 +570,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis allowed_css_properties = allowed_styles.copy() if g.v and g.v.chud: - allowed_css_properties.remove('filter') + allowed_css_properties.remove('filter') css_sanitizer = CSSSanitizer(allowed_css_properties=allowed_css_properties) sanitized = bleach.Cleaner(tags=allowed_tags, @@ -723,7 +723,7 @@ def filter_emojis_only(title, golden=True, count_emojis=False): if len(title) > POST_TITLE_HTML_LENGTH_LIMIT: abort(400, "Rendered title is too big!") - + title = title.strip() return title diff --git a/files/helpers/sorting_and_time.py b/files/helpers/sorting_and_time.py index 7998c4e04..c1a43b9b4 100644 --- a/files/helpers/sorting_and_time.py +++ b/files/helpers/sorting_and_time.py @@ -25,7 +25,7 @@ def apply_time_filter(t, objects, cls): return objects return objects.filter(cls.created_utc >= cutoff) - + def sort_objects(sort, objects, cls): if sort == 'hot': diff --git a/files/routes/chat.py b/files/routes/chat.py index ced3ba953..5bc3a4107 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -237,7 +237,7 @@ def disconnect(v): val.remove(v.username) refresh_online() - + return '', 204 @socketio.on('typing') diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index eff54f45a..a9b69cc03 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -66,7 +66,7 @@ def selected_tab(request): if hasattr(g, 'v') and g.v and g.v.defaultsorting == 'new' and requested_sort == 'hot': return 'hot' elif requested_sort == 'new': - return 'new' + return 'new' elif request.path == '/comments': return 'comments' elif request.path == '/casino': diff --git a/files/routes/posts.py b/files/routes/posts.py index 99a8bee49..5637c963d 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -428,7 +428,7 @@ def submit_post(v, sub=None): if SITE == 'rdrama.net' and (v.chud == 1 or v.id == 253): sub = 'chudrama' - + if SITE == 'rdrama.net' and v.id == 10947: sub = 'mnn' diff --git a/files/routes/settings.py b/files/routes/settings.py index 511e61d3f..086e493ee 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -170,7 +170,7 @@ def settings_personal_post(v): if v.spider: badge_grant(user=v, badge_id=179) else: badge = v.has_badge(179) - if badge: + if badge: g.db.delete(badge) elif not updated and request.values.get("cursormarsey", v.cursormarsey) != v.cursormarsey: diff --git a/files/routes/users.py b/files/routes/users.py index 67132b7c0..89009677e 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -34,7 +34,7 @@ def _add_profile_view(vid, uid): if view: view.last_view_utc = int(time.time()) else: view = ViewerRelationship(viewer_id=vid, user_id=uid) db.add(view) - + try: db.commit() except IntegrityError as e: @@ -155,7 +155,7 @@ def upvoters_downvoters(v, username, username2, cls, vote_cls, vote_dir, templat u = get_user(username, v=v) if not u.is_visible_to(v): abort(403) id = u.id - + uid = get_user(username2, id_only=True).id page = get_page() @@ -919,7 +919,7 @@ def muting(v, username): .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE ).all() return render_template("userpage/muting.html", v=v, u=u, users=users, page=page, total=total) - + @app.get("/@/followers") @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) diff --git a/files/templates/chat.html b/files/templates/chat.html index bb68dd4c2..82680510f 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -11,7 +11,7 @@ {% set vlink = '
-
+
{{macros.chat_users_online()}} @@ -29,7 +29,7 @@ {{macros.chat_users_list()}}
- + diff --git a/files/templates/comments.html b/files/templates/comments.html index bac95512f..4be28fd96 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -201,17 +201,17 @@ {% if c.treasure_amount and c.treasure_amount != '0' %} {% if c.treasure_amount.startswith('l') %} - + treasure Found {{c.treasure_amount.replace('l', '')}} Lottershe Tickets! {% elif '-' in c.treasure_amount %} - + treasure A Mimic Ate {{c.treasure_amount.replace('-', '')}} Coins! {% else %} - + treasure Found {{c.treasure_amount}} Coins! diff --git a/files/templates/donate.html b/files/templates/donate.html index 26867f030..45064ecc7 100644 --- a/files/templates/donate.html +++ b/files/templates/donate.html @@ -13,7 +13,7 @@ Merch https://redbubble.com/people/rdramanet/explore?sortOrder=top%20selling - + {% endif %} Ethereum/Brave Attention Token diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html index 60f280b9f..edc86b467 100644 --- a/files/templates/errors/WPD/404.html +++ b/files/templates/errors/WPD/404.html @@ -71,7 +71,7 @@ - +