diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 54cb51e28..40796502a 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -96,8 +96,14 @@ def notif_comment(text): def notif_comment2(p): + if p.ghost: + author_link = '@👻' + else: + author_link = f'@{p.author_name}' - text = f"@{p.author_name} has mentioned you: [{p.title}](/post/{p.id})" + sanitized_title = filter_emojis_only(p.title) + + text = f'{author_link} has mentioned you: {sanitized_title}' search_html = f'% has mentioned you: /h/{p.hole}" - text_html = sanitize(text, blackjack="notification", post_mention_notif=True) - return create_comment(text_html), text + return create_comment(text), text def add_notif(cid, uid, text, pushnotif_url=''): diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index f64c77ac1..e636cc62a 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -359,7 +359,7 @@ def handle_youtube_links(url): return html @with_sigalrm_timeout(10) -def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis=False, snappy=False, chat=False, blackjack=None, post_mention_notif=False, commenters_ping_post_id=None, obj=None, author=None): +def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis=False, snappy=False, chat=False, blackjack=None, commenters_ping_post_id=None, obj=None, author=None): def error(error): if chat: return error, 403 @@ -602,7 +602,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis continue #don't allow something like this [https://rԁrama.net/leaderboard](https://iplogger.org/1fRKk7) - if not snappy and not post_mention_notif: + if not snappy: string_domain = tldextract.extract(str(link.string)).registered_domain if string_domain and string_domain != tldextract.extract(href).registered_domain: link.string = href