From ec8fe21485ea446f2e76f12b234842dc6c7ab513 Mon Sep 17 00:00:00 2001
From: Perflyst <mail@perflyst.de>
Date: Sat, 30 Jan 2021 10:53:25 +0100
Subject: [PATCH 1/3] Add issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 31 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 23 +++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..534e943c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!-- Please use the search function to check if the bug you found has already been reported by someone else -->
+<!-- If you want to suggest a new feature please use "Feature request" instead -->
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**Steps to Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
+**Logs**
+<!-- If applicable, add logs where the error is reported. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..690b6a8d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- Please use the search function to check if the desired function has already been requested by someone else -->
+<!-- If you want to report a bug, please use "Bug report" instead -->
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

From b30db728cc8435b3debbaa27aad940fe482683ac Mon Sep 17 00:00:00 2001
From: Perflyst <mail@perflyst.de>
Date: Sun, 31 Jan 2021 13:17:50 +0100
Subject: [PATCH 2/3] Add suggestions

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 12 ++++++++----
 .github/ISSUE_TEMPLATE/feature_request.md |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 534e943c6..8b83cbe59 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
-about: Create a report to help us improve
-title: ''
+about: Create a report to help us improve Invidious
+title: '[Bug] '
 labels: bug
 assignees: ''
 
@@ -9,6 +9,7 @@ assignees: ''
 
 <!-- Please use the search function to check if the bug you found has already been reported by someone else -->
 <!-- If you want to suggest a new feature please use "Feature request" instead -->
+<!-- If you want to suggest an enhancement to a new feature please use "Enhancement" instead -->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
@@ -22,10 +23,13 @@ assignees: ''
 -->
 
 **Logs**
-<!-- If applicable, add logs where the error is reported. -->
+<!-- If applicable, copy the log that appear in the browser page where the error is reported. -->
 
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **Additional context**
-<!-- Add any other context about the problem here. -->
+<!-- Add any other context about the problem here.
+ - Browser (if applicable):
+ - OS (if applicable):
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 690b6a8d6..b308eb0da 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
+title: '[Feature request] '
 labels: enhancement
 assignees: ''
 

From 2b1463304702e2488e249df9a01d67fa234a42b6 Mon Sep 17 00:00:00 2001
From: Perflyst <mail@perflyst.de>
Date: Mon, 8 Feb 2021 16:23:57 +0100
Subject: [PATCH 3/3] Split enhancement and feature request, apply suggestions

---
 .github/ISSUE_TEMPLATE/bug_report.md      |  4 ++--
 .github/ISSUE_TEMPLATE/enhancement.md     | 24 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md |  3 ++-
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8b83cbe59..c04852663 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve Invidious
+about: Create a bug report to help us improve Invidious
 title: '[Bug] '
 labels: bug
 assignees: ''
@@ -9,7 +9,7 @@ assignees: ''
 
 <!-- Please use the search function to check if the bug you found has already been reported by someone else -->
 <!-- If you want to suggest a new feature please use "Feature request" instead -->
-<!-- If you want to suggest an enhancement to a new feature please use "Enhancement" instead -->
+<!-- If you want to suggest an enhancement to an existing feature please use "Enhancement" instead -->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 000000000..7823e1df1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,24 @@
+---
+name: Enhancement
+about: Suggest an enhancement for an existing feature
+title: '[Enhancement] '
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- Please use the search function to check if the desired function has already been requested by someone else -->
+ <!-- If you want to suggest a new feature please use "Feature request" instead --> 
+<!-- If you want to report a bug, please use "Bug report" instead -->
+
+**Is your enhancement request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the enhancement here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index b308eb0da..59692a512 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,12 +2,13 @@
 name: Feature request
 about: Suggest an idea for this project
 title: '[Feature request] '
-labels: enhancement
+labels: feature-request
 assignees: ''
 
 ---
 
 <!-- Please use the search function to check if the desired function has already been requested by someone else -->
+<!-- If you want to suggest an enhancement to an existing feature please use "Enhancement" instead -->
 <!-- If you want to report a bug, please use "Bug report" instead -->
 
 **Is your feature request related to a problem? Please describe.**