From cc54a3bc47064f3d4a7fca6ba2abff6865c730c7 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@privacyguides.org>
Date: Fri, 7 Mar 2025 20:12:18 -0600
Subject: [PATCH] docs: Add team members to .mailmap (#2933)

Signed-off-by: Daniel Gray <dngray@privacyguides.org>
---
 .github/workflows/build.yml |  2 +-
 .mailmap                    | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b40b46b..9468eca8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -272,7 +272,7 @@ jobs:
 
       - name: Upload members list
         uses: actions/upload-artifact@v4
-        if: inputs.lang == 'en'
+        if: inputs.config == 'build' && inputs.lang == 'en'
         with:
           name: members.md
           path: includes/members.md
diff --git a/.mailmap b/.mailmap
index 65aefd6f..145d381c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,16 +1,22 @@
+# Please use this file to correct information in our git log.
+# Format: Proper Name <Proper Email> <Incorrect Email>
+#
+# Privacy Guides Team Members
+# ===========================
 Daniel Gray <dngray@privacyguides.org> <dng@disroot.org>
 Daniel Gray <dngray@privacyguides.org> <48640805+dngray@users.noreply.github.com>
 Daniel Gray <dngray@privacyguides.org> <dngray@privacytools.io>
 Daniel Gray <dngray@privacyguides.org>
+Em <em@privacyguides.org> <194856901+EmAtPrivacyGuides@users.noreply.github.com>
+Freddy <freddy@privacyguides.org> <freddy@decypher.pw>
+Freddy <freddy@privacyguides.org> <freddy@privacytools.io>
+fria <fria@privacyguides.org> <138676274+friadev@users.noreply.github.com>
 Jonah Aragon <jonah@privacyguides.org> <jonah@triplebit.net>
 Jonah Aragon <jonah@privacyguides.org> <jonah@privacytools.io>
 Jonah Aragon <jonah@privacyguides.org> <github@aragon.science>
-mfwmyfacewhen <mfw@privacyguides.org> <94880365+mfwmyfacewhen@users.noreply.github.com>
-mbananasynergy <mbananasynergy@privacyguides.org> <>
-mbananasynergy <mbananasynergy@privacyguides.org> <107055883+matchboxbananasynergy@users.noreply.github.com>
-rollsicecream <rollsicecream@proton.me> <153316540+rollsicecream@users.noreply.github.com>
-rollsicecream <rollsicecream@proton.me> <waterfallnet@proton.me>
-Freddy <freddy@privacyguides.org> <freddy@decypher.pw>
-Freddy <freddy@privacyguides.org> <freddy@privacytools.io>
+Jordan Warne <jordan@privacyguides.org> <jw@omg.lol>
+Justin Ehrenhofer <justin.ehrenhofer@gmail.com> <12520755+SamsungGalaxyPlayer@users.noreply.github.com>
+Mare Polaris <ph00lt0@privacyguides.org> <15004290+ph00lt0@users.noreply.github.com>
 Niek de Wilde <niek@privacyguides.org> <github.ef27z@simplelogin.com>
 Niek de Wilde <niek@privacyguides.org> <blacklight447@privacytools.io>
+redoomed1 <redoomed1@privacyguides.org> <161974310+redoomed1@users.noreply.github.com>