From 4a54c6219ad8d8b8ecc4ee3a5ed4ac2f8f7fbc62 Mon Sep 17 00:00:00 2001 From: TLSM Date: Thu, 29 Sep 2022 01:43:29 -0400 Subject: [PATCH] Add trailing final newlines to source files. Touched a ton of files to finally standardize on having trailing final newlines, as best practice recommends and so our devs stop accidentally fighting each other over it. This was performed automatically with the following: git ls-files -z '*.py' | while IFS= read -rd '' f; \ do tail -c1 < "$f" | read -r _ || echo >> "$f"; done git ls-files -z '*.css' | while IFS= read -rd '' f; \ do tail -c1 < "$f" | read -r _ || echo >> "$f"; done --- files/__init__.py | 1 + files/__main__.py | 2 +- files/assets/css/4chan.css | 2 +- files/assets/css/awards.css | 2 +- files/assets/css/coffee.css | 2 +- files/assets/css/dark.css | 2 +- files/assets/css/dramblr.css | 2 +- files/assets/css/light.css | 2 +- files/assets/css/main.css | 2 +- files/assets/css/midnight.css | 2 +- files/assets/css/transparent.css | 2 +- files/assets/css/tron.css | 2 +- files/assets/css/win98.css | 2 +- files/classes/__init__.py | 2 +- files/classes/clients.py | 2 +- files/classes/comment.py | 2 +- files/classes/domains.py | 2 +- files/classes/exiles.py | 2 +- files/classes/flags.py | 2 +- files/classes/follows.py | 2 +- files/classes/hats.py | 2 +- files/classes/marsey.py | 2 +- files/classes/mod.py | 2 +- files/classes/mod_logs.py | 2 +- files/classes/notifications.py | 2 +- files/classes/polls.py | 2 +- files/classes/saves.py | 2 +- files/classes/streamers.py | 2 +- files/classes/sub.py | 2 +- files/classes/sub_block.py | 2 +- files/classes/sub_join.py | 2 +- files/classes/sub_subscription.py | 2 +- files/classes/submission.py | 2 +- files/classes/subscriptions.py | 2 +- files/classes/transactions.py | 2 +- files/classes/user.py | 2 +- files/classes/userblock.py | 2 +- files/classes/votes.py | 2 +- files/helpers/alerts.py | 2 +- files/helpers/const.py | 2 +- files/helpers/cron.py | 2 +- files/helpers/discord.py | 2 +- files/helpers/marsify.py | 2 +- files/helpers/media.py | 2 +- files/helpers/offsitementions.py | 2 +- files/helpers/sorting_and_time.py | 2 +- files/helpers/treasure.py | 2 +- files/routes/__init__.py | 2 +- files/routes/asset_submissions.py | 2 +- files/routes/discord.py | 2 +- files/routes/errors.py | 2 +- files/routes/front.py | 2 +- files/routes/hats.py | 2 +- files/routes/notifications.py | 2 +- files/routes/polls.py | 2 +- files/routes/reporting.py | 2 +- files/routes/users.py | 2 +- files/tests/test_e2e.py | 2 +- 58 files changed, 58 insertions(+), 57 deletions(-) diff --git a/files/__init__.py b/files/__init__.py index e69de29bb..8b1378917 100644 --- a/files/__init__.py +++ b/files/__init__.py @@ -0,0 +1 @@ + diff --git a/files/__main__.py b/files/__main__.py index f4d10455b..ba67a1748 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -137,4 +137,4 @@ elif "load_chat" in argv: else: from files.routes import * -stdout.flush() \ No newline at end of file +stdout.flush() diff --git a/files/assets/css/4chan.css b/files/assets/css/4chan.css index 2af1359c1..799b43bf5 100644 --- a/files/assets/css/4chan.css +++ b/files/assets/css/4chan.css @@ -154,4 +154,4 @@ blockquote a { h5.post-title a:visited { color: #949494 !important; -} \ No newline at end of file +} diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index e5ca47662..a98860993 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -87,4 +87,4 @@ 51% {transform: translate(105vw,-86vh) rotate(180deg);} 100% {transform: translate(-70vw,-86vh) rotate(180deg);} } -} \ No newline at end of file +} diff --git a/files/assets/css/coffee.css b/files/assets/css/coffee.css index 4047e4763..6c598cf8d 100644 --- a/files/assets/css/coffee.css +++ b/files/assets/css/coffee.css @@ -106,4 +106,4 @@ blockquote { h5.post-title a:visited { color: #949494 !important; -} \ No newline at end of file +} diff --git a/files/assets/css/dark.css b/files/assets/css/dark.css index b4262f3b5..b2d914acb 100644 --- a/files/assets/css/dark.css +++ b/files/assets/css/dark.css @@ -94,4 +94,4 @@ pre { h5.post-title a:visited { color: #7a7a7a !important; -} \ No newline at end of file +} diff --git a/files/assets/css/dramblr.css b/files/assets/css/dramblr.css index 08368afa1..7e5b0d86b 100644 --- a/files/assets/css/dramblr.css +++ b/files/assets/css/dramblr.css @@ -145,4 +145,4 @@ color: var(--gray-700); h5.post-title a:visited { color: #6e6e6e !important; -} \ No newline at end of file +} diff --git a/files/assets/css/light.css b/files/assets/css/light.css index 89c6f6035..a648e77c2 100644 --- a/files/assets/css/light.css +++ b/files/assets/css/light.css @@ -82,4 +82,4 @@ blockquote { h5.post-title a:visited { color: #7a7a7a !important; -} \ No newline at end of file +} diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 5d33d4ff7..fb9536a66 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6283,4 +6283,4 @@ div.markdown { .bug { pointer-events: none !important; -} \ No newline at end of file +} diff --git a/files/assets/css/midnight.css b/files/assets/css/midnight.css index ac64d2f8b..07e64ba44 100644 --- a/files/assets/css/midnight.css +++ b/files/assets/css/midnight.css @@ -63,4 +63,4 @@ body, .navbar-light, .navbar-dark, .card, .modal-content, .comment-write textare h5.post-title a:visited { color: #6e6e6e !important; -} \ No newline at end of file +} diff --git a/files/assets/css/transparent.css b/files/assets/css/transparent.css index 9ae05ecfa..e4e08db1e 100644 --- a/files/assets/css/transparent.css +++ b/files/assets/css/transparent.css @@ -78,4 +78,4 @@ pre { h5.post-title a:visited { color: #7a7a7a !important; -} \ No newline at end of file +} diff --git a/files/assets/css/tron.css b/files/assets/css/tron.css index 24e31a403..5021cc0a4 100644 --- a/files/assets/css/tron.css +++ b/files/assets/css/tron.css @@ -232,4 +232,4 @@ h5.post-title a:visited { color: #b0b0b0 !important; -} \ No newline at end of file +} diff --git a/files/assets/css/win98.css b/files/assets/css/win98.css index bf094ff41..2faf7424c 100644 --- a/files/assets/css/win98.css +++ b/files/assets/css/win98.css @@ -168,4 +168,4 @@ blockquote { h5.post-title a:visited { color: #5c5c5c !important; -} \ No newline at end of file +} diff --git a/files/classes/__init__.py b/files/classes/__init__.py index 23647e7ab..bcd3bfecc 100644 --- a/files/classes/__init__.py +++ b/files/classes/__init__.py @@ -25,4 +25,4 @@ from .casino_game import * from .hats import * from .marsey import * from .transactions import * -from .streamers import * \ No newline at end of file +from .streamers import * diff --git a/files/classes/clients.py b/files/classes/clients.py index 12d753d47..15d03313d 100644 --- a/files/classes/clients.py +++ b/files/classes/clients.py @@ -76,4 +76,4 @@ class ClientAuth(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/comment.py b/files/classes/comment.py index 792379ec2..e80e76171 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -447,4 +447,4 @@ class Comment(Base): body += f"Lost. The answer was: {wordle_answer}" body += '' - return body \ No newline at end of file + return body diff --git a/files/classes/domains.py b/files/classes/domains.py index fb24316fe..3dda10663 100644 --- a/files/classes/domains.py +++ b/files/classes/domains.py @@ -14,4 +14,4 @@ class BannedDomain(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/exiles.py b/files/classes/exiles.py index 9330840d0..575c7fee6 100644 --- a/files/classes/exiles.py +++ b/files/classes/exiles.py @@ -18,4 +18,4 @@ class Exile(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/flags.py b/files/classes/flags.py index 31c930a58..6dded4074 100644 --- a/files/classes/flags.py +++ b/files/classes/flags.py @@ -49,4 +49,4 @@ class CommentFlag(Base): @lazy def realreason(self, v): - return censor_slurs(self.reason, v) \ No newline at end of file + return censor_slurs(self.reason, v) diff --git a/files/classes/follows.py b/files/classes/follows.py index 05d4bc44e..790951ace 100644 --- a/files/classes/follows.py +++ b/files/classes/follows.py @@ -17,4 +17,4 @@ class Follow(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/hats.py b/files/classes/hats.py index 32824b7c3..5a1849971 100644 --- a/files/classes/hats.py +++ b/files/classes/hats.py @@ -61,4 +61,4 @@ class Hat(Base): @lazy def censored_description(self, v): - return self.hat_def.censored_description(v) \ No newline at end of file + return self.hat_def.censored_description(v) diff --git a/files/classes/marsey.py b/files/classes/marsey.py index 8a60a12a9..4ba4b8637 100644 --- a/files/classes/marsey.py +++ b/files/classes/marsey.py @@ -17,4 +17,4 @@ class Marsey(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/mod.py b/files/classes/mod.py index ff2c3b4ec..d2aeeb19b 100644 --- a/files/classes/mod.py +++ b/files/classes/mod.py @@ -16,4 +16,4 @@ class Mod(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index f17e860f5..34a20db20 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -448,4 +448,4 @@ ACTIONTYPES = { ACTIONTYPES2 = deepcopy(ACTIONTYPES) ACTIONTYPES2.pop("shadowban") -ACTIONTYPES2.pop("unshadowban") \ No newline at end of file +ACTIONTYPES2.pop("unshadowban") diff --git a/files/classes/notifications.py b/files/classes/notifications.py index 22b053767..7d1e7e5ba 100644 --- a/files/classes/notifications.py +++ b/files/classes/notifications.py @@ -20,4 +20,4 @@ class Notification(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/polls.py b/files/classes/polls.py index 1b90dba28..54d8a1164 100644 --- a/files/classes/polls.py +++ b/files/classes/polls.py @@ -101,4 +101,4 @@ class CommentOptionVote(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/saves.py b/files/classes/saves.py index 85a11afa2..8a13b0d50 100644 --- a/files/classes/saves.py +++ b/files/classes/saves.py @@ -36,4 +36,4 @@ class CommentSaveRelationship(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/streamers.py b/files/classes/streamers.py index 575481785..7ccaafe57 100644 --- a/files/classes/streamers.py +++ b/files/classes/streamers.py @@ -10,4 +10,4 @@ if SITE == 'pcmemes.net': id = Column(String, primary_key=True) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/sub.py b/files/classes/sub.py index 97f3a54ad..ea4a320a5 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -65,4 +65,4 @@ class Sub(Base): @property @lazy def follow_num(self): - return len(self.followers) \ No newline at end of file + return len(self.followers) diff --git a/files/classes/sub_block.py b/files/classes/sub_block.py index 6f8d38750..be81c8b2a 100644 --- a/files/classes/sub_block.py +++ b/files/classes/sub_block.py @@ -13,4 +13,4 @@ class SubBlock(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/sub_join.py b/files/classes/sub_join.py index b4ba7e23e..c876b1368 100644 --- a/files/classes/sub_join.py +++ b/files/classes/sub_join.py @@ -13,4 +13,4 @@ class SubJoin(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/sub_subscription.py b/files/classes/sub_subscription.py index 4f289f145..480d284a7 100644 --- a/files/classes/sub_subscription.py +++ b/files/classes/sub_subscription.py @@ -13,4 +13,4 @@ class SubSubscription(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/submission.py b/files/classes/submission.py index 0625a8991..36d529b9b 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -459,4 +459,4 @@ class Submission(Base): @lazy def active_flags(self, v): - return len(self.filtered_flags(v)) \ No newline at end of file + return len(self.filtered_flags(v)) diff --git a/files/classes/subscriptions.py b/files/classes/subscriptions.py index dc2b9c27d..fcc767f66 100644 --- a/files/classes/subscriptions.py +++ b/files/classes/subscriptions.py @@ -17,4 +17,4 @@ class Subscription(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/transactions.py b/files/classes/transactions.py index c5b509244..570354c05 100644 --- a/files/classes/transactions.py +++ b/files/classes/transactions.py @@ -15,4 +15,4 @@ if KOFI_TOKEN: claimed = Column(Boolean) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/user.py b/files/classes/user.py index 5cfb14d20..9167a7001 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -948,4 +948,4 @@ class User(Base): if v and (v.sigs_disabled or v.poor): return False - return True \ No newline at end of file + return True diff --git a/files/classes/userblock.py b/files/classes/userblock.py index 2dd5bd3e4..47fb2df95 100644 --- a/files/classes/userblock.py +++ b/files/classes/userblock.py @@ -18,4 +18,4 @@ class UserBlock(Base): super().__init__(*args, **kwargs) def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/files/classes/votes.py b/files/classes/votes.py index 1f72b4f8d..897776986 100644 --- a/files/classes/votes.py +++ b/files/classes/votes.py @@ -63,4 +63,4 @@ class CommentVote(Base): "vote_type":self.vote_type, "user":self.user.json, "comment":self.comment.json - } \ No newline at end of file + } diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index aeaffb8c0..ff777a7e2 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -129,4 +129,4 @@ if PUSHER_ID != 'blahblahblah': } }, ) - stdout.flush() \ No newline at end of file + stdout.flush() diff --git a/files/helpers/const.py b/files/helpers/const.py index a1c5ffca5..27551f04f 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -1098,4 +1098,4 @@ forced_hats = { "marsify": ("Marsified", "I can't pick my own Marseys, help!"), "is_suspended": ("Behind Bars", "This user is banned and needs to do better!"), "agendaposter": ("Egg_irl", "This user is getting in touch with xir identity!") -} \ No newline at end of file +} diff --git a/files/helpers/cron.py b/files/helpers/cron.py index 65a905ec7..e5b8a92ee 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -154,4 +154,4 @@ def give_monthly_marseybux_task_kofi(): ) g.db.add(ma) - return True \ No newline at end of file + return True diff --git a/files/helpers/discord.py b/files/helpers/discord.py index 9068f4884..dd72bb077 100644 --- a/files/helpers/discord.py +++ b/files/helpers/discord.py @@ -51,4 +51,4 @@ def send_changelog_message(message): def send_wpd_message(message): data={"content": message} - requests.post("https://discordapp.com/api/channels/1013990963846332456/messages", headers=headers, data=data, timeout=5) \ No newline at end of file + requests.post("https://discordapp.com/api/channels/1013990963846332456/messages", headers=headers, data=data, timeout=5) diff --git a/files/helpers/marsify.py b/files/helpers/marsify.py index 666260f57..09feceeb1 100644 --- a/files/helpers/marsify.py +++ b/files/helpers/marsify.py @@ -9,4 +9,4 @@ def marsify(text): if len(x) > 3 and x in marsey_mappings: marsey = choice(marsey_mappings[x]) new_text += f':{marsey}: ' - return new_text \ No newline at end of file + return new_text diff --git a/files/helpers/media.py b/files/helpers/media.py index d9c891b9b..7aec7de98 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -135,4 +135,4 @@ def process_image(filename=None, resize=0, trim=False): os.remove(filename) abort(417) - return filename \ No newline at end of file + return filename diff --git a/files/helpers/offsitementions.py b/files/helpers/offsitementions.py index 2aaebd88e..85f967981 100644 --- a/files/helpers/offsitementions.py +++ b/files/helpers/offsitementions.py @@ -89,4 +89,4 @@ def notify_mentions(send_to, mentions, mention_str='site mention'): for user_id in send_to: notif = Notification(comment_id=new_comment.id, user_id=user_id) - g.db.add(notif) \ No newline at end of file + g.db.add(notif) diff --git a/files/helpers/sorting_and_time.py b/files/helpers/sorting_and_time.py index 31ad9d363..25baa621d 100644 --- a/files/helpers/sorting_and_time.py +++ b/files/helpers/sorting_and_time.py @@ -47,4 +47,4 @@ def sort_posts(sort, posts): elif sort == "comments": return posts.order_by(Submission.comment_count.desc(), Submission.created_utc.desc()) else: - return posts.order_by(Submission.downvotes - Submission.upvotes, Submission.created_utc.desc()) \ No newline at end of file + return posts.order_by(Submission.downvotes - Submission.upvotes, Submission.created_utc.desc()) diff --git a/files/helpers/treasure.py b/files/helpers/treasure.py index 77ff66390..327aac90e 100644 --- a/files/helpers/treasure.py +++ b/files/helpers/treasure.py @@ -43,4 +43,4 @@ def check_for_treasure(in_text, from_comment): user.coins += amount - from_comment.treasure_amount = str(amount) \ No newline at end of file + from_comment.treasure_amount = str(amount) diff --git a/files/routes/__init__.py b/files/routes/__init__.py index 7a5242785..f9c046e1c 100644 --- a/files/routes/__init__.py +++ b/files/routes/__init__.py @@ -21,4 +21,4 @@ from .casino import * from .polls import * from .notifications import * from .hats import * -from .asset_submissions import * \ No newline at end of file +from .asset_submissions import * diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 9a3e3226b..3008c1d05 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -472,4 +472,4 @@ def update_hat(v): ) g.db.add(ma) - return render_template("update_assets.html", v=v, msg=f"'{name}' updated successfully!", type="Hat") \ No newline at end of file + return render_template("update_assets.html", v=v, msg=f"'{name}' updated successfully!", type="Hat") diff --git a/files/routes/discord.py b/files/routes/discord.py index 23373758d..befe4c569 100644 --- a/files/routes/discord.py +++ b/files/routes/discord.py @@ -127,4 +127,4 @@ def discord_redirect(v): requests.patch(url, headers=headers, json=data, timeout=5) - return redirect(f"https://discord.com/channels/{DISCORD_SERVER_ID}/{DISCORD_WELCOME_CHANNEL}") \ No newline at end of file + return redirect(f"https://discord.com/channels/{DISCORD_SERVER_ID}/{DISCORD_WELCOME_CHANNEL}") diff --git a/files/routes/errors.py b/files/routes/errors.py index 03fb8441b..6012b7673 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -93,4 +93,4 @@ def allow_nsfw(): session["over_18"] = int(time.time()) + 3600 redir = request.values.get("redir") if is_site_url(redir): return redirect(redir) - return redirect('/') \ No newline at end of file + return redirect('/') diff --git a/files/routes/front.py b/files/routes/front.py index d3d540c09..596e2bb14 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -259,4 +259,4 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all", gt=0, lt=0, comments = sort_comments(sort, comments) comments = comments.offset(25 * (page - 1)).limit(26).all() - return [x[0] for x in comments] \ No newline at end of file + return [x[0] for x in comments] diff --git a/files/routes/hats.py b/files/routes/hats.py index 88f623fb3..024bcc3db 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -135,4 +135,4 @@ def hat_owners(v, hat_id): users=users, next_exists=next_exists, page=page, - ) \ No newline at end of file + ) diff --git a/files/routes/notifications.py b/files/routes/notifications.py index a8e9ce533..2b333ab4a 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -310,4 +310,4 @@ def notifications(v): page=page, standalone=True, render_replies=True, - ) \ No newline at end of file + ) diff --git a/files/routes/polls.py b/files/routes/polls.py index 0f3d7acf3..af2245834 100644 --- a/files/routes/polls.py +++ b/files/routes/polls.py @@ -125,4 +125,4 @@ def option_votes_comment(option_id, v): return render_template("poll_votes.html", v=v, thing=option, - ups=ups) \ No newline at end of file + ups=ups) diff --git a/files/routes/reporting.py b/files/routes/reporting.py index c117c2bb7..47d170480 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -166,4 +166,4 @@ def remove_report_comment(v, cid, uid): g.db.add(ma) - return {"message": "Report removed successfully!"} \ No newline at end of file + return {"message": "Report removed successfully!"} diff --git a/files/routes/users.py b/files/routes/users.py index 7673cc121..60a7f53e8 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1500,4 +1500,4 @@ def settings_kofi(v): g.db.add(transaction) - return {"message": f"{patron} rewards claimed!"} \ No newline at end of file + return {"message": f"{patron} rewards claimed!"} diff --git a/files/tests/test_e2e.py b/files/tests/test_e2e.py index 9ba6b76f7..f3f049325 100644 --- a/files/tests/test_e2e.py +++ b/files/tests/test_e2e.py @@ -34,4 +34,4 @@ def test_signup(): assert signup_post_response.status_code == 302 assert "error" not in signup_post_response.location - # we should now be logged in and able to post \ No newline at end of file + # we should now be logged in and able to post