From 93226055c8a13e03a096be50e764f79e227554a7 Mon Sep 17 00:00:00 2001
From: sakkamade <62730422+sakkamade@users.noreply.github.com>
Date: Sat, 14 Aug 2021 22:57:34 +0000
Subject: [PATCH] Improve bug report and feature request templates

---
 .github/ISSUE_TEMPLATE/bug_report.md       | 35 --------------
 .github/ISSUE_TEMPLATE/bug_report.yml      | 53 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml          |  1 +
 .github/ISSUE_TEMPLATE/feature_request.md  | 10 ----
 .github/ISSUE_TEMPLATE/feature_request.yml | 12 +++++
 5 files changed, 66 insertions(+), 45 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml 
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 5137ec76d..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: '[BUG]: '
-labels: Type-Defect
-assignees: martinrotter
----
-<!---
-Dear RSS Guard contributor, please RESPECT this template. Also, you might be
-interested in reading this: http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
-
-Also, ALWAYS, ALWAYS, ALWAYS attach DEBUG LOG to your bug report!!!
-See here how to generate it:
-    https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#generating-debug-log-file
--->
-
-#### Brief description of the issue.
-<!--- Write your description here. Remove this line, pls. -->
-
-#### How to reproduce the bug?
-1. 
-2. 
-3. 
-
-#### What was the expected result?
-<!--- Write expected results of above reproduction steps here. Remove this line, pls. -->
-
-#### What actually happened?
-<!--- Write the actual result here. Remove this line, pls. -->
-
-#### Other information
-<!--- Write any other supplementary information here. Remove this line, pls. -->
-
-* OS:
-* RSS Guard version:
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..56328ee9f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,53 @@
+name: Bug Report
+description: Create a report to help us improve
+title: '[BUG]: '
+labels: Type-Defect
+assignees: martinrotter
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Dear RSS Guard contributor, please RESPECT this template. You might be interested in reading [www.chiark.greenend.org.uk](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
+        Also, ALWAYS, ALWAYS, ALWAYS attach DEBUG LOG to your bug report!!!
+        How to generate it see [here](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#command-line-interface).
+  - type: textarea
+    attributes:
+      label: Brief description of the issue
+      description: Write your description here.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: How to reproduce the bug?
+      placeholder: |
+        1. (First Step)
+        2. (Second Step)
+        3. (etc.)
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What was the expected result?
+      description: Write expected results of above reproduction steps here.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What actually happened?
+      description: Write the actual result here.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other information
+      description: Write any other supplementary information here.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Operating system and version
+      value: |
+        * OS:
+        * RSS Guard version:
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml  b/.github/ISSUE_TEMPLATE/config.yml 
new file mode 100644
index 000000000..3ba13e0ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml 	
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 76f84955d..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: '[FR]: '
-labels: Type-Enhancement
-assignees: martinrotter
----
-#### Brief description of the feature request.
-
-<!--- Write your description here. Remove this line, pls. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..b5d3f4403
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,12 @@
+name: Feature request
+description: Suggest an idea for this project
+title: '[FR]: '
+labels: Type-Enhancement
+assignees: martinrotter
+body:
+  - type: textarea
+    attributes:
+      label: Brief description of the feature request
+      description: Write your description here.
+    validations:
+      required: true