From f139b0718985da50f03b622ac929b29ce968029a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 7 Oct 2021 00:38:15 +0200 Subject: [PATCH] fgdg --- files/classes/award.py | 2 +- files/classes/badges.py | 12 +++---- files/classes/clients.py | 10 +++--- files/classes/comment.py | 8 ++--- files/classes/domains.py | 4 +-- files/classes/flags.py | 4 +-- files/classes/images.py | 12 +++---- files/classes/mod_logs.py | 4 +-- files/classes/submission.py | 20 ++++++------ files/classes/user.py | 62 ++++++++++++++++++------------------- 10 files changed, 69 insertions(+), 69 deletions(-) diff --git a/files/classes/award.py b/files/classes/award.py index 3025fa7c6..748858517 100644 --- a/files/classes/award.py +++ b/files/classes/award.py @@ -63,7 +63,7 @@ class AwardRelationship(Base): user_id = Column(Integer, ForeignKey("users.id")) submission_id = Column(Integer, ForeignKey("submissions.id")) comment_id = Column(Integer, ForeignKey("comments.id")) - kind = Column(String(20)) + kind = Column(String) user = relationship("User", primaryjoin="AwardRelationship.user_id==User.id", viewonly=True) diff --git a/files/classes/badges.py b/files/classes/badges.py index 554abfa4d..008948bc8 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -11,11 +11,11 @@ class BadgeDef(Base): __tablename__ = "badge_defs" id = Column(BigInteger, primary_key=True) - name = Column(String(64)) - description = Column(String(64)) - icon = Column(String(64)) + name = Column(String) + description = Column(String) + icon = Column(String) kind = Column(Integer, default=1) - qualification_expr = Column(String(128)) + qualification_expr = Column(String) def __repr__(self): @@ -46,8 +46,8 @@ class Badge(Base): user_id = Column(Integer, ForeignKey('users.id')) badge_id = Column(Integer, ForeignKey("badge_defs.id")) - description = Column(String(64)) - url = Column(String(256)) + description = Column(String) + url = Column(String) badge = relationship("BadgeDef", viewonly=True) def __repr__(self): diff --git a/files/classes/clients.py b/files/classes/clients.py index fb736aa95..f2c60a991 100644 --- a/files/classes/clients.py +++ b/files/classes/clients.py @@ -12,10 +12,10 @@ class OauthApp(Base): __tablename__ = "oauth_apps" id = Column(Integer, primary_key=True) - client_id = Column(String(64)) - app_name = Column(String(50)) - redirect_uri = Column(String(4096)) - description = Column(String(256)) + client_id = Column(String) + app_name = Column(String) + redirect_uri = Column(String) + description = Column(String) author_id = Column(Integer, ForeignKey("users.id")) author = relationship("User", viewonly=True) @@ -66,7 +66,7 @@ class ClientAuth(Base): id = Column(Integer, primary_key=True) oauth_client = Column(Integer, ForeignKey("oauth_apps.id")) - access_token = Column(String(128)) + access_token = Column(String) user_id = Column(Integer, ForeignKey("users.id")) user = relationship("User", viewonly=True) application = relationship("OauthApp", viewonly=True) diff --git a/files/classes/comment.py b/files/classes/comment.py index f27499af9..ba167086c 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -33,16 +33,16 @@ class Comment(Base): parent_comment_id = Column(Integer, ForeignKey("comments.id")) over_18 = Column(Boolean, default=False) is_bot = Column(Boolean, default=False) - is_pinned = Column(String(25)) + is_pinned = Column(String) sentto=Column(Integer, ForeignKey("users.id")) notifiedto=Column(Integer) app_id = Column(Integer, ForeignKey("oauth_apps.id")) oauth_app = relationship("OauthApp", viewonly=True) upvotes = Column(Integer, default=0) downvotes = Column(Integer, default=0) - body = deferred(Column(String(10000))) - body_html = deferred(Column(String(20000))) - ban_reason = Column(String(256)) + body = deferred(Column(String)) + body_html = deferred(Column(String)) + ban_reason = Column(String) post = relationship("Submission", viewonly=True) flags = relationship("CommentFlag", lazy="dynamic", viewonly=True) diff --git a/files/classes/domains.py b/files/classes/domains.py index 16d0b4966..8d3e29224 100644 --- a/files/classes/domains.py +++ b/files/classes/domains.py @@ -5,5 +5,5 @@ class BannedDomain(Base): __tablename__ = "banneddomains" id = Column(Integer, primary_key=True) - domain = Column(String(50)) - reason = Column(String(100)) \ No newline at end of file + domain = Column(String) + reason = Column(String) \ No newline at end of file diff --git a/files/classes/flags.py b/files/classes/flags.py index f35d6c486..57c961778 100644 --- a/files/classes/flags.py +++ b/files/classes/flags.py @@ -11,7 +11,7 @@ class Flag(Base): id = Column(Integer, primary_key=True) post_id = Column(Integer, ForeignKey("submissions.id")) user_id = Column(Integer, ForeignKey("users.id")) - reason = Column(String(100)) + reason = Column(String) user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False, viewonly=True) @@ -37,7 +37,7 @@ class CommentFlag(Base): id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id")) comment_id = Column(Integer, ForeignKey("comments.id")) - reason = Column(String(100)) + reason = Column(String) user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False, viewonly=True) diff --git a/files/classes/images.py b/files/classes/images.py index b0de6cb76..d9fd3beaa 100644 --- a/files/classes/images.py +++ b/files/classes/images.py @@ -4,17 +4,17 @@ from files.__main__ import Base class Image(Base): __tablename__ = "images" id = Column(BigInteger, primary_key=True) - state = Column(String(8)) + state = Column(String) number = Column(Integer) - text = Column(String(64)) - deletehash = Column(String(64)) + text = Column(String) + deletehash = Column(String) class BadPic(Base): __tablename__="badpics" id = Column(BigInteger, primary_key=True) - description=Column(String(200)) - phash=Column(String(64)) - ban_reason=Column(String(64)) + description=Column(String) + phash=Column(String) + ban_reason=Column(String) ban_time=Column(Integer) \ No newline at end of file diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index aae7b15a2..23ef45ced 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -9,11 +9,11 @@ class ModAction(Base): id = Column(BigInteger, primary_key=True) user_id = Column(Integer, ForeignKey("users.id")) - kind = Column(String(32)) + kind = Column(String) target_user_id = Column(Integer, ForeignKey("users.id"), default=0) target_submission_id = Column(Integer, ForeignKey("submissions.id"), default=0) target_comment_id = Column(Integer, ForeignKey("comments.id"), default=0) - _note=Column(String(256)) + _note=Column(String) created_utc = Column(Integer, default=0) user = relationship("User", primaryjoin="User.id==ModAction.user_id", viewonly=True) diff --git a/files/classes/submission.py b/files/classes/submission.py index 1b04ba0fd..5b1e82289 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -22,15 +22,15 @@ class Submission(Base): author_id = Column(BigInteger, ForeignKey("users.id")) edited_utc = Column(BigInteger, default=0) created_utc = Column(BigInteger, default=0) - thumburl = Column(String(50)) + thumburl = Column(String) is_banned = Column(Boolean, default=False) removed_by = Column(Integer) bannedfor = Column(Boolean) views = Column(Integer, default=0) deleted_utc = Column(Integer, default=0) distinguish_level = Column(Integer, default=0) - created_str = Column(String(25)) - stickied = Column(String(25)) + created_str = Column(String) + stickied = Column(String) is_pinned = Column(Boolean, default=False) private = Column(Boolean, default=False) club = Column(Boolean, default=False) @@ -41,13 +41,13 @@ class Submission(Base): upvotes = Column(Integer, default=1) downvotes = Column(Integer, default=0) app_id=Column(Integer, ForeignKey("oauth_apps.id")) - title = Column(String(500)) - title_html = Column(String(1000)) - url = Column(String(500)) - body = deferred(Column(String(10000))) - body_html = deferred(Column(String(20000))) - ban_reason = Column(String(128)) - embed_url = Column(String(256)) + title = Column(String) + title_html = Column(String) + url = Column(String) + body = deferred(Column(String)) + body_html = deferred(Column(String)) + ban_reason = Column(String) + embed_url = Column(String) comments = relationship("Comment", lazy="dynamic", primaryjoin="Comment.parent_submission==Submission.id", viewonly=True) flags = relationship("Flag", lazy="dynamic", viewonly=True) diff --git a/files/classes/user.py b/files/classes/user.py index 91d9525ea..35213bfe6 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -74,30 +74,30 @@ class User(Base): __tablename__ = "users" if "pcmemes.net" in site: - quadrant = Column(String(20)) + quadrant = Column(String) basedcount = Column(Integer, default=0) - pills = deferred(Column(String(300), default="")) + pills = deferred(Column(String, default="")) id = Column(Integer, primary_key=True) - username = Column(String(25)) - namecolor = Column(String(6), default=defaultcolor) - background = Column(String(20)) - customtitle = Column(String(300)) - customtitleplain = Column(String(100)) - titlecolor = Column(String(6), default=defaultcolor) - theme = Column(String(10), default=defaulttheme) - themecolor = Column(String(6), default=defaultcolor) + username = Column(String) + namecolor = Column(String, default=defaultcolor) + background = Column(String) + customtitle = Column(String) + customtitleplain = Column(String) + titlecolor = Column(String, default=defaultcolor) + theme = Column(String, default=defaulttheme) + themecolor = Column(String, default=defaultcolor) cardview = Column(Boolean, default=cardview) - song = Column(String(20)) - highres = Column(String(50)) - profileurl = Column(String(50)) - bannerurl = Column(String(50)) + song = Column(String) + highres = Column(String) + profileurl = Column(String) + bannerurl = Column(String) patron = Column(Integer, default=0) - verified = Column(String(20)) - email = Column(String(50)) - css = deferred(Column(String(4000))) - profilecss = deferred(Column(String(4000))) - passhash = deferred(Column(String(180))) + verified = Column(String) + email = Column(String) + css = deferred(Column(String)) + profilecss = deferred(Column(String)) + passhash = deferred(Column(String)) post_count = Column(Integer, default=0) comment_count = Column(Integer, default=0) received_award_count = Column(Integer, default=0) @@ -112,7 +112,7 @@ class User(Base): agendaposter_expires_utc = Column(Integer, default=0) changelogsub = Column(Boolean, default=False) is_activated = Column(Boolean, default=False) - shadowbanned = Column(String(25)) + shadowbanned = Column(String) over_18 = Column(Boolean, default=False) hidevotedon = Column(Boolean, default=False) highlightcomments = Column(Boolean, default=True) @@ -124,28 +124,28 @@ class User(Base): nitter = Column(Boolean) frontsize = Column(Integer, default=25) controversial = Column(Boolean, default=False) - bio = Column(String(1500)) - bio_html = Column(String(10000)) + bio = Column(String) + bio_html = Column(String) is_banned = Column(Integer, default=0) unban_utc = Column(Integer, default=0) - ban_reason = Column(String(120)) + ban_reason = Column(String) club_banned = Column(Boolean, default=False) club_allowed = Column(Boolean, default=False) login_nonce = Column(Integer, default=0) - reserved = Column(String(256)) + reserved = Column(String) coins = Column(Integer, default=0) truecoins = Column(Integer, default=0) - mfa_secret = deferred(Column(String(16))) + mfa_secret = deferred(Column(String)) is_private = Column(Boolean, default=False) stored_subscriber_count = Column(Integer, default=0) - defaultsortingcomments = Column(String(15), default="top") - defaultsorting = Column(String(15), default="hot") - defaulttime = Column(String(5), default=defaulttimefilter) + defaultsortingcomments = Column(String, default="top") + defaultsorting = Column(String, default="hot") + defaulttime = Column(String, default=defaulttimefilter) is_nofollow = Column(Boolean, default=False) - custom_filter_list = Column(String(1000)) - discord_id = Column(String(64)) + custom_filter_list = Column(String) + discord_id = Column(String) ban_evade = Column(Integer, default=0) - original_username = deferred(Column(String(25))) + original_username = deferred(Column(String)) referred_by = Column(Integer, ForeignKey("users.id")) submissions = relationship("Submission", lazy="dynamic", primaryjoin="Submission.author_id==User.id", viewonly=True)