diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index 8d4246d97..70a9e9794 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -18,10 +18,6 @@ class ModAction(Base): user = relationship("User", lazy="joined", primaryjoin="User.id==ModAction.user_id") - target_user = relationship("User", lazy="joined", primaryjoin="User.id==ModAction.target_user_id") - target_post = relationship("Submission", lazy="joined") - target_comment = relationship("Comment", lazy="joined") - def __init__(self, *args, **kwargs): if "created_utc" not in kwargs: @@ -73,13 +69,10 @@ class ModAction(Base): def note(self): if self.kind=="ban_user": - if self.target_post: - return f'for post' - elif self.target_comment: - return f'for comment' + if self.target_submission_id: return f'for post' + elif self.target_comment_id: return f'for comment' else: return self._note - else: - return self._note or "" + else: return self._note or "" @note.setter def note(self, x): @@ -90,17 +83,15 @@ class ModAction(Base): def string(self): output = ACTIONTYPES[self.kind]["str"].format(self=self) - if self.note: output += f" ({self.note})" - return output @property @lazy def target_link(self): - if self.target_user: return f'{self.target_user.username}' - elif self.target_post: return f'{self.target_post.title.replace("<","").replace(">","")}' - elif self.target_comment: return f'comment' + if self.target_user_id: return f'{self.target_user.username}' + elif self.target_submission_id: return f'{self.target_post.title.replace("<","").replace(">","")}' + elif self.target_comment_id: return f'comment' else: return "" @property