From 58cf736b9a3ff0b259671a8d68fb9d624a7b9b75 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Fri, 10 Feb 2023 21:51:31 +0000
Subject: [PATCH 1/3] Converted to issue form

---
 .gitea/ISSUE_TEMPLATE/instance.md  | 39 ------------------------
 .gitea/ISSUE_TEMPLATE/instance.yml | 49 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 39 deletions(-)
 delete mode 100644 .gitea/ISSUE_TEMPLATE/instance.md
 create mode 100644 .gitea/ISSUE_TEMPLATE/instance.yml

diff --git a/.gitea/ISSUE_TEMPLATE/instance.md b/.gitea/ISSUE_TEMPLATE/instance.md
deleted file mode 100644
index 31c25a8..0000000
--- a/.gitea/ISSUE_TEMPLATE/instance.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-
-name: "Instance Request"
-about: "Have an instance you want to add to the list? Use this template."
-title: "[New Instance] "
-ref: "main"
-labels:
-
-- instance
-
----
-
-<!-- Please fill out the template, or your instance will not be added. If this is not an instance request, replace all of this completely -->
-
-## Instance Request
-
-<!-- Fill out your ISP's name if you are hosting at home. -->
-Where is your server hosted? (e.g. OVHcloud, Hetzner, Telenor, etc.):
-
-<!-- Fill out your server's location. -->
-Where is your server located? (e.g. Germany, Norway, etc.):
-
-<!-- Fill out if you proxy your instance behind Cloudflare. -->
-
-Are you using Cloudflare? (yes/no):
-
-<!-- Fill out your instance's domain name. -->
-Where can we reach your instance? (e.g. https://gh.yourdoma.in):
-
-<!-- Fill out what branch of GotHub you are using. -->
-Which branch of GotHub are you using? (e.g. master, dev, "latest" image on Docker):
-
-<!--Anything we should keep in mind?-->
-
-Anything else we should know? (e.g. if you are using a modified version of GotHub, etc.):
-
-## Contact Details
-
-<!-- Here you can put your contact information should we need to contact you privately. We recommend Matrix. If you don't have a contact method, or don't want your contact method public, tell us. -->
\ No newline at end of file
diff --git a/.gitea/ISSUE_TEMPLATE/instance.yml b/.gitea/ISSUE_TEMPLATE/instance.yml
new file mode 100644
index 0000000..ec658dc
--- /dev/null
+++ b/.gitea/ISSUE_TEMPLATE/instance.yml
@@ -0,0 +1,49 @@
+name: "Instance Request"
+about: "Have an instance you want to add to the list? Use this template."
+title: "[New Instance] "
+labels:
+- instance
+body:
+  - type: input
+    attributes:
+      label: Server Host
+      description: Where is your server hosted? (Input your ISP's name if you are hosting at home)
+      placeholder: OVHcloud, Hetzner, Telenor, etc. 
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Location
+      description: Which country is your server hosted?
+      placeholder: Germany, Norway, France etc.
+  - type: checkboxes
+    attributes:
+      label: Cloudflare
+      description: Is your server using Cloudflare's proxy/DDoS protection?
+      options:
+        - label: My server uses Cloudflare's proxy/DDoS protection
+  - type: input
+    attributes:
+      label: Instance URL
+      description: What is the URL of your instance?
+      placeholder: https://gothub.example.org
+      validations:
+        required: true
+  - type: dropdown
+    attributes:
+      label: Which branch of GotHub are you using?
+      options:
+        - master 
+        - dev
+        - \"latest\" docker image
+  - type: textarea
+    attributes:
+      label: Other details
+      description: Anything else we should know?
+      placeholder: We use a custom fork over at https://git.example.org/foo/gothub
+  - type: input
+    attributes:
+      label: Contact details
+      description: Input your contact information should we need to contact you privately. We recommend Matrix. If you don't have a contact method, or don't want your contact method public, tell us.
+      placeholder: \@foo:example.org
+      
\ No newline at end of file

From 4e7c3c689561945e7a864c06c0b147764318a3e7 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Fri, 10 Feb 2023 21:57:18 +0000
Subject: [PATCH 2/3] Escaped chars properly

---
 .gitea/ISSUE_TEMPLATE/instance.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/ISSUE_TEMPLATE/instance.yml b/.gitea/ISSUE_TEMPLATE/instance.yml
index ec658dc..f14e5d9 100644
--- a/.gitea/ISSUE_TEMPLATE/instance.yml
+++ b/.gitea/ISSUE_TEMPLATE/instance.yml
@@ -35,7 +35,7 @@ body:
       options:
         - master 
         - dev
-        - \"latest\" docker image
+        - '"latest" docker image'
   - type: textarea
     attributes:
       label: Other details
@@ -45,5 +45,5 @@ body:
     attributes:
       label: Contact details
       description: Input your contact information should we need to contact you privately. We recommend Matrix. If you don't have a contact method, or don't want your contact method public, tell us.
-      placeholder: \@foo:example.org
+      placeholder: "@foo:example.org"
       
\ No newline at end of file

From 85660a575848e9a66f25bd2b4f3e51e7ce8202e8 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Fri, 10 Feb 2023 21:59:05 +0000
Subject: [PATCH 3/3] Fixed validators

---
 .gitea/ISSUE_TEMPLATE/instance.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitea/ISSUE_TEMPLATE/instance.yml b/.gitea/ISSUE_TEMPLATE/instance.yml
index f14e5d9..a96f3a6 100644
--- a/.gitea/ISSUE_TEMPLATE/instance.yml
+++ b/.gitea/ISSUE_TEMPLATE/instance.yml
@@ -16,6 +16,8 @@ body:
       label: Location
       description: Which country is your server hosted?
       placeholder: Germany, Norway, France etc.
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Cloudflare
@@ -27,8 +29,8 @@ body:
       label: Instance URL
       description: What is the URL of your instance?
       placeholder: https://gothub.example.org
-      validations:
-        required: true
+    validations:
+      required: true
   - type: dropdown
     attributes:
       label: Which branch of GotHub are you using?