diff --git a/files/classes/comment.py b/files/classes/comment.py index 29300da3e..095138901 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -42,8 +42,8 @@ class Comment(Base): oauth_app = relationship("OauthApp", viewonly=True) upvotes = Column(Integer, default=1) downvotes = Column(Integer, default=0) - body = deferred(Column(String)) - body_html = deferred(Column(String)) + body = Column(String) + body_html = Column(String) ban_reason = Column(String) post = relationship("Submission", viewonly=True) diff --git a/files/classes/submission.py b/files/classes/submission.py index 8c8b534f0..d2ca539a2 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -48,8 +48,8 @@ class Submission(Base): title = Column(String) title_html = Column(String) url = Column(String) - body = deferred(Column(String)) - body_html = deferred(Column(String)) + body = Column(String) + body_html = Column(String) ban_reason = Column(String) embed_url = Column(String) diff --git a/files/classes/user.py b/files/classes/user.py index c94c2b08d..6cf6f953b 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -36,7 +36,7 @@ class User(Base): namecolor = Column(String, default=defaultcolor) background = Column(String) customtitle = Column(String) - customtitleplain = Column(String) + customtitleplain = deferred(Column(String)) titlecolor = Column(String, default=defaultcolor) theme = Column(String, default=defaulttheme) themecolor = Column(String, default=defaultcolor) @@ -49,7 +49,7 @@ class User(Base): verified = Column(String) verifiedcolor = Column(String) marseyawarded = Column(Integer) - email = Column(String) + email = deferred(Column(String)) css = deferred(Column(String)) profilecss = deferred(Column(String)) passhash = deferred(Column(String)) @@ -82,22 +82,22 @@ class User(Base): unmutable = Column(Boolean) frontsize = Column(Integer, default=25) controversial = Column(Boolean, default=False) - bio = Column(String) + bio = deferred(Column(String)) bio_html = Column(String) - sig = Column(String) + sig = deferred(Column(String)) sig_html = Column(String) sigs_disabled = Column(Boolean) - friends = Column(String) - friends_html = Column(String) - enemies = Column(String) - enemies_html = Column(String) + friends = deferred(Column(String)) + friends_html = deferred(Column(String)) + enemies = deferred(Column(String)) + enemies_html = deferred(Column(String)) is_banned = Column(Integer, default=0) unban_utc = Column(Integer, default=0) - ban_reason = Column(String) + ban_reason = deferred(Column(String)) club_banned = Column(Boolean, default=False) club_allowed = Column(Boolean, default=False) login_nonce = Column(Integer, default=0) - reserved = Column(String) + reserved = deferred(Column(String)) coins = Column(Integer, default=0) truecoins = Column(Integer, default=0) procoins = Column(Integer, default=0) @@ -115,7 +115,6 @@ class User(Base): referred_by = Column(Integer, ForeignKey("users.id")) badges = relationship("Badge", viewonly=True) - subscriptions = relationship("Subscription", viewonly=True) following = relationship("Follow", primaryjoin="Follow.user_id==User.id", viewonly=True) followers = relationship("Follow", primaryjoin="Follow.target_id==User.id", viewonly=True)