carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

master
Aevann1 2022-09-19 20:13:37 +00:00
parent 794669c7db b6df126012
commit 0d7a34d966
29 changed files with 41 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
files/assets/images/rDrama/banners/48.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 448 KiB

6
files/classes/alts.py
View File

@ -8,11 +8,7 @@ class Alt(Base):
user1 = Column(Integer, ForeignKey("users.id"), primary_key=True)
user2 = Column(Integer, ForeignKey("users.id"), primary_key=True)
is_manual = Column(Boolean, default=False)
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):

6
files/classes/award.py
View File

@ -16,16 +16,12 @@ class AwardRelationship(Base):
kind = Column(String)
awarded_utc = Column(Integer)
granted = Column(Boolean)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", primaryjoin="AwardRelationship.user_id==User.id", back_populates="awards")
post = relationship("Submission", primaryjoin="AwardRelationship.submission_id==Submission.id", back_populates="awards")
comment = relationship("Comment", primaryjoin="AwardRelationship.comment_id==Comment.id", back_populates="awards")
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"<AwardRelationship(id={self.id})>"

13
files/classes/badges.py
View File

@ -11,11 +11,7 @@ class BadgeDef(Base):
id = Column(Integer, primary_key=True, autoincrement=True)
name = Column(String)
description = Column(String)
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<BadgeDef(id={self.id})>"
@ -34,16 +30,11 @@ class Badge(Base):
badge_id = Column(Integer, ForeignKey('badge_defs.id'), primary_key=True)
description = Column(String)
url = Column(String)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", back_populates="badges")
badge = relationship("BadgeDef", primaryjoin="Badge.badge_id == BadgeDef.id")
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"<Badge(user_id={self.user_id}, badge_id={self.badge_id})>"

7
files/classes/casino_game.py
View File

@ -8,7 +8,7 @@ class Casino_Game(Base):
id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"))
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
active = Column(Boolean, default=True)
currency = Column(String)
wager = Column(Integer)
@ -16,10 +16,5 @@ class Casino_Game(Base):
kind = Column(String)
game_state = Column(JSON)
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"<CasinoGame(id={self.id})>"

12
files/classes/clients.py
View File

@ -18,14 +18,10 @@ class OauthApp(Base):
redirect_uri = Column(String)
description = Column(String)
author_id = Column(Integer, ForeignKey("users.id"))
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
author = relationship("User", back_populates="apps")
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"<OauthApp(id={self.id})>"
@ -66,14 +62,10 @@ class ClientAuth(Base):
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
oauth_client = Column(Integer, ForeignKey("oauth_apps.id"), primary_key=True)
access_token = Column(String)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User")
application = relationship("OauthApp")
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"<ClientAuth(user_id={self.user_id}, oauth_client={self.oauth_client})>"

8
files/classes/comment.py
View File

@ -37,7 +37,7 @@ class Comment(Base):
id = Column(Integer, primary_key=True)
author_id = Column(Integer, ForeignKey("users.id"))
parent_submission = Column(Integer, ForeignKey("submissions.id"))
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
edited_utc = Column(Integer, default=0)
is_banned = Column(Boolean, default=False)
ghost = Column(Boolean, default=False)
@ -73,13 +73,7 @@ class Comment(Base):
flags = relationship("CommentFlag", order_by="CommentFlag.created_utc")
options = relationship("CommentOption", order_by="CommentOption.id")
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"<Comment(id={self.id})>"
@lazy

6
files/classes/domains.py
View File

@ -7,11 +7,7 @@ class BannedDomain(Base):
__tablename__ = "banneddomains"
domain = Column(String, primary_key=True)
reason = Column(String)
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<BannedDomain(domain={self.domain})>"

6
files/classes/exiles.py
View File

@ -9,13 +9,9 @@ class Exile(Base):
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
sub = Column(String, ForeignKey("subs.name"), primary_key=True)
exiler_id = Column(Integer, ForeignKey("users.id"))
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
exiler = relationship("User", primaryjoin="User.id==Exile.exiler_id")
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"<Exile(user_id={self.user_id}, sub={self.sub})>"

12
files/classes/flags.py
View File

@ -13,14 +13,10 @@ class Flag(Base):
post_id = Column(Integer, ForeignKey("submissions.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
reason = Column(String)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False)
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"<Flag(user_id={self.user_id}, post_id={self.post_id})>"
@ -36,14 +32,10 @@ class CommentFlag(Base):
comment_id = Column(Integer, ForeignKey("comments.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
reason = Column(String)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False)
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"<CommentFlag(user_id={self.user_id}, comment_id={self.comment_id})>"

6
files/classes/follows.py
View File

@ -7,14 +7,10 @@ class Follow(Base):
__tablename__ = "follows"
target_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", back_populates="following")
target = relationship("User", uselist=False, primaryjoin="User.id==Follow.target_id", back_populates="followers")
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"<Follow(id={self.id})>"

12
files/classes/hats.py
View File

@ -15,15 +15,11 @@ class HatDef(Base):
author_id = Column(Integer, ForeignKey('users.id'))
price = Column(Integer)
submitter_id = Column(Integer, ForeignKey("users.id"))
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
author = relationship("User", primaryjoin="HatDef.author_id == User.id", back_populates="designed_hats")
submitter = relationship("User", primaryjoin="HatDef.submitter_id == User.id")
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"<HatDef(id={self.id})>"
@ -42,15 +38,11 @@ class Hat(Base):
user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
hat_id = Column(Integer, ForeignKey('hat_defs.id'), primary_key=True)
equipped = Column(Boolean, default=False)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
hat_def = relationship("HatDef")
owners = relationship("User", back_populates="owned_hats")
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"<Hat(user_id={self.user_id}, hat_id={self.hat_id})>"

6
files/classes/lottery.py
View File

@ -13,11 +13,7 @@ class Lottery(Base):
prize = Column(Integer, default=0)
tickets_sold = Column(Integer, default=0)
winner_id = Column(Integer, ForeignKey("users.id"))
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<Lottery(id={self.id})>"

6
files/classes/marsey.py
View File

@ -10,11 +10,7 @@ class Marsey(Base):
tags = Column(String)
count = Column(Integer, default=0)
submitter_id = Column(Integer, ForeignKey("users.id"))
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<Marsey(name={self.name})>"

6
files/classes/mod.py
View File

@ -9,11 +9,7 @@ class Mod(Base):
__tablename__ = "mods"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<Mod(user_id={self.user_id}, sub={self.sub})>"

6
files/classes/mod_logs.py
View File

@ -16,16 +16,12 @@ class ModAction(Base):
target_submission_id = Column(Integer, ForeignKey("submissions.id"))
target_comment_id = Column(Integer, ForeignKey("comments.id"))
_note=Column(String)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", primaryjoin="User.id==ModAction.user_id")
target_user = relationship("User", primaryjoin="User.id==ModAction.target_user_id")
target_post = relationship("Submission")
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"<ModAction(id={self.id})>"

6
files/classes/notifications.py
View File

@ -10,14 +10,10 @@ class Notification(Base):
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
comment_id = Column(Integer, ForeignKey("comments.id"), primary_key=True)
read = Column(Boolean, default=False)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
comment = relationship("Comment")
user = relationship("User")
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"<Notification(id={self.id})>"

24
files/classes/polls.py
View File

@ -12,15 +12,11 @@ class SubmissionOption(Base):
submission_id = Column(Integer, ForeignKey("submissions.id"))
body_html = Column(Text)
exclusive = Column(Integer)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
votes = relationship("SubmissionOptionVote")
post = relationship("Submission", back_populates="options")
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"<SubmissionOption(id={self.id})>"
@ -41,15 +37,11 @@ class SubmissionOptionVote(Base):
option_id = Column(Integer, ForeignKey("submission_options.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
submission_id = Column(Integer, ForeignKey("submissions.id"))
user = relationship("User")
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"<SubmissionOptionVote(option_id={self.option_id}, user_id={self.user_id})>"
@ -62,15 +54,11 @@ class CommentOption(Base):
comment_id = Column(Integer, ForeignKey("comments.id"))
body_html = Column(Text)
exclusive = Column(Integer)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
votes = relationship("CommentOptionVote")
comment = relationship("Comment", back_populates="options")
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"<CommentOption(id={self.id})>"
@ -91,14 +79,10 @@ class CommentOptionVote(Base):
option_id = Column(Integer, ForeignKey("comment_options.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
comment_id = Column(Integer, ForeignKey("comments.id"))
user = relationship("User")
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"<CommentOptionVote(option_id={self.option_id}, user_id={self.user_id})>"

12
files/classes/saves.py
View File

@ -9,14 +9,10 @@ class SaveRelationship(Base):
user_id=Column(Integer, ForeignKey("users.id"), primary_key=True)
submission_id=Column(Integer, ForeignKey("submissions.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
post = relationship("Submission", uselist=False)
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"<SaveRelationship(user_id={self.user_id}, submission_id={self.submission_id})>"
@ -27,13 +23,9 @@ class CommentSaveRelationship(Base):
user_id=Column(Integer, ForeignKey("users.id"), primary_key=True)
comment_id=Column(Integer, ForeignKey("comments.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
comment = relationship("Comment", uselist=False)
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"<CommentSaveRelationship(user_id={self.user_id}, comment_id={self.comment_id})>"

6
files/classes/sub.py
View File

@ -22,15 +22,11 @@ class Sub(Base):
marseyurl = Column(String)
css = Column(String)
stealth = Column(Boolean)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
blocks = relationship("SubBlock", primaryjoin="SubBlock.sub==Sub.name")
followers = relationship("SubSubscription", primaryjoin="SubSubscription.sub==Sub.name")
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 self.name

6
files/classes/sub_block.py
View File

@ -6,11 +6,7 @@ class SubBlock(Base):
__tablename__ = "sub_blocks"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
sub = Column(String(20), 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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<SubBlock(user_id={self.user_id}, sub={self.sub})>"

6
files/classes/sub_join.py
View File

@ -6,11 +6,7 @@ class SubJoin(Base):
__tablename__ = "sub_joins"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
sub = Column(String(20), 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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<SubJoin(user_id={self.user_id}, sub={self.sub})>"

6
files/classes/sub_subscription.py
View File

@ -6,11 +6,7 @@ class SubSubscription(Base):
__tablename__ = "sub_subscriptions"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
sub = Column(String(20), 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)
created_utc = Column(Integer, default=int(time.time()))
def __repr__(self):
return f"<SubSubscription(user_id={self.user_id}, sub={self.sub})>"

6
files/classes/submission.py
View File

@ -24,7 +24,7 @@ class Submission(Base):
id = Column(Integer, primary_key=True)
author_id = Column(Integer, ForeignKey("users.id"))
edited_utc = Column(Integer, default=0)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
thumburl = Column(String)
is_banned = Column(Boolean, default=False)
bannedfor = Column(String)
@ -69,10 +69,6 @@ class Submission(Base):
bump_utc = deferred(Column(Integer, server_default=FetchedValue()))
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"<Submission(id={self.id})>"

6
files/classes/subscriptions.py
View File

@ -7,14 +7,10 @@ class Subscription(Base):
__tablename__ = "subscriptions"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
submission_id = Column(Integer, ForeignKey("submissions.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", uselist=False)
post = relationship("Submission", uselist=False)
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"<Subscription(id={self.id})>"

15
files/classes/user.py
View File

@ -69,7 +69,7 @@ class User(Base):
post_count = Column(Integer, default=0)
comment_count = Column(Integer, default=0)
received_award_count = Column(Integer, default=0)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
admin_level = Column(Integer, default=0)
last_active = Column(Integer, default=0, nullable=False)
coins_spent = Column(Integer, default=0)
@ -134,8 +134,8 @@ class User(Base):
currently_held_lottery_tickets = Column(Integer, default=0)
total_held_lottery_tickets = Column(Integer, default=0)
total_lottery_winnings = Column(Integer, default=0)
last_viewed_post_notifs = Column(Integer, default=0)
last_viewed_log_notifs = Column(Integer, default=0)
last_viewed_post_notifs = Column(Integer, default=int(time.time()))
last_viewed_log_notifs = Column(Integer, default=int(time.time()))
pronouns = Column(String, default='they/them')
bite = Column(Integer)
earlylife = Column(Integer)
@ -163,11 +163,6 @@ class User(Base):
kwargs["passhash"] = self.hash_password(kwargs["password"])
kwargs.pop("password")
if "created_utc" not in kwargs:
kwargs["created_utc"] = int(time.time())
kwargs["last_viewed_post_notifs"] = kwargs["created_utc"]
kwargs["last_viewed_log_notifs"] = kwargs["created_utc"]
super().__init__(**kwargs)
@ -640,7 +635,7 @@ class User(Base):
@property
@lazy
def modaction_notifications_count(self):
if not self.admin_level: return 0
if not self.admin_level or self.id == AEVANN_ID: return 0
return g.db.query(ModAction).filter(
ModAction.created_utc > self.last_viewed_log_notifs,
ModAction.user_id != self.id,
@ -754,8 +749,6 @@ class User(Base):
def profile_url(self):
if self.agendaposter:
return f"{SITE_FULL}/assets/images/pfps/agendaposter/{random.randint(1, 57)}.webp?v=1"
if self.bite:
return f"{SITE_FULL}/e/marseyvampire.webp"
if self.rainbow:
return f"{SITE_FULL}/e/marseysalutepride.webp"
if self.profileurl:

6
files/classes/userblock.py
View File

@ -8,14 +8,10 @@ class UserBlock(Base):
__tablename__ = "userblocks"
user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
target_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User", primaryjoin="User.id==UserBlock.user_id", back_populates="blocking")
target = relationship("User", primaryjoin="User.id==UserBlock.target_id", back_populates="blocked")
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"<UserBlock(user={self.user_id}, target={self.target_id})>"

9
files/classes/views.py
View File

@ -10,16 +10,11 @@ class ViewerRelationship(Base):
user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
viewer_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
last_view_utc = Column(Integer)
created_utc = Column(Integer)
last_view_utc = Column(Integer, default=int(time.time()))
created_utc = Column(Integer, default=int(time.time()))
viewer = relationship("User", primaryjoin="ViewerRelationship.viewer_id == User.id")
def __init__(self, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
if 'last_view_utc' not in kwargs: kwargs['last_view_utc'] = int(time.time())
super().__init__(**kwargs)
def __repr__(self):
return f"<ViewerRelationship(user_id={self.user_id}, viewer_id={self.viewer_id})>"

12
files/classes/votes.py
View File

@ -14,14 +14,10 @@ class Vote(Base):
vote_type = Column(Integer)
app_id = Column(Integer, ForeignKey("oauth_apps.id"))
real = Column(Boolean, default=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User")
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"<Vote(id={self.id})>"
@ -44,14 +40,10 @@ class CommentVote(Base):
vote_type = Column(Integer)
app_id = Column(Integer, ForeignKey("oauth_apps.id"))
real = Column(Boolean, default=True)
created_utc = Column(Integer)
created_utc = Column(Integer, default=int(time.time()))
user = relationship("User")
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"<CommentVote(id={self.id})>"