From 6e7bcb5694cb2a5057535cec29d8d3d8b3019452 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 14 Feb 2022 23:07:31 +0200 Subject: [PATCH] gfd --- files/classes/comment.py | 5 +---- files/classes/mod.py | 8 ++++++-- files/classes/submission.py | 1 + files/classes/user.py | 2 +- files/routes/login.py | 1 - files/routes/posts.py | 1 - files/routes/subs.py | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index fffc11b35..270114c4b 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -58,10 +58,7 @@ class Comment(Base): reports = relationship("CommentFlag", viewonly=True) def __init__(self, *args, **kwargs): - - if "created_utc" not in kwargs: - kwargs["created_utc"] = int(time.time()) - + if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time()) super().__init__(*args, **kwargs) def __repr__(self): diff --git a/files/classes/mod.py b/files/classes/mod.py index 3b1f2d7aa..290db4cb6 100644 --- a/files/classes/mod.py +++ b/files/classes/mod.py @@ -2,7 +2,7 @@ from sqlalchemy import * from sqlalchemy.orm import relationship from files.__main__ import Base from files.helpers.lazy import * -from time import strftime, gmtime +import time class Mod(Base): @@ -11,10 +11,14 @@ class Mod(Base): sub = Column(String, ForeignKey("subs.name"), primary_key=True) created_utc = Column(Integer) + def __init__(self, *args, **kwargs): + if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time()) + super().__init__(*args, **kwargs) + def __repr__(self): return f"" @property @lazy def created_datetime(self): - return str(strftime("%d/%B/%Y %H:%M:%S UTC", gmtime(self.created_utc))) \ No newline at end of file + return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.created_utc))) \ No newline at end of file diff --git a/files/classes/submission.py b/files/classes/submission.py index 69005aca3..ca9a2ca89 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -61,6 +61,7 @@ class Submission(Base): subr = relationship("Sub", primaryjoin="foreign(Submission.sub)==remote(Sub.name)", viewonly=True) def __init__(self, *args, **kwargs): + if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time()) super().__init__(*args, **kwargs) def __repr__(self): diff --git a/files/classes/user.py b/files/classes/user.py index e003b5d85..0b76833dd 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -146,7 +146,7 @@ class User(Base): kwargs["passhash"] = self.hash_password(kwargs["password"]) kwargs.pop("password") - kwargs["created_utc"] = int(time.time()) + if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time()) super().__init__(**kwargs) diff --git a/files/routes/login.py b/files/routes/login.py index df911b45a..699620447 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -331,7 +331,6 @@ def sign_up_post(v): admin_level = admin_level, password=request.values.get("password"), email=email, - created_utc=int(time.time()), referred_by=ref_id or None, ban_evade = int(any((x.is_banned or x.shadowbanned) and not x.unban_utc for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x)) ) diff --git a/files/routes/posts.py b/files/routes/posts.py index 38a0bd8ad..5160dbc7d 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1078,7 +1078,6 @@ def submit_post(v, sub=None): embed_url=embed, title=title[:500], title_html=title_html, - created_utc=int(time.time()), sub=sub ) diff --git a/files/routes/subs.py b/files/routes/subs.py index 3f8236e99..fa96c06ec 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -73,7 +73,7 @@ def add_mod(v, sub): existing = g.db.query(Mod).filter_by(user_id=user.id, sub=sub).one_or_none() if not existing: - mod = Mod(user_id=user.id, sub=sub, created_utc=int(time.time())) + mod = Mod(user_id=user.id, sub=sub) g.db.add(mod) send_repeatable_notification(user.id, f"You have been added as a mod to /s/{sub}") @@ -146,7 +146,7 @@ def create_sub2(v): sub = Sub(name=name) g.db.add(sub) g.db.flush() - mod = Mod(user_id=v.id, sub=sub.name, created_utc=int(time.time())) + mod = Mod(user_id=v.id, sub=sub.name) g.db.add(mod) g.db.commit()