feat: include awarded comments in best comments script

notifications/management/commands/send_best_comments.py

@@ -5,6 +5,7 @@
 from django.core.management import BaseCommand
 from django.template.loader import render_to_string
 
+from badges.models import UserBadge
 from comments.models import Comment
 from notifications.telegram.common import send_telegram_message, Chat
 
@@ -26,7 +27,14 @@ def handle(self, *args, **options):
             upvotes__gte=MIN_UPVOTES,
         ).order_by("-upvotes")[:LIMIT]
 
-        for comment in best_comments:
+        new_badges = UserBadge.objects.filter(
+            created_at__gte=datetime.utcnow() - TIME_INTERVAL,
+            comment__isnull=False,
+        ).order_by("-created_at")[:LIMIT]
+
+        comments_with_badges = [b.comment for b in new_badges]
+
+        for comment in list(comments_with_badges) + list(best_comments):
             if not comment.metadata or not comment.metadata.get("in_best_comments"):
                 self.stdout.write(f"Comment {comment.id} +{comment.upvotes}")
                 comment.metadata = comment.metadata or {}

notifications/telegram/templates/messages/best_comments.html

@@ -1,4 +1,6 @@
-{% load text_filters %}{% load posts %}Re: <b><a href="{{ settings.APP_HOST }}{% url "show_comment" comment.post.slug comment.id %}">{% if comment.post.emoji %}{{ comment.post.emoji }} {% endif %}{% if comment.post.prefix %}{{ comment.post.prefix }} {% endif %}{{ comment.post.title }}</a></b>
+{% load text_filters %}{% load posts %}{% if comment.metadata.badges %}🏆 Комментарий получил награду {% for badge in comment.metadata.badges.values %}«{{ badge.title }}» {% endfor %}
+
+{% endif %}Re: <b><a href="{{ settings.APP_HOST }}{% url "show_comment" comment.post.slug comment.id %}">{% if comment.post.emoji %}{{ comment.post.emoji }} {% endif %}{% if comment.post.prefix %}{{ comment.post.prefix }} {% endif %}{{ comment.post.title }}</a></b>
 
 (+{{ comment.upvotes }}) <b>{{ comment.author.full_name }}:</b> {% render_plain comment 3000 %}