From 2f2111d576cafca9be8c4851f0b81dc9f66057c6 Mon Sep 17 00:00:00 2001
From: rxdn <29165304+rxdn@users.noreply.github.com>
Date: Fri, 13 Aug 2021 13:03:11 +0100
Subject: [PATCH] Edit fixes

---
 app/http/endpoints/root/webchatws.go                |  2 --
 frontend/src/components/PanelDropdown.svelte        | 11 +++++++++++
 .../components/manage/MultiPanelCreationForm.svelte | 13 ++++++++++++-
 .../src/components/manage/PanelCreationForm.svelte  |  4 +++-
 utils/sessionutils.go                               |  2 --
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/http/endpoints/root/webchatws.go b/app/http/endpoints/root/webchatws.go
index d188e9d..0126861 100644
--- a/app/http/endpoints/root/webchatws.go
+++ b/app/http/endpoints/root/webchatws.go
@@ -162,7 +162,6 @@ func WebChatWs(ctx *gin.Context) {
 			}
 
 			if permLevel < permission.Admin {
-				fmt.Println(3)
 				conn.Close()
 				return
 			}
@@ -184,7 +183,6 @@ func WebChatWs(ctx *gin.Context) {
 			}
 
 			if premiumTier == premium.None {
-				fmt.Println(4)
 				conn.Close()
 				return
 			}
diff --git a/frontend/src/components/PanelDropdown.svelte b/frontend/src/components/PanelDropdown.svelte
index 4d0a355..5e0a84f 100644
--- a/frontend/src/components/PanelDropdown.svelte
+++ b/frontend/src/components/PanelDropdown.svelte
@@ -1,3 +1,5 @@
+
+
 <label class="form-label">{label}</label>
 <div class="multiselect-super">
   <Select placeholder="Select..." items={panels} optionIdentifier="panel_id" getOptionLabel={labelMapper}
@@ -7,6 +9,7 @@
 
 <script>
     import Select from 'svelte-select';
+    import {onMount} from "svelte";
 
     export let label;
     export let panels = [];
@@ -25,4 +28,12 @@
 
         selected = panelsRaw.map((panel) => panel.panel_id);
     }
+
+    function applyOverrides() {
+        panelsRaw = panels.filter((p) => selected.includes(p.panel_id));
+    }
+
+    onMount(() => {
+        applyOverrides();
+    });
 </script>
\ No newline at end of file
diff --git a/frontend/src/components/manage/MultiPanelCreationForm.svelte b/frontend/src/components/manage/MultiPanelCreationForm.svelte
index 2cdfa79..5502e6a 100644
--- a/frontend/src/components/manage/MultiPanelCreationForm.svelte
+++ b/frontend/src/components/manage/MultiPanelCreationForm.svelte
@@ -25,9 +25,10 @@
     import Input from "../form/Input.svelte";
     import Textarea from "../form/Textarea.svelte";
     import Colour from "../form/Colour.svelte";
-    import {colourToInt} from "../../js/util";
+    import {colourToInt, intToColour} from "../../js/util";
     import ChannelDropdown from "../ChannelDropdown.svelte";
     import PanelDropdown from "../PanelDropdown.svelte";
+    import {onMount} from "svelte";
 
     export let data = {};
 
@@ -49,6 +50,16 @@
     function updateColour() {
         data.colour = colourToInt(tempColour);
     }
+
+    function applyOverrides() {
+        tempColour = intToColour(data.colour);
+    }
+
+    onMount(() => {
+        if (!seedDefault) {
+            applyOverrides();
+        }
+    })
 </script>
 
 <style>
diff --git a/frontend/src/components/manage/PanelCreationForm.svelte b/frontend/src/components/manage/PanelCreationForm.svelte
index 97f2517..6f93847 100644
--- a/frontend/src/components/manage/PanelCreationForm.svelte
+++ b/frontend/src/components/manage/PanelCreationForm.svelte
@@ -67,7 +67,7 @@
     import ChannelDropdown from "../ChannelDropdown.svelte";
 
     import {createEventDispatcher, onMount} from 'svelte';
-    import {colourToInt} from "../../js/util";
+    import {colourToInt, intToColour} from "../../js/util";
     import CategoryDropdown from "../CategoryDropdown.svelte";
     import EmojiInput from "../form/EmojiInput.svelte";
     import Select from 'svelte-select';
@@ -175,6 +175,8 @@
         if (data.mentions) {
             $: data.mentions.forEach((id) => mentionsRaw.push(mentionValues.find((val) => val.value === id)));
         }
+
+        tempColour = intToColour(data.colour);
     }
 
     onMount(() => {
diff --git a/utils/sessionutils.go b/utils/sessionutils.go
index 3ef510f..90e7a20 100644
--- a/utils/sessionutils.go
+++ b/utils/sessionutils.go
@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"fmt"
 	"github.com/gin-gonic/contrib/sessions"
 )
 
@@ -9,7 +8,6 @@ func IsLoggedIn(store sessions.Session) bool {
 	requiredKeys := []string{"access_token", "expiry", "refresh_token", "userid", "name", "avatar", "csrf"}
 	for _, key := range requiredKeys {
 		if store.Get(key) == nil {
-			fmt.Println(key)
 			return false
 		}
 	}