From 0b493f41dc658d887ca30ccc26775b8f8fda0dfe Mon Sep 17 00:00:00 2001
From: Scott Brown <71395931+xscottxbrownx@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:44:00 -0800
Subject: [PATCH 1/3] Removing "required" from line 13 CUSTOMEMBED.go (#22)

* Removing "required" from line 13 CUSTOMEMBED.go

* updating label: archive->trasncripts

Co-authored-by: Ryan <29165304+rxdn@users.noreply.github.com>
---
 frontend/src/components/manage/SettingsCard.svelte | 2 +-
 utils/types/customembed.go                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/manage/SettingsCard.svelte b/frontend/src/components/manage/SettingsCard.svelte
index b3512ef..4000be1 100644
--- a/frontend/src/components/manage/SettingsCard.svelte
+++ b/frontend/src/components/manage/SettingsCard.svelte
@@ -45,7 +45,7 @@
           <span slot="header">Tickets</span>
           <div slot="content" class="col-1">
             <div class="row">
-              <ChannelDropdown label="Archive Channel" col4 channels={channels} withNull={true}
+              <ChannelDropdown label="Transcripts Channel" col4 channels={channels} withNull={true}
                                bind:value={data.archive_channel}/>
               <Dropdown label="Overflow Category" col4 bind:value={data.overflow_category_id}>
                 <option value=-1>Disabled</option>
diff --git a/utils/types/customembed.go b/utils/types/customembed.go
index d02062d..93ed3e8 100644
--- a/utils/types/customembed.go
+++ b/utils/types/customembed.go
@@ -10,7 +10,7 @@ type CustomEmbed struct {
 	Title        *string        `json:"title" validate:"omitempty,min=1,max=255"`
 	Description  *string        `json:"description" validate:"omitempty,min=1,max=4096"`
 	Url          *string        `json:"url" validate:"omitempty,url,max=255"`
-	Colour       Colour         `json:"colour" validate:"required,gte=0,lte=16777215"`
+	Colour       Colour         `json:"colour" validate:"gte=0,lte=16777215"`
 	Author       Author         `json:"author" validate:"dive"`
 	ImageUrl     *string        `json:"image_url" validate:"omitempty,url,max=255"`
 	ThumbnailUrl *string        `json:"thumbnail_url" validate:"omitempty,url,max=255"`

From b24808927add52b13102b963bef6ec72924e370c Mon Sep 17 00:00:00 2001
From: Ryan <29165304+rxdn@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:47:01 +0000
Subject: [PATCH 2/3] Update Sidebar.svelte

---
 frontend/src/includes/Sidebar.svelte | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/includes/Sidebar.svelte b/frontend/src/includes/Sidebar.svelte
index 749021b..f3a5fa8 100644
--- a/frontend/src/includes/Sidebar.svelte
+++ b/frontend/src/includes/Sidebar.svelte
@@ -86,7 +86,7 @@
         align-items: center;
         width: 100%;
         cursor: pointer;
-        padding: 5px 0 5px 0;
+        padding: 5px 4%;
     }
 
     .sidebar-element:hover {
@@ -107,7 +107,6 @@
         align-items: center;
         color: white !important;
         font-size: 18px;
-        margin-left: 4%;
         text-decoration: none;
     }
 
@@ -172,11 +171,10 @@
 
         :global(.sidebar-link) {
             width: unset;
-            margin-left: 0 !important;
         }
 
         .user-element {
             display: none;
         }
     }
-</style>
\ No newline at end of file
+</style>

From a844ddf2b5cd087e053f96ef761c7f566a001292 Mon Sep 17 00:00:00 2001
From: Ryan <29165304+rxdn@users.noreply.github.com>
Date: Sat, 11 Mar 2023 19:08:41 +0000
Subject: [PATCH 3/3] Add placeholder

---
 app/http/endpoints/api/panel/panelcreate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/http/endpoints/api/panel/panelcreate.go b/app/http/endpoints/api/panel/panelcreate.go
index 074e2bd..2e8c842 100644
--- a/app/http/endpoints/api/panel/panelcreate.go
+++ b/app/http/endpoints/api/panel/panelcreate.go
@@ -513,7 +513,7 @@ func (p *panelBody) verifyNamingScheme() bool {
 	}
 
 	// Validate placeholders used
-	validPlaceholders := []string{"id", "username", "nickname"}
+	validPlaceholders := []string{"id", "username", "nickname", "id_padded"}
 	for _, match := range placeholderPattern.FindAllStringSubmatch(*p.NamingScheme, -1) {
 		if len(match) < 2 { // Infallible
 			return false