Squash commits hopefully (#518)

Co-authored-by: amo13 <amaury@mailbox.org>
Co-authored-by: Matthew Wise <matthew.rs.wise@gmail.com>
Co-authored-by: Mark Niehe <mark.niehe@segment.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Degoogle Bot <dg-bot-push@tycrek.com>

Author: 6 people

.github/CODEOWNERS

@@ -0,0 +1,15 @@
+# Protect build scripts
+*.js	@tycrek
+
+# Protect NPM files
+*.json	@tycrek
+
+# Protect MIRRORS.md
+/MIRRORS.md	@tycrek
+
+# Protect .github & others
+/.github/	@tycrek
+/.gitattributes @tycrek
+
+# Protect README.md (restricted to degoogle-bot)
+/README.md	@degoogle-bot

.github/ISSUE_TEMPLATE/1-new-alternative.yml

@@ -19,7 +19,6 @@ body:
       options:
         - label: "**I have read the guidelines in [CONTRIBUTING.md](../blob/master/CONTRIBUTING.md)**"
           required: true
-        - label: Include my name in [CONTRIBUTORS.md](../blob/master/CONTRIBUTORS.md)
         - label: I am affiliated with this alternative
   - type: input
     id: name
@@ -32,7 +31,7 @@ body:
     id: section
     attributes:
       label: Section
-      description: Please also include the section you feel it belongs best in
+      description: Also include the section you feel it belongs best in
       multiple: true
       options:
        - Browser extensions
@@ -46,7 +45,7 @@ body:
     attributes:
       label: Description
       description: |
-        Please provide a brief description of the alternative,
+        Provide a brief description of the alternative,
         one to 5 sentences which will be displayed along with the name.
     validations:
       required: true
@@ -86,7 +85,7 @@ body:
     attributes:
       label: Is this alternative hosted in a country that performs surveillance?
       description: |
-        For more info on 5/9/14 eyes, please check here: https://restoreprivacy.com/5-eyes-9-eyes-14-eyes/
+        For more info on 5/9/14 eyes, visit: https://restoreprivacy.com/5-eyes-9-eyes-14-eyes/
         Usually only one applies, but you may select more than one.
       options:
         - label: 5 Eyes
@@ -103,7 +102,7 @@ body:
   - type: dropdown
     id: self-hosting
     attributes:
-      label: Please indicate if self-hosting is possible, not possible, or the only option
+      label: Indicate if self-hosting is possible, not possible, or the only option
       options:
         - Possible
         - Not possible

.github/ISSUE_TEMPLATE/2-fix-update-alternative.yml

@@ -19,7 +19,6 @@ body:
       options:
         - label: "**I have read the guidelines in [CONTRIBUTING.md](../blob/master/CONTRIBUTING.md)**"
           required: true
-        - label: Include my name in [CONTRIBUTORS.md](../blob/master/CONTRIBUTORS.md)
         - label: I am affiliated with this alternative
   - type: input
     id: alternative_name

.github/ISSUE_TEMPLATE/3-remove-alternative.yml

@@ -18,7 +18,6 @@ body:
       options:
         - label: "**I have read the guidelines in [CONTRIBUTING.md](../blob/master/CONTRIBUTING.md)**"
           required: true
-        - label: Include my name in [CONTRIBUTORS.md](../blob/master/CONTRIBUTORS.md)
         - label: I am affiliated with this alternative
   - type: input
     id: alternative_name

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,13 @@
 <!-- If your Pull Request is related to an alternative, make sure there is a corresponding Issue for discussion. -->
 
-| Checklist |   |
-| --------- | - |
-| **I have read the guidelines in [CONTRIBUTING.md]**   | yes/no |
-| Include my name in [CONTRIBUTORS.md]                  | yes/no |
-| I am affiliated with this alternative (if applicable) | yes/no |
+### Checklist
 
+- __I have read the guidelines in [CONTRIBUTING.md]__: yes/no
+- __I am affiliated with this alternative (if applicable)__: yes/no
 
 ### Details
 <!-- Optional if details exist in a linked Issue. If that is the case, link to the Issue here. -->
 
 
+
 [CONTRIBUTING.md]: ../blob/master/CONTRIBUTING.md
-[CONTRIBUTORS.md]: ../blob/master/CONTRIBUTORS.md

.github/workflows/build.yml

@@ -3,36 +3,34 @@ on:
   push:
     branches:
       - master
-    paths:
-      - yaml/*.yml
-      - md/*.md
-      - _build.js
-      - _wiki.js
+    paths: # Only build if these files were modified
+      - src/yaml/*.yml
+      - src/md/*.md
+      - src/_build.js
+      - src/_wiki.js
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v4
       with:
-        node-version: 13.x
-    - name: Install dependencies
-      run: npm i
-    - name: Build
-      run: node _build.js
-    - name: Commit
+        # GH_PAT must be a PAT for repo owner
+        token: ${{ secrets.GH_PAT }}
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 20.x
+    - name: Build README
+      run: npm i && node src/_build.js
+    - name: Commit & Push
+      # GH_NAME/GH_EMAIL can be any collaborator account with Force Push access
       run: |
         git add README.md
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
+        git config --local user.name "${{ vars.GH_NAME }}"
+        git config --local user.email "${{ vars.GH_EMAIL }}"
         git commit --allow-empty -m "Generated README.md"
-    - name: Push
-      uses: ad-m/github-push-action@master
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: master
-    - name: Wiki
-      run: node _wiki.js
+        git push --force-with-lease
+    - name: Publish Reddit Wiki
+      run: node src/_wiki.js
       env:
         REDDIT_USER: ${{ secrets.REDDIT_USER}}
         REDDIT_PASS: ${{ secrets.REDDIT_PASS}}

.github/workflows/readme-protection.yml

@@ -0,0 +1,25 @@
+name: README Edit Protection
+
+on:
+  pull_request_target:
+
+jobs:
+  check:
+    name: 'File check'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v39
+      - name: Check if README included
+        run: |
+           for file in ${{ steps.changed-files.outputs. modified_files }}; do
+              if [[ $file == 'README.md' ]]; then
+                 echo "[!] README.md was edited, blocking!"
+                 exit 1
+              fi
+           done

CONTRIBUTING.md

@@ -1,35 +1,26 @@
 # Contributing
 
-###### Last revised: August 9th, 2021
-
-###### Templates revised: August 9th, 2021
-
 ## General rules
 
 1. **English only** for issues & pull requests.
-2. **Do not edit `README.md`!** This file is automatically generated.
-3. Personal opinions will **not** be considered when adding or removing an alternative. Instead, provide links to articles with details.
+2. **Do not edit README.md!** This file is automatically generated. Instead, use:
+   - [`src/yaml/`](https://github.com/tycrek/degoogle/tree/master/src/yaml) for structured data
+   - [`src/md/`](https://github.com/tycrek/degoogle/tree/master/src/md) for regular text
+3. Personal opinions will **not** be considered. Instead, provide detailed links as supporting evidence.
 4. **Use the templates** when submitting an Issue or Pull Request. Blank Issues/PRs are not allowed.
 
 ## How to submit a change
 
 ### A: I am not familiar with GitHub or Pull Requests
 
-1. Open a [new Issue].
+1. Open a [new Issue](https://github.com/tycrek/degoogle/issues/new/choose).
 2. Select a template to use. If in doubt, use **Other**.
 3. Fill out the information to the best of your ability.
 4. When you are finished, click **Submit new issue**.
 
 ### B: I have used GitHub Pull Requests
 
 1. Create your Pull Request with your changes.
-   - Remember to **not** edit `README.md`!
+   - Remember to **not** edit README.md!
    - As with Issues, fill out the template as best you can.
-2. For PR's relating to alternatives, please follow the steps above to also create an Issue for discussion. Simple PR's that are unrelated to a specific alternative may not require an Issue. If in doubt, create an **Other** Issue.
-
-## I contributed but I am not in the list (or) I do not want to be in the list anymore
-
-If you submitted a change that made it into the guide but don't have your Reddit or GitHub username in the [CONTRIBUTORS.md] list, open an issue or pull request so I can fix it. Alternatively, if your username is on the list and you do *not* want it there, feel free to request this as well.
-
-[new Issue]: https://github.com/tycrek/degoogle/issues/new/choose
-[CONTRIBUTORS.md]: https://github.com/tycrek/degoogle/blob/master/CONTRIBUTORS.md
+2. For PR's relating to alternatives, you must also follow the steps above to create an Issue for discussion. Simple PR's that are unrelated to a specific alternative may not require an Issue. If in doubt, create an **Other** Issue.

CONTRIBUTORS.md

@@ -86,6 +86,7 @@ Thanks to everyone here for contributing in some way! (usernames are in no parti
 - [@julianfairfax](https://github.com/julianfairfax)
 - [@ACK-J](https://github.com/ACK-J)
 - [@joebudi](https://github.com/joebudi)
+- [@mniehe](https://github.com/mniehe)
 
 ### Reddit:
 

MIRRORS.md

@@ -1,8 +1,6 @@
 # Degoogle Mirrors
 
-If you host a mirror, let me know through an Issue or PR so it can be added to the community mirrors list. It would be prefered if your mirror is auto-updating.
-
-Official mirrors are the main sources and are maintained by me (@tycrek). Community mirrors are other Git instances run by other users that I can't control.
+Official mirrors are managed by me ([@tycrek](https://github.com/tycrek)). Community mirrors are Git instances run by other users that I can't control (they may be out of date as well).
 
 ## Official mirrors
 
@@ -13,7 +11,7 @@ Official mirrors are the main sources and are maintained by me (@tycrek). Commun
 
 - [Gitea mirror](https://git.mirkodi.eu/mirk0dex/degoogle) from [@mirk0dex (Gitea)](https://git.mirkodi.eu/mirk0dex)
 
-## Non-english mirrors
+### Non-english mirrors
 
 - [Turkish/Türk](https://github.com/melikechan/degoogle-turkish) from [@melikechan](https://github.com/melikechan)
 - [Italian/Italiano](https://gitea.it/devol/degooglizzazione) from [@devol (Gitea)](https://gitea.it/devol)