From 67bfe5a5bde5bf0ed9a7e310660e2f7bfa2526dd Mon Sep 17 00:00:00 2001 From: justcool393 Date: Tue, 29 Nov 2022 14:29:27 -0600 Subject: [PATCH] remove unnecessary `str()` --- files/classes/submission.py | 2 +- files/classes/user.py | 3 +-- files/helpers/actions.py | 2 +- files/helpers/stats.py | 2 +- files/routes/login.py | 2 +- files/routes/wrappers.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index a2ee2f5cc..3607ec559 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -85,7 +85,7 @@ class Submission(Base): @property @lazy def created_datetime(self): - return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.created_utc))) + return time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.created_utc)) @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index a20ef3dc5..905be9ec9 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -365,7 +365,6 @@ class User(Base): @property @lazy def created_date(self): - return time.strftime("%d %b %Y", time.gmtime(self.created_utc)) @property @@ -373,7 +372,7 @@ class User(Base): def last_active_date(self): if self.last_active == 0: return "never" - return str(time.strftime("%d %b %Y", time.gmtime(self.last_active))) + return time.strftime("%d %b %Y", time.gmtime(self.last_active)) @property @lazy diff --git a/files/helpers/actions.py b/files/helpers/actions.py index c1d8be65c..9453d9a65 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -366,7 +366,7 @@ def execute_blackjack_custom(v, target, body, type): v.is_muted = True g.db.add(v) with open(f"/under_siege.log", "a", encoding="utf-8") as f: - t = str(time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()))) + t = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time())) f.write(f"[{t}] {v.id} @{v.username} {type} {v.age}s\n") from files.helpers.discord import discord_message_send discord_message_send("1041917843094110239", diff --git a/files/helpers/stats.py b/files/helpers/stats.py index 7828a6bbb..d390558e2 100644 --- a/files/helpers/stats.py +++ b/files/helpers/stats.py @@ -100,7 +100,7 @@ def stats(site=None): active_users = set(posters) | set(commenters) | set(voters) | set(commentvoters) stats = { - "time": str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(now))), + "time": time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(now)), "marseys": "{:,}".format(g.db.query(Marsey).filter(Marsey.submitter_id==None).count()), "users": "{:,}".format(g.db.query(User).count()), "private users": "{:,}".format(g.db.query(User).filter_by(is_private=True).count()), diff --git a/files/routes/login.py b/files/routes/login.py index 514ef2fb8..48dedfcc8 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -116,7 +116,7 @@ def log_failed_admin_login_attempt(account:User, type:str): print(f"Admin user from {ip} failed to login to account @{account.user_name} (invalid {type})") try: with open("/admin_failed_logins", "a+", encoding="utf-8") as f: - t = str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(time.time()))) + t = time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(time.time())) f.write(f"{t}, {ip}, {account.username}, {type}\n") except: pass diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index 9a7bb0b95..c649116a1 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -95,7 +95,7 @@ def get_logged_in_user(): with open("/eg", "r+", encoding="utf-8") as f: ip = request.headers.get('CF-Connecting-IP') if f'@{v.username}, ' not in f.read(): - t = str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(time.time()))) + t = time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(time.time())) f.write(f'@{v.username}, {v.truescore}, {ip}, {t}\n') return v