diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index f786404b2..43f5c24fe 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -9,7 +9,7 @@ from files.helpers.const import * class ModAction(Base): __tablename__ = "modactions" - id = Column(BigInteger, primary_key=True) + id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id")) kind = Column(String) diff --git a/files/classes/submission.py b/files/classes/submission.py index 55d3be57c..6dc1c714d 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -18,10 +18,10 @@ from .votes import CommentVote class Submission(Base): __tablename__ = "submissions" - id = Column(BigInteger, primary_key=True) - author_id = Column(BigInteger, ForeignKey("users.id")) - edited_utc = Column(BigInteger, default=0) - created_utc = Column(BigInteger, default=0) + id = Column(Integer, primary_key=True) + author_id = Column(Integer, ForeignKey("users.id")) + edited_utc = Column(Integer, default=0) + created_utc = Column(Integer, default=0) thumburl = Column(String) is_banned = Column(Boolean, default=False) bannedfor = Column(Boolean) diff --git a/files/classes/subscriptions.py b/files/classes/subscriptions.py index 66c7d9864..5eaa50b3c 100644 --- a/files/classes/subscriptions.py +++ b/files/classes/subscriptions.py @@ -5,9 +5,9 @@ from files.__main__ import Base class Subscription(Base): __tablename__ = "subscriptions" - id = Column(BigInteger, primary_key=True) - user_id = Column(BigInteger, ForeignKey("users.id")) - submission_id = Column(BigInteger, default=0) + id = Column(Integer, primary_key=True) + user_id = Column(Integer, ForeignKey("users.id")) + submission_id = Column(Integer, default=0) user = relationship("User", uselist=False, viewonly=True) @@ -20,9 +20,9 @@ class Subscription(Base): class Follow(Base): __tablename__ = "follows" - id = Column(BigInteger, primary_key=True) - user_id = Column(BigInteger, ForeignKey("users.id")) - target_id = Column(BigInteger, ForeignKey("users.id")) + id = Column(Integer, primary_key=True) + user_id = Column(Integer, ForeignKey("users.id")) + target_id = Column(Integer, ForeignKey("users.id")) user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", viewonly=True) target = relationship("User", primaryjoin="User.id==Follow.target_id", viewonly=True) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index ae88a4dc0..f0c6f2f84 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -105,6 +105,7 @@ allowed_styles = ['color', 'background-color', 'font-weight', 'text-align'] def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False): if sanitized.count(':') > 100: abort(418) + if sanitized.count('@') > 50: abort(418) sanitized = markdown(sanitized) diff --git a/files/routes/errors.py b/files/routes/errors.py index 16d89c677..e38b7f264 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -43,7 +43,7 @@ def error_413(e): @app.errorhandler(418) def error_418(e): - return {"error": "Too many emojis!"}, 418 + return {"error": "Too many emojis or pings!"}, 418 @app.errorhandler(429) def error_429(e):