From 9150ec6311ec7de5be4fde18baedf5ef8edb01f7 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Fri, 31 Dec 2021 19:09:29 +0100
Subject: [PATCH] [editor] Display disconnected status instead of error

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 configEditor_general.go |  9 ++++-----
 src/generalConfig.vue   | 34 +++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/configEditor_general.go b/configEditor_general.go
index 720266d..45deb8a 100644
--- a/configEditor_general.go
+++ b/configEditor_general.go
@@ -18,7 +18,7 @@ import (
 type (
 	configEditorGeneralConfig struct {
 		BotEditors       []string        `json:"bot_editors"`
-		BotName          string          `json:"bot_name"`
+		BotName          *string         `json:"bot_name,omitempty"`
 		Channels         []string        `json:"channels"`
 		ChannelHasScopes map[string]bool `json:"channel_has_scopes"`
 	}
@@ -189,10 +189,9 @@ func configEditorHandleGeneralGet(w http.ResponseWriter, r *http.Request) {
 		elevated[ch] = store.UserHasGrantedScopes(ch, channelDefaultScopes...)
 	}
 
-	uName, err := twitchClient.GetAuthorizedUsername()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
+	var uName *string
+	if n, err := twitchClient.GetAuthorizedUsername(); err == nil {
+		uName = &n
 	}
 
 	if err := json.NewEncoder(w).Encode(configEditorGeneralConfig{
diff --git a/src/generalConfig.vue b/src/generalConfig.vue
index 3877e66..9c52ae5 100644
--- a/src/generalConfig.vue
+++ b/src/generalConfig.vue
@@ -222,13 +222,33 @@
               />
               Bot Connection
             </span>
-            <code id="botUserName">{{ generalConfig.bot_name }}</code>
-            <b-tooltip
-              target="botUserName"
-              triggers="hover"
-            >
-              Twitch Login-Name of the bot user currently authorized
-            </b-tooltip>
+            <template v-if="generalConfig.bot_name">
+              <code
+                id="botUserName"
+              >
+                {{ generalConfig.bot_name }}
+                <b-tooltip
+                  target="botUserName"
+                  triggers="hover"
+                >
+                  Twitch Login-Name of the bot user currently authorized
+                </b-tooltip>
+              </code>
+            </template>
+            <template v-else>
+              <font-awesome-icon
+                id="botUserNameDC"
+                fixed-width
+                class="mr-1 text-danger"
+                :icon="['fas', 'unlink']"
+              />
+              <b-tooltip
+                target="botUserNameDC"
+                triggers="hover"
+              >
+                Bot is not currently authorized!
+              </b-tooltip>
+            </template>
           </b-card-header>
 
           <b-card-body>