Show flair for new contributors in the selected release.

libraries/views.py

@@ -5,7 +5,7 @@
 
 import structlog
 from django.contrib import messages
-from django.db.models import F, Count
+from django.db.models import F, Count, Exists, OuterRef
 from django.db.models.functions import Lower
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect
@@ -21,6 +21,7 @@
 from .mixins import VersionAlertMixin
 from .models import (
     Category,
+    Commit,
     CommitAuthor,
     CommitAuthorEmail,
     Library,
@@ -270,33 +271,29 @@ def get_context_data(self, **kwargs):
             for x in context["maintainers"]
             if getattr(x.commitauthor, "id", None)
         ]
-        context["top_contributors_release"] = self.get_top_contributors(
+        top_contributors_release = self.get_top_contributors(
             version=context["version"],
             exclude=exclude_maintainer_ids,
         )
-        exclude_top_contributor_ids = [
-            x.id for x in context["top_contributors_release"]
+        context["top_contributors_release_new"] = [
+            x for x in top_contributors_release if x.is_new
         ]
+        context["top_contributors_release_old"] = [
+            x for x in top_contributors_release if not x.is_new
+        ]
+        exclude_top_contributor_ids = [x.id for x in top_contributors_release]
         context["top_contributors_overall"] = self.get_top_contributors(
             exclude=exclude_maintainer_ids + exclude_top_contributor_ids
         )
         # Since we need to execute these queries separately anyway, just concatenate
         # their results instead of making a new query
         all_contributors = []
-        for x in chain(
-            context["top_contributors_release"], context["top_contributors_overall"]
-        ):
+        for x in chain(top_contributors_release, context["top_contributors_overall"]):
             all_contributors.append(
                 {
                     "name": x.name,
                 }
             )
-        for x in context["maintainers"]:
-            all_contributors.append(
-                {
-                    "name": x.get_full_name(),
-                }
-            )
 
         all_contributors.sort(key=lambda x: x["name"].lower())
         context["all_contributors"] = all_contributors
@@ -443,7 +440,18 @@ def get_top_contributors(self, version=None, exclude=None):
             library_version = LibraryVersion.objects.get(
                 library=self.object, version=version
             )
-            qs = CommitAuthor.objects.filter(commit__library_version=library_version)
+            qs = CommitAuthor.objects.filter(
+                commit__library_version=library_version
+            ).annotate(
+                is_new=~Exists(
+                    Commit.objects.filter(
+                        author_id=OuterRef("id"),
+                        library_version__in=LibraryVersion.objects.filter(
+                            version__name__lt=version.name, library=self.object
+                        ),
+                    )
+                )
+            )
         else:
             qs = CommitAuthor.objects.filter(
                 commit__library_version__library=self.object

templates/libraries/detail.html

@@ -123,7 +123,13 @@ <h2 class="text-2xl">Maintainers &amp; Contributors</h2>
         </div>
 
         <div class="flex flex-wrap justify-center gap-2">
-        {% for author in top_contributors_release %}
+        {% for author in top_contributors_release_new %}
+          {% avatar commitauthor=author is_new=author.is_new %}
+        {% endfor %}
+        </div>
+
+        <div class="flex flex-wrap justify-center gap-2">
+        {% for author in top_contributors_release_old %}
           {% avatar commitauthor=author %}
         {% endfor %}
         </div>

templates/partials/avatar.html

@@ -3,13 +3,23 @@
 {% with av_alt=av_alt|default:av_name av_icon_size=av_icon_size|default:"text-3xl" %}
   <a {% if av_href and av_is_link %}href="{{ av_href }}"{% endif %}>
     <div class="w-min text-center flex flex-col justify-center items-center">
-      <div class="bg-gray-300 dark:bg-slate rounded-lg {{ av_size }} flex items-center justify-center relative" title="{{ av_title }}">
+      <div
+        class="{{ av_size }} bg-gray-300 dark:bg-slate flex items-center justify-center relative rounded-lg"
+        title="{{ av_title }}{% if av_is_new %} - NEW!{% endif %}">
       {% if av_image_url %}
         <img src="{{ av_image_url }}"
           alt="{{ av_alt }}"
-          class="rounded-lg {{ av_size }} object-cover mx-auto" />
+          class="
+            rounded-lg h-full w-full object-cover mx-auto
+            "
+          />
       {% else %}
-        <i class="{{ av_icon_size }} align-middle fas fa-user text-white dark:text-white/60"></i>
+        <i
+          class="
+            {{ av_icon_size }}
+            align-middle fas fa-user text-white dark:text-white/60
+          "
+        ></i>
       {% endif %}
       </div>
       {% if av_show_name %}

users/templatetags/avatar_tags.py

@@ -15,6 +15,7 @@ def base_avatar(
     title=None,
     image_size=None,
     icon_size=None,
+    is_new=False,
 ):
     context = {
         "av_name": name,
@@ -26,6 +27,7 @@ def base_avatar(
         "av_icon_size": icon_size,
         "av_title": title,
         "av_alt": alt,
+        "av_is_new": is_new,
     }
     return render_to_string("partials/avatar.html", context)
 
@@ -40,43 +42,38 @@ def avatar(
     title=None,
     image_size=None,
     icon_size=None,
+    is_new=False,
 ):
+    kwargs = {
+        "is_link": is_link,
+        "is_show_name": is_show_name,
+        "alt": alt,
+        "title": title,
+        "image_size": image_size,
+        "icon_size": icon_size,
+        "is_new": is_new,
+    }
     if user and commitauthor:
         image_url = user.get_thumbnail_url() or commitauthor.avatar_url
         href = user.github_profile_url or commitauthor.github_profile_url
         return base_avatar(
             user.get_full_name(),
             image_url,
             href,
-            is_link=is_link,
-            is_show_name=is_show_name,
-            alt=alt,
-            title=title,
-            image_size=image_size,
-            icon_size=icon_size,
+            **kwargs,
         )
     elif user:
         return base_avatar(
             user.get_full_name(),
             user.get_thumbnail_url(),
             user.github_profile_url,
-            is_link=is_link,
-            is_show_name=is_show_name,
-            alt=alt,
-            title=title,
-            image_size=image_size,
-            icon_size=icon_size,
+            **kwargs,
         )
     elif commitauthor:
         return base_avatar(
             commitauthor.name,
             commitauthor.avatar_url,
             commitauthor.github_profile_url,
-            is_link=is_link,
-            is_show_name=is_show_name,
-            alt=alt,
-            title=title,
-            image_size=image_size,
-            icon_size=icon_size,
+            **kwargs,
         )
     raise ValueError("Must provide user or commitauthor.")