linkify under siege modlogs

pull/222/head
Aevann 2024-02-11 18:45:00 +02:00
parent b00c72b0b6
commit 5b3af82751
2 changed files with 5 additions and 10 deletions

View File

@ -301,7 +301,9 @@ class Comment(Base):
def shortlink(self):
if self.wall_user_id:
return f"/@{self.wall_user.username}/wall/comment/{self.id}#context"
return f"{self.post.shortlink}/{self.id}#context"
if self.parent_post:
return f"{self.post.shortlink}/{self.id}#context"
return f"/notification/{self.id}"
@property
@lazy

View File

@ -548,6 +548,8 @@ def execute_under_siege(v, target, body, kind):
reason = f'report on <a href="{target.permalink}">post</a>'
else:
reason = f'report on <a href="{target.permalink}">comment</a>'
elif hasattr(target, 'permalink'):
reason = f'<a href="{target.permalink}">{kind}</a>'
else:
reason = kind
@ -564,15 +566,6 @@ def execute_under_siege(v, target, body, kind):
)
g.db.add(ma)
if kind == 'message':
notified_ids = [x[0] for x in g.db.query(User.id).filter(
User.admin_level >= PERMS['BLACKJACK_NOTIFICATIONS'],
User.id != AEVANN_ID,
)]
for uid in notified_ids:
n = Notification(comment_id=target.id, user_id=uid)
g.db.add(n)
def process_options(v, target):
patterns = [(poll_regex, 0), (choice_regex, 1)]