From 25f6aed4bbf41c14f348a7b1df1dafe623d30aac Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Mon, 3 May 2021 22:52:28 -0500
Subject: [PATCH] Update GitHub templates

---
 .../ISSUE_TEMPLATE/1_Software_Suggestion.md   |  4 ++--
 ..._Correction.md => 2_Content_Correction.md} |  2 +-
 .github/ISSUE_TEMPLATE/2_Software_Removal.md  | 15 ------------
 .../ISSUE_TEMPLATE/3_Feature_Suggestion.md    |  8 -------
 ..._Website_Issues.md => 3_Website_Issues.md} |  5 ++--
 .github/ISSUE_TEMPLATE/config.yml             |  8 +++++++
 .github/PULL_REQUEST_TEMPLATE.md              | 24 +++++++++++++++++++
 7 files changed, 37 insertions(+), 29 deletions(-)
 rename .github/ISSUE_TEMPLATE/{4_Content_Correction.md => 2_Content_Correction.md} (80%)
 delete mode 100644 .github/ISSUE_TEMPLATE/2_Software_Removal.md
 delete mode 100644 .github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
 rename .github/ISSUE_TEMPLATE/{5_Website_Issues.md => 3_Website_Issues.md} (82%)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
index f7b10fe4..58c32b95 100644
--- a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
@@ -1,6 +1,6 @@
 ---
-name: "🆕 Software or Provider Suggestion"
-about: "Suggest something new for us to look at!"
+name: "Software or Provider Suggestion"
+about: "Suggest something new for us to look at, or something we should remove."
 ---
 
 ## Basic Information
diff --git a/.github/ISSUE_TEMPLATE/4_Content_Correction.md b/.github/ISSUE_TEMPLATE/2_Content_Correction.md
similarity index 80%
rename from .github/ISSUE_TEMPLATE/4_Content_Correction.md
rename to .github/ISSUE_TEMPLATE/2_Content_Correction.md
index 3e4f1c67..ca699fae 100644
--- a/.github/ISSUE_TEMPLATE/4_Content_Correction.md
+++ b/.github/ISSUE_TEMPLATE/2_Content_Correction.md
@@ -1,5 +1,5 @@
 ---
-name: "📝 Content Correction"
+name: "Content Correction"
 about: Report any inaccurate, incorrect, or outdated information on the website.
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/2_Software_Removal.md b/.github/ISSUE_TEMPLATE/2_Software_Removal.md
deleted file mode 100644
index de00bf30..00000000
--- a/.github/ISSUE_TEMPLATE/2_Software_Removal.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: "❌ Software Removal"
-about: Suggest the removal of outdated, insecure, or otherwise bad software.
----
-
-## Description
-
-
-## Additional context
-
-<!-- Anything else you would like to tell us? -->
-
-<!-- Additionally, please share any connection you may have with the software/organization/company/provider.
-     Are you the author? A former contributor?
-		 Someone who just passionately dislikes the project? :) -->
diff --git a/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md b/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
deleted file mode 100644
index 90ecdaaf..00000000
--- a/.github/ISSUE_TEMPLATE/3_Feature_Suggestion.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: "✨ Feature Suggestion"
-about: Suggest a new feature/section/page for the website.
----
-
-<!-- This is for suggesting some new feature for the website itself, or a new category of software, or anything like that. It is not for recommending new specific software, go back and choose the right option if that's what you wanted :) -->
-
-## Description
diff --git a/.github/ISSUE_TEMPLATE/5_Website_Issues.md b/.github/ISSUE_TEMPLATE/3_Website_Issues.md
similarity index 82%
rename from .github/ISSUE_TEMPLATE/5_Website_Issues.md
rename to .github/ISSUE_TEMPLATE/3_Website_Issues.md
index 4fab7905..6f5445e0 100644
--- a/.github/ISSUE_TEMPLATE/5_Website_Issues.md
+++ b/.github/ISSUE_TEMPLATE/3_Website_Issues.md
@@ -1,8 +1,7 @@
 ---
-name: "🌐 Website Issue"
+name: "Website Issue"
 about: Report a bug with the website. (NO CONTENT ISSUES)
-title: "🌐 Website Issue | "
-labels: 🌐 website issue
+title: "Website Issue | "
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..c18783a4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a Question
+    url: https://github.com/privacyguides/privacyguides.org/discussions/new
+    about: Let us know if something doesn't make sense!
+  - name: Share an Idea
+    url: https://github.com/privacyguides/privacyguides.org/discussions/new
+    about: Suggest a new feature/section/page or anything else for the website.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..60898bfd
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,24 @@
+<!-- Submitting a PR? Awesome!! -->
+
+## Description
+
+Resolves: # <!-- Did you solve an open GitHub issue? Put the number here so we mark it complete! -->
+
+<!--
+Please share with us what you've changed.
+If you are adding a software recommendation, give us a link to its website or
+source code.
+
+If you are making changes that you have a conflict of interest with, please
+disclose this as well:
+Conflict of interest contributions involve contributing about yourself,
+family, friends, clients, employers, or your financial and other relationships.
+Any external relationship can trigger a conflict of interest.
+
+That someone has a conflict of interest is a description of a situation,
+NOT a judgement about that person's opinions, integrity, or good faith.
+
+If you have a conflict of interest, you must disclose who is paying you for
+this contribution, who the client is (if for example, you are being paid by
+an advertising agency), and any other relevant affiliations.
+-->