diff --git a/files/assets/css/4chan.css b/files/assets/css/4chan.css index 2306cc1f3..2cd5b1ac9 100644 --- a/files/assets/css/4chan.css +++ b/files/assets/css/4chan.css @@ -153,7 +153,7 @@ h5.post-title a:visited { } .spoiler, spoiler { - background-color: black !important; + background-color: black !important; } *:target, .unread { diff --git a/files/assets/css/chat.css b/files/assets/css/chat.css index 0e86cc46f..a7281c4de 100644 --- a/files/assets/css/chat.css +++ b/files/assets/css/chat.css @@ -26,17 +26,17 @@ } .chat-mention { - position: relative; + position: relative; } .chat-mention::before { - content: ""; - width: 100%; - height: 100%; - position: absolute; - left: 0; - background-color: var(--primary); - opacity: 0.2; + content: ""; + width: 100%; + height: 100%; + position: absolute; + left: 0; + background-color: var(--primary); + opacity: 0.2; pointer-events: none !important; } @@ -91,12 +91,12 @@ p { color: var(--black); font-size: 12px; margin-top: auto; - margin-bottom: auto; + margin-bottom: auto; } lite-youtube { max-width: min(70vw,500px) !important; - width: 500px; + width: 500px; } .chat-group:nth-child(even) { @@ -104,7 +104,7 @@ lite-youtube { } .btn-secondary { - border: none !important; + border: none !important; } #cancel { @@ -132,7 +132,7 @@ lite-youtube { .chat-message { max-height: 50vh; overflow: auto; - max-width: 80%; + max-width: 80%; display: inline-block; } @@ -141,14 +141,14 @@ lite-youtube { } .resizable>video { - max-height: 28vh!important; + max-height: 28vh!important; margin: 14px 0 0 0!important; } img[alt^="![]("], .img { - width: 90%; - object-fit: contain; - object-position: left; + width: 90%; + object-fit: contain; + object-position: left; } * { @@ -165,5 +165,5 @@ img[alt^="![]("], .img { } #online > li, #online3 > li { - margin-top: 0.35rem; + margin-top: 0.35rem; } diff --git a/files/assets/css/coffee.css b/files/assets/css/coffee.css index ea690b477..b83e04d2b 100644 --- a/files/assets/css/coffee.css +++ b/files/assets/css/coffee.css @@ -59,8 +59,8 @@ } blockquote { - background-color: #333; - color: #ddd; + background-color: #333; + color: #ddd; } .text-muted { @@ -110,5 +110,5 @@ h5.post-title a:visited { } .spoiler, spoiler { - background-color: black !important; + background-color: black !important; } diff --git a/files/assets/css/dark.css b/files/assets/css/dark.css index 7de079168..06158d830 100644 --- a/files/assets/css/dark.css +++ b/files/assets/css/dark.css @@ -97,5 +97,5 @@ h5.post-title a:visited { } [disabled], .disabled, button[disabled], .btn[disabled], button.disabled, .btn.disabled { - color: #bbb !important; + color: #bbb !important; } diff --git a/files/assets/css/dramblr.css b/files/assets/css/dramblr.css index 86b1042b2..ac0a6109f 100644 --- a/files/assets/css/dramblr.css +++ b/files/assets/css/dramblr.css @@ -149,5 +149,5 @@ h5.post-title a:visited { } .modal .comment-actions .list-group-item { - background-color: rgb(var(--background)); + background-color: rgb(var(--background)); } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 964bae5eb..62bab536d 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -1608,7 +1608,7 @@ nav } .pagination-sm .page-link { padding: 0.25rem min(20px, 3vw); - font-size: min(25px, 5.8vw); + font-size: min(25px, 5.8vw); line-height: 1.5; } .pagination-sm .page-item:first-child .page-link { @@ -6676,13 +6676,13 @@ g { .queen:not(a) { color: hotpink !important; font-weight: 700 !important; - text-transform: lowercase !important; + text-transform: lowercase !important; } .sharpen:not(a) { color: red !important; font-weight: bold !important; - font-style: italic !important; + font-style: italic !important; } .sharpen-0:after { @@ -6880,7 +6880,7 @@ div.markdown { max-height: 100%; height: 100%; margin-top: 0 !important; - margin-bottom: 0 !important; + margin-bottom: 0 !important; } #desktop-expanded-image { @@ -7220,7 +7220,7 @@ body { width: 200px; max-height: 100vh !important; object-fit: contain; - object-position: left; + object-position: left; } .navbar-nav > .nav-item { diff --git a/files/assets/css/midnight.css b/files/assets/css/midnight.css index d3ed4b382..73d43856b 100644 --- a/files/assets/css/midnight.css +++ b/files/assets/css/midnight.css @@ -62,7 +62,7 @@ h5.post-title a:visited { } .modal-content { - border: 1px var(--gray-500) solid; + border: 1px var(--gray-500) solid; } [disabled], .disabled, button[disabled], .btn[disabled], button.disabled, .btn.disabled { diff --git a/files/assets/css/orgy.css b/files/assets/css/orgy.css index f2d0bd40b..8c40ea6fb 100644 --- a/files/assets/css/orgy.css +++ b/files/assets/css/orgy.css @@ -1,14 +1,14 @@ .orgy-top-container { - display: flex; - flex-flow: row nowrap; - justify-content: space-around; + display: flex; + flex-flow: row nowrap; + justify-content: space-around; } .orgy-chat-window-item { - flex-grow: 2; - width: fit-content; + flex-grow: 2; + width: fit-content; } .orgy-info-window-item { - max-width: 550px; - width: 550px; -} \ No newline at end of file + max-width: 550px; + width: 550px; +} diff --git a/files/assets/css/win98.css b/files/assets/css/win98.css index 21e1ecece..f181fbcf7 100644 --- a/files/assets/css/win98.css +++ b/files/assets/css/win98.css @@ -171,9 +171,9 @@ h5.post-title a:visited { } .spoiler, spoiler { - background-color: black !important; + background-color: black !important; } .sidebar--rules { - color: black; + color: black; } diff --git a/files/assets/events/fistmas/css/fistmas.css b/files/assets/events/fistmas/css/fistmas.css index cd8410a36..a0f2dda01 100644 --- a/files/assets/events/fistmas/css/fistmas.css +++ b/files/assets/events/fistmas/css/fistmas.css @@ -4,8 +4,8 @@ @font-face { font-family: "Burbank Small Medium"; src: url("/assets/events/fistmas/fonts/Burbank-Small-Medium.woff2") format("woff2"), - url("/assets/events/fistmas/fonts/Burbank-Small-Medium.woff") format("woff"), - url("/assets/events/fistmas/fonts/Burbank-Small-Medium.ttf") format("truetype"); + url("/assets/events/fistmas/fonts/Burbank-Small-Medium.woff") format("woff"), + url("/assets/events/fistmas/fonts/Burbank-Small-Medium.ttf") format("truetype"); } :root { @@ -136,15 +136,15 @@ color: #7a7a7a !important; } body { - cursor: url(/assets/events/fistmas/images/cursor.webp?x=6), auto !important; + cursor: url(/assets/events/fistmas/images/cursor.webp?x=6), auto !important; } textarea, input[type=textbox], input[type=search] { - cursor: url(/assets/events/fistmas/images/text.webp?x=6) 9 14, auto !important; + cursor: url(/assets/events/fistmas/images/text.webp?x=6) 9 14, auto !important; } .btn, input[type=button], button, a { - cursor: url(/assets/events/fistmas/images/pointer.webp?x=6), auto !important; + cursor: url(/assets/events/fistmas/images/pointer.webp?x=6), auto !important; } .fa-moon-over-sun:before{content:"\f74a"} @@ -441,10 +441,10 @@ body { @keyframes spin { from { - transform: rotate(0deg); + transform: rotate(0deg); } to { - transform: rotate(360deg); + transform: rotate(360deg); } } @@ -453,20 +453,20 @@ body { /* Change mobile navbar icon colors to basketball */ #mobile-bottom-navigation-bar i { - color: var(--gray-200)!important; + color: var(--gray-200)!important; } #mobile-bottom-navigation-bar { - box-shadow: 0px 2px 5px #000000cc; - /* wtf??? */ - z-index:999 !important; + box-shadow: 0px 2px 5px #000000cc; + /* wtf??? */ + z-index:999 !important; } /* Revert the snowcaps on it, is bad */ #mobile-bottom-navigation-bar button:after { - background: unset; - /* Real work, lol */ - display: none; + background: unset; + /* Real work, lol */ + display: none; } diff --git a/files/assets/events/fistmas/css/themes/dark.css b/files/assets/events/fistmas/css/themes/dark.css index 9c215e842..3803794e6 100644 --- a/files/assets/events/fistmas/css/themes/dark.css +++ b/files/assets/events/fistmas/css/themes/dark.css @@ -1,5 +1,5 @@ :root { - --primary: #cc4145; + --primary: #cc4145; --secondary: #101819; --dark: #101819; --muted: #e6faff; diff --git a/files/assets/events/fistmas/css/themes/light.css b/files/assets/events/fistmas/css/themes/light.css index c5cd8d42f..f012763cf 100644 --- a/files/assets/events/fistmas/css/themes/light.css +++ b/files/assets/events/fistmas/css/themes/light.css @@ -13,8 +13,8 @@ blockquote { border-left: 10px solid #ff7e7e !important; } blockquote a { - color: #15de59; + color: #15de59; } .dropdown-item:hover, .dropdown-item:focus, .dropdown-item.active { - background-color: #becad5; + background-color: #becad5; } diff --git a/files/assets/js/comments+post_listing.js b/files/assets/js/comments+post_listing.js index 750bbc02d..26e948e9c 100644 --- a/files/assets/js/comments+post_listing.js +++ b/files/assets/js/comments+post_listing.js @@ -86,11 +86,11 @@ document.addEventListener("click", function(e) { pop_instance.hide() } - active = document.activeElement; + active = document.activeElement; if (active.getAttribute("data-bs-toggle") == "popover") { const author = JSON.parse(active.dataset.popInfo); - + if (popover.getElementsByClassName('pop-badges')) { const badgesDOM = popover.getElementsByClassName('pop-badges')[0]; badgesDOM.innerHTML = ""; @@ -103,7 +103,7 @@ document.addEventListener("click", function(e) { badgesDOM.append(badgeDOM); } } - + popover.getElementsByClassName('pop-banner')[0].src = author["bannerurl"] popover.getElementsByClassName('pop-picture')[0].src = author["profile_url"] if (author["hat"]) { diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 72b79d4fc..074aef595 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -183,7 +183,7 @@ function fetchEmojis() { if(emoji.author_prelock_username !== undefined && emoji.author_prelock_username !== null) emojisSearchDictionary.updateTag(`@${emoji.author_prelock_username.toLowerCase()}`, emoji.name); - + if(emoji.tags instanceof Array) for(let i = 0; i < emoji.tags.length; i++) emojisSearchDictionary.updateTag(emoji.tags[i], emoji.name); diff --git a/files/assets/js/markdown.js b/files/assets/js/markdown.js index 4b44bcfdd..9ddabea3d 100644 --- a/files/assets/js/markdown.js +++ b/files/assets/js/markdown.js @@ -64,7 +64,7 @@ function replace_image(match, prefix, url) { return match } - + function markdown(t) { let input = t.value; diff --git a/files/assets/js/pwa_pulltorefresh.js b/files/assets/js/pwa_pulltorefresh.js index 5dac57e5a..15b5fc979 100644 --- a/files/assets/js/pwa_pulltorefresh.js +++ b/files/assets/js/pwa_pulltorefresh.js @@ -4,13 +4,13 @@ if (standalone) { const defaultImg = "/e/marseythinkorino.webp"; const thresholdImg = "/e/marseythumbsup.webp"; const threshold = -100; - + window.addEventListener("touchend", () => { if (window.scrollY < threshold) { window.location.reload(); } }); - + window.addEventListener("scroll", () => { img.setAttribute("src", window.scrollY < threshold ? thresholdImg : defaultImg); }); diff --git a/files/assets/js/vendor/critters.js b/files/assets/js/vendor/critters.js index 68e80cb52..b91ccaea1 100644 --- a/files/assets/js/vendor/critters.js +++ b/files/assets/js/vendor/critters.js @@ -718,7 +718,7 @@ var Bug = { if (!this.bug) { this.makeBug(); } - + if(!this.bug) return; this.stop(); @@ -769,7 +769,7 @@ var Bug = { if (!this.bug) { this.makeBug(); } - + if(!this.bug) return; this.stop(); @@ -863,7 +863,7 @@ var Bug = { rotationRate = this.random(0, 20, true), startTime = Date.now(), that = this; - + this.bug.classList.add('bug-dead'); this.dropTimer = requestAnimFrame(function(t) { diff --git a/files/classes/orgy.py b/files/classes/orgy.py index 83fa8d0b5..278f14a98 100644 --- a/files/classes/orgy.py +++ b/files/classes/orgy.py @@ -17,33 +17,33 @@ from files.helpers.regex import * from files.helpers.sorting_and_time import * class Orgy(Base): - __tablename__ = "orgies" + __tablename__ = "orgies" - youtube_id = Column(String, primary_key=True) - title = Column(String) + youtube_id = Column(String, primary_key=True) + title = Column(String) - def __init__(self, **kwargs): - super().__init__(**kwargs) - - - def __repr__(self): - return f"<{self.__class__.__name__}(id={self.youtube_id}, title={self.title})>" + def __init__(self, **kwargs): + super().__init__(**kwargs) + + + def __repr__(self): + return f"<{self.__class__.__name__}(id={self.youtube_id}, title={self.title})>" def get_orgy(): - orgy = g.db.query(Orgy).one_or_none() - return orgy - + orgy = g.db.query(Orgy).one_or_none() + return orgy + def create_orgy(youtube_id, title): - assert not get_orgy() - assert re.match(yt_id_regex, youtube_id) - orgy = Orgy(title=title, youtube_id=youtube_id) - g.db.add(orgy) - g.db.flush() - g.db.commit() + assert not get_orgy() + assert re.match(yt_id_regex, youtube_id) + orgy = Orgy(title=title, youtube_id=youtube_id) + g.db.add(orgy) + g.db.flush() + g.db.commit() def end_orgy(): - assert get_orgy() - g.db.query(Orgy).delete() - g.db.flush() - g.db.commit() \ No newline at end of file + assert get_orgy() + g.db.query(Orgy).delete() + g.db.flush() + g.db.commit() diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 9b4b915b7..451468d04 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -110,9 +110,9 @@ GIRL_PHRASES = [ "its almost as if $", "omg! $", "im literally screaming, $", - "$ and thats the tea, sis", - "$ but go off i guess", - "$ but go off", + "$ and thats the tea, sis", + "$ but go off i guess", + "$ but go off", "$ but its whatever", "$ and its EVERYTHING", "$ *sips tea*", @@ -518,7 +518,7 @@ PERMS = { # Minimum admin_level to perform action. 'LOTTERY_VIEW_PARTICIPANTS': 2, 'POST_COMMENT_INFINITE_PINGS': 2, 'IGNORE_1WEEk_EDITING_LIMIT': 2, - 'ORGIES': 2, + 'ORGIES': 2, 'ADMIN_REMOVE': 3, 'ADMIN_ACTIONS_REVERT': 3, diff --git a/files/helpers/cron.py b/files/helpers/cron.py index c69f763e0..fe276d3dc 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -211,7 +211,7 @@ def _award_timers_task(): _process_timer(User.queen, [285], "The queen award you received has expired!", { User.username: ("prelock_username"), User.prelock_username: None, - }) + }) _process_timer(User.spider, [179], "The spider award you received has expired!") _process_timer(User.namechanged, [281], "The namelock award you received has expired. You're now back to your old username!", { User.username: ("prelock_username"), diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 63d5d8672..d617bdb1b 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -713,12 +713,12 @@ def torture_queen(string, key): string = xmax_regex.sub(r"normalize good \g<2>s", string) string = xmaxing_regex.sub(r"normalizing good \g<2>s", string) string = xmaxed_regex.sub(r"normalized good \g<2>s", string) - + string = normal_punctuation_regex.sub("", string) string = more_than_one_comma_regex.sub(",", string) if string[-5:] == ', and': string = string[:-5] - + random.seed(key) if random.random() < PHRASE_CHANCE: girl_phrase = random.choice(GIRL_PHRASES) diff --git a/files/helpers/sharpen.py b/files/helpers/sharpen.py index 42789b016..6f52dfeb8 100644 --- a/files/helpers/sharpen.py +++ b/files/helpers/sharpen.py @@ -2,7 +2,7 @@ import re from files.helpers.regex import * def sharpen(string): - string = the_fucking_regex.sub("\g<1> fucking", string) - string = bitch_question_mark_regex.sub(", bitch?", string) - string = exclamation_point_regex.sub(", motherfucker!", string) - return string + string = the_fucking_regex.sub("\g<1> fucking", string) + string = bitch_question_mark_regex.sub(", bitch?", string) + string = exclamation_point_regex.sub(", motherfucker!", string) + return string diff --git a/files/routes/admin.py b/files/routes/admin.py index a3537a2b5..64cea9ffa 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -285,7 +285,7 @@ def shadowbanned(v): users = g.db.query(User).filter( User.shadowbanned != None, ).order_by(User.truescore.desc()).all() - + collected_users = [] collected_alts = set() @@ -1911,23 +1911,23 @@ def admin_reset_password(user_id, v): @app.get("/admin/orgy") @admin_level_required(PERMS['ORGIES']) def orgy_control(v): - return render_template("admin/orgy_control.html", v=v, orgy=get_orgy()) + return render_template("admin/orgy_control.html", v=v, orgy=get_orgy()) @app.post("/admin/start_orgy") @admin_level_required(PERMS['ORGIES']) def start_orgy(v): - youtube_id = request.values.get("youtube_id") - title = request.values.get("title") + youtube_id = request.values.get("youtube_id") + title = request.values.get("title") - assert youtube_id - assert title + assert youtube_id + assert title - create_orgy(youtube_id, title) + create_orgy(youtube_id, title) - return redirect("/chat") + return redirect("/chat") @app.post("/admin/stop_orgy") @admin_level_required(PERMS['ORGIES']) def stop_orgy(v): - end_orgy() - return redirect("/chat") \ No newline at end of file + end_orgy() + return redirect("/chat") diff --git a/files/routes/awards.py b/files/routes/awards.py index f37d6221d..ac809d5df 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -318,7 +318,7 @@ def award_thing(v, thing_type, id): elif kind == "queen": if author.chud: abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!") - + if not author.queen: characters = list(filter(str.isalpha, author.username)) if characters: @@ -347,7 +347,7 @@ def award_thing(v, thing_type, id): else: author.queen = int(time.time()) + 86400 badge_grant(user=author, badge_id=285) - + elif kind == "chud": if thing_type == 'post' and thing.sub == 'chudrama' \ or thing_type == 'comment' and thing.post and thing.post.sub == 'chudrama': @@ -552,17 +552,17 @@ def award_thing(v, thing_type, id): return {"message": f"{AWARDS[kind]['title']} award given to {thing_type} successfully!"} def shift_number_down(input, mod): - if input <= 0: - return 0, 0 - number = (input%mod) - input -= number - input /= mod - return int(number), int(input) + if input <= 0: + return 0, 0 + number = (input%mod) + input -= number + input /= mod + return int(number), int(input) def get_number_tuple(input, mods): - results = [] - for mod in mods: - result, input = shift_number_down(input, mod) - results.append(result) - results.append(input) - return results + results = [] + for mod in mods: + result, input = shift_number_down(input, mod) + results.append(result) + results.append(input) + return results diff --git a/files/routes/static.py b/files/routes/static.py index ac9705755..70ccc20fb 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -310,7 +310,7 @@ def badge_list(site, can_view_patron_badges): if not can_view_patron_badges: badges = badges.filter(BadgeDef.id.notin_(patron_badges)) - + badges = badges.order_by(BadgeDef.id).all() counts_raw = g.db.query(Badge.badge_id, func.count()).group_by(Badge.badge_id).all() diff --git a/files/routes/users.py b/files/routes/users.py index 5da42b2be..ba8a7d153 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1386,16 +1386,16 @@ def claim_rewards(v): if v.lifetime_donated >= 100: badge_grant(badge_id=257, user=v) - + if v.lifetime_donated >= 500: badge_grant(badge_id=258, user=v) - + if v.lifetime_donated >= 2500: badge_grant(badge_id=259, user=v) - + if v.lifetime_donated >= 5000: badge_grant(badge_id=260, user=v) - + if v.lifetime_donated >= 10000: badge_grant(badge_id=261, user=v) diff --git a/files/templates/chat.html b/files/templates/chat.html index 6080990df..a8dd9e8b5 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -11,7 +11,7 @@
- + {{ macros.chat_users_online() }}
diff --git a/files/templates/orgy.html b/files/templates/orgy.html index f71a3d302..2047f8dc7 100644 --- a/files/templates/orgy.html +++ b/files/templates/orgy.html @@ -9,7 +9,7 @@ {% include "util/macros.html" %} {% set vlink = '' %}
- +

{{orgy.title}}

@@ -18,20 +18,20 @@
{{macros.chat_users_list()}}
- +
{{macros.chat_group_template()}}
- +
{{macros.chat_line_template()}}
{{macros.chat_users_online()}} {{macros.chat_window(vlink)}}
- +
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html index 8dea1b593..2e91ae1a7 100644 --- a/files/templates/userpage/admintools.html +++ b/files/templates/userpage/admintools.html @@ -11,7 +11,7 @@ {% if u.is_suspended %}
BANNED USER: {{u.ban_reason | safe}} - + {% if not u.ban_reason.startswith('1-Day ban award used by') %} (by {{u.banned_by | safe}}) {% endif %}