Merge branch 'main' into maps-here

Author: jonaharagon

.all-contributorsrc

@@ -460,7 +460,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/47955724?v=4",
       "profile": "https://github.com/taivlam",
       "contributions": [
-        "doc"
+        "doc",
+        "maintenance"
       ]
     },
     {

.github/workflows/build-pr.yml

@@ -72,6 +72,8 @@ jobs:
       continue-on-error: false
       privileged: ${{ fromJSON(needs.metadata.outputs.privileged) }}
       strict: true
+    secrets:
+      RO_DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
 
   build_i18n:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'ci:build i18n') }}

.github/workflows/build.yml

@@ -30,6 +30,9 @@ on:
       cache:
         type: boolean
         default: true
+    secrets:
+      RO_DISCOURSE_API_KEY:
+        required: false
 
 permissions:
   contents: read
@@ -172,23 +175,31 @@ jobs:
           sudo apt install pngquant
           echo "EXTRA_FLAGS=""$EXTRA_FLAGS" --cmd=mkdocs"" >> "$GITHUB_ENV"
 
+      - name: Generate Donating Members List
+        continue-on-error: true
+        env:
+          DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
+        run: |
+          pip install requests
+          python generate-members.py > includes/members.md
+
       - name: Build Website
         run: |
           eval ./run.sh --build --lang=${{ inputs.lang }} "$EXTRA_FLAGS"
 
-      - name: Run index-generation.sh for top posts
+      - name: Run generate-topics.sh for top posts
         if: inputs.lang == 'en'
         run: |
-          bash index-generation.sh \
+          bash generate-topics.sh \
             --source='https://discuss.privacyguides.net/top.json?period=weekly' \
             --tag="top posts" \
             --destination="./site/en/index.html" \
             --count=3
 
-      - name: Run index-generation.sh for latest posts
+      - name: Run generate-topics.sh for latest posts
         if: inputs.lang == 'en'
         run: |
-          bash index-generation.sh \
+          bash generate-topics.sh \
             --source='https://discuss.privacyguides.net/latest.json' \
             --tag="latest posts" \
             --destination="./site/en/index.html" \
@@ -259,6 +270,14 @@ jobs:
           path: site-${{ inputs.config }}-${{ inputs.lang }}.tar.gz
           retention-days: 1
 
+      - name: Upload members list
+        uses: actions/upload-artifact@v4
+        if: inputs.config == 'build' && inputs.lang == 'en'
+        with:
+          name: members.md
+          path: includes/members.md
+          retention-days: 1
+
   offline_package:
     if: inputs.config == 'offline' && inputs.lang == 'en'
     needs: build

.github/workflows/publish-release.yml

@@ -63,6 +63,8 @@ jobs:
       context: production
       continue-on-error: false
       cache: false
+    secrets:
+      RO_DISCOURSE_API_KEY: ${{ secrets.RO_DISCOURSE_API_KEY }}
 
   build_blog:
     needs: submodule

.github/workflows/update-discussions.yml

@@ -55,17 +55,17 @@ jobs:
           source: /en/index.html
           target: ./site/en/
 
-      - name: Run index-generation.sh for top posts
+      - name: Run generate-topics.sh for top posts
         run: |
-          bash index-generation.sh \
+          bash generate-topics.sh \
             --source='https://discuss.privacyguides.net/top.json?period=weekly' \
             --tag="top posts" \
             --destination="./site/en/index.html" \
             --count=3
 
-      - name: Run index-generation.sh for latest posts
+      - name: Run generate-topics.sh for latest posts
         run: |
-          bash index-generation.sh \
+          bash generate-topics.sh \
             --source='https://discuss.privacyguides.net/latest.json' \
             --tag="latest posts" \
             --destination="./site/en/index.html" \

.gitignore

@@ -23,3 +23,6 @@ node_modules
 .venv
 .env
 .mkdocs-insiders-*
+
+# Automatically generated
+includes/members.md

.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 <[email protected]> <[email protected]>
 Daniel Gray <[email protected]> <[email protected]>
 Daniel Gray <[email protected]> <[email protected]>
 Daniel Gray <[email protected]>
+Em <[email protected]> <[email protected]>
+Freddy <[email protected]> <[email protected]>
+Freddy <[email protected]> <[email protected]>
+fria <[email protected]> <[email protected]>
 Jonah Aragon <[email protected]> <[email protected]>
 Jonah Aragon <[email protected]> <[email protected]>
 Jonah Aragon <[email protected]> <[email protected]>
-mfwmyfacewhen <[email protected]> <[email protected]>
-mbananasynergy <[email protected]> <>
-mbananasynergy <[email protected]> <[email protected]>
-rollsicecream <[email protected]> <[email protected]>
-rollsicecream <[email protected]> <[email protected]>
-Freddy <[email protected]> <[email protected]>
-Freddy <[email protected]> <[email protected]>
+Jordan Warne <[email protected]> <[email protected]>
+Justin Ehrenhofer <[email protected]> <[email protected]>
+Mare Polaris <[email protected]> <[email protected]>
 Niek de Wilde <[email protected]> <[email protected]>
 Niek de Wilde <[email protected]> <[email protected]>
+redoomed1 <[email protected]> <[email protected]>

.vscode/ltex.dictionary.en-US.txt

@@ -539,3 +539,18 @@ Euki
 sympto-thermal
 OsmAnd
 Paaster
+material-check-decagram
+Bluesky
+Codeberg
+simple-codeberg
+simple-reddit
+fontawesome-brands-linkedin
+simple-keepassxc
+OnlyKey
+fontawesome-solid-unlock-keyhole
+KeeShare
+KeePassium
+MWEB
+Cyd
+Semiphemeral
+Dangerzone

README.md

@@ -14,9 +14,7 @@
   <a href="https://github.com/privacyguides/privacyguides.org/stargazers">
     <img src="https://img.shields.io/github/stars/privacyguides?style=social"></a>
   <a href="https://mastodon.neat.computer/@privacyguides">
-    <img src="https://img.shields.io/mastodon/follow/109298532634697668?domain=https%3A%2F%2Fmastodon.neat.computer&label=Follow&style=social"></a>
-  <a href="https://bsky.app/profile/privacyguides.org">
-    <img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpublic.api.bsky.app%2Fxrpc%2Fapp.bsky.actor.getProfile%3Factor%3Dprivacyguides.org&query=%24.followersCount&style=social&logo=bluesky&label=Follow"></a></p>
+    <img src="https://img.shields.io/mastodon/follow/109298532634697668?domain=https%3A%2F%2Fmastodon.neat.computer&label=Follow&style=social"></a></p>
 
   <p><a href="https://github.com/privacyguides/privacyguides.org/pulls">
     <img src="https://img.shields.io/github/issues-pr-raw/privacyguides/privacyguides.org"></a>
@@ -222,7 +220,7 @@ Privacy Guides wouldn't be possible without these wonderful people ([emoji key](
       <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/C-O-M-P-A-R-T-M-E-N-T-A-L-I-Z-A-T-I-O-N"><img src="https://avatars.githubusercontent.com/u/30232065?v=4" width="100px;" loading=lazy /><br /><sub><b>C-O-M-P-A-R-T-M-E-N-T-A-L-I-Z-A-T-I-O-N</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=C-O-M-P-A-R-T-M-E-N-T-A-L-I-Z-A-T-I-O-N" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/Strappazzon"><img src="https://avatars.githubusercontent.com/u/19752093?v=4" width="100px;" loading=lazy /><br /><sub><b>Alberto Strappazzon</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=Strappazzon" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://victorhckinthefreeworld.com/"><img src="https://avatars.githubusercontent.com/u/1514206?v=4" width="100px;" loading=lazy /><br /><sub><b>Victorhck</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=victorhck" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/taivlam"><img src="https://avatars.githubusercontent.com/u/47955724?v=4" width="100px;" loading=lazy /><br /><sub><b>Tai Lam</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=taivlam" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/taivlam"><img src="https://avatars.githubusercontent.com/u/47955724?v=4" width="100px;" loading=lazy /><br /><sub><b>Tai Lam</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=taivlam" title="Documentation">📖</a> <a href="#maintenance-taivlam" title="Maintenance">🚧</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="20%"><a rel="nofollow noopener noreferrer" href="https://github.com/NinebitX"><img src="https://avatars.githubusercontent.com/u/26626722?v=4" width="100px;" loading=lazy /><br /><sub><b>NinebitX</b></sub></a><br /><a href="https://github.com/privacyguides/privacyguides.org/commits?author=NinebitX" title="Documentation">📖</a></td>

blog/.authors.yml

@@ -1,4 +1,8 @@
 authors:
+  aprilfools:
+    name: Anita Key
+    description: Government Liaison
+    avatar: https://github.com/privacyguides.png
   contributors:
     type: Organization
     name: Privacy Guides