Fix incorrect usernames

Author: Oleksandr Kulkov

.github/workflows/deploy-prod.yml

@@ -25,9 +25,9 @@ jobs:
           mkdocs-macros-plugin \
           mkdocs-literate-nav \
           mkdocs-git-authors-plugin \
-          mkdocs-git-committers-plugin-2 \
           mkdocs-git-revision-date-localized-plugin \
-          mkdocs-simple-hooks
+          mkdocs-simple-hooks \
+          plugins/mkdocs-git-committers-plugin-2
       - name: Cache Github Users
         uses: actions/cache@v3
         with:

.github/workflows/test.yml

@@ -21,9 +21,9 @@ jobs:
           mkdocs-macros-plugin \
           mkdocs-literate-nav \
           mkdocs-git-authors-plugin \
-          mkdocs-git-committers-plugin-2 \
           mkdocs-git-revision-date-localized-plugin \
-          mkdocs-simple-hooks
+          mkdocs-simple-hooks \
+          plugins/mkdocs-git-committers-plugin-2
       - name: Cache Github Users
         uses: actions/cache@v3
         with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "plugins/mkdocs-git-committers-plugin-2"]
+	path = plugins/mkdocs-git-committers-plugin-2
+	url = https://github.com/adamant-pwn/mkdocs-git-committers-plugin-2.git

plugins/mkdocs-git-committers-plugin-2

@@ -28,28 +28,25 @@
 
 <!-- Construct the dict of author's contribution percentage -->
 {% set contribs = {} %}
+{% set id_for_email = {} %}
 
-{% for author in git_info.page_authors %}
-  {% if contribs[author.name] %}
-    {% do contribs[author.name].__setitem__(
-      'contribution',
-      contribs[author.name].contribution + author.contribution[:-1]|float
-    ) %}
-  {% else %}
-    {% do contribs.__setitem__(author.name, {
-      'contribution':author.contribution[:-1]|float,
-      'name':author.name,
-      'url':'#'
-    }) %}
-  {% endif %}
+{% for author in committers %}
+  {% do contribs.setdefault(author.login, {}) %}
+  {% do contribs[author.login].update({
+    'name':author.login,
+    'url':author.url
+  }) %}
+  {% for email in author.emails %}
+    {% do id_for_email.__setitem__(email, author.login) %}
+  {% endfor %}
 {% endfor %}
 
-{% for author in committers %}
-{% do contribs.setdefault(author.name, {}) %}
-{% do contribs[author.name].update({
-  'name':author.login,
-  'url':author.url
-}) %}
+{% for author in git_info.page_authors %}
+  {% set id = id_for_email[author.email] %}
+  {% do contribs[id].__setitem__(
+    'contribution',
+    contribs[id].get(contribution, 0) + author.contribution[:-1]|float
+  ) %}
 {% endfor %}
 
 {% set contribs = contribs.values() |
@@ -91,4 +88,4 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
     <li><a href="{{ user.url }}" title="{{ user.name }}" data-bi-name="contributorprofile" target="_blank">{{ user.name }}</a> ({{user.contribution}}%)</li>
     {%- endfor -%}
   </ul>
-</ul>
+</ul>