diff --git a/__init__.py b/__init__.py index 4730133..067dec6 100644 --- a/__init__.py +++ b/__init__.py @@ -15,7 +15,7 @@ directory_name = PLUGIN_PATH.split(os.sep)[-1] # Get the directory name of this bp = Blueprint(directory_name, __name__, template_folder="templates") -def add_cheater(challenge_id: int, cheater_id: int, helper_id: int, flag: str): +def report_cheater(challenge_id: int, cheater_id: int, helper_id: int, flag_id: int): cheater = CheaterTeams(challenge_id, cheater_id, helper_id, flag) db.session.add(cheater) db.session.commit() diff --git a/models.py b/models.py index 6a1eb4a..4b60bdc 100644 --- a/models.py +++ b/models.py @@ -8,8 +8,8 @@ class CheaterTeams(db.Model): ) cheater_id = db.Column(db.Integer, db.ForeignKey("users.id", ondelete="CASCADE")) helper_id = db.Column(db.Integer, db.ForeignKey("users.id", ondelete="CASCADE")) + flag_id = db.Column(db.Integer, db.ForeignKey("flags.id", ondelete="CASCADE")) - flag = db.Column(db.String(128), nullable=False) date = db.Column(db.DateTime, default=db.func.current_timestamp()) # Relationships @@ -19,6 +19,7 @@ class CheaterTeams(db.Model): helper = db.relationship( "Users", foreign_keys="CheaterTeams.helper_id", lazy="select" ) + flag = db.relationship("Flags", foreign_keys="CheaterTeams.flag_id", lazy="select") challenge = db.relationship( "Challenges", @@ -26,17 +27,19 @@ class CheaterTeams(db.Model): lazy="select", ) - def __init__(self, challenge_id: int, cheater_id: int, helper_id: int, flag: str): + def __init__( + self, challenge_id: int, cheater_id: int, helper_id: int, flag_id: str + ): self.challenge_id = challenge_id self.cheater_id = cheater_id self.helper_id = helper_id - self.flag = flag + self.flag_id = flag_id def __repr__(self): return "".format( self.cheater_id, self.challenge_id, - self.flag, + self.flag.content, self.helper_id, self.date, ) diff --git a/pyrightconfig.json b/pyrightconfig.json index e92f2f1..76f14d6 100644 --- a/pyrightconfig.json +++ b/pyrightconfig.json @@ -1,5 +1,7 @@ { "include": ["."], "extraPaths": ["/home/matteo/Gitted/CTFd"], - "reportMissingImports": true + "reportMissingImports": true, + "reportUnknownVariableType": false, + "reportUnknownMemberType": false }