From 09eb623b6a3a55143df2d0ecd5763fdc500049ec Mon Sep 17 00:00:00 2001
From: Ayyan <119342035+ayn2op@users.noreply.github.com>
Date: Sun, 31 Mar 2024 17:58:34 +0530
Subject: [PATCH] Show non-nested guilds if no guild folders are present (#377)

---
 cmd/state.go             | 29 ++++++++++++++++++-----------
 internal/config/theme.go |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/cmd/state.go b/cmd/state.go
index 61cdf60..b517bcf 100644
--- a/cmd/state.go
+++ b/cmd/state.go
@@ -59,18 +59,25 @@ func (s *State) onReady(r *gateway.ReadyEvent) {
 	dmNode := tview.NewTreeNode("Direct Messages")
 	mainFlex.guildsTree.root.AddChild(dmNode)
 
-	for _, gf := range r.UserSettings.GuildFolders {
-		/// If the ID of the guild folder is zero, the guild folder only contains single guild.
-		if gf.ID == 0 {
-			g, err := s.Cabinet.Guild(gf.GuildIDs[0])
-			if err != nil {
-				log.Println(err)
-				continue
-			}
+	folders := r.UserSettings.GuildFolders
+	if len(folders) == 0 {
+		for _, g := range r.Guilds {
+			mainFlex.guildsTree.createGuildNode(mainFlex.guildsTree.root, g.Guild)
+		}
+	} else {
+		for _, gf := range folders {
+			// If the ID of the guild folder is zero, the guild folder only contains single guild.
+			if gf.ID == 0 {
+				g, err := s.Cabinet.Guild(gf.GuildIDs[0])
+				if err != nil {
+					log.Println(err)
+					continue
+				}
 
-			mainFlex.guildsTree.createGuildNode(mainFlex.guildsTree.root, *g)
-		} else {
-			mainFlex.guildsTree.createGuildFolderNode(mainFlex.guildsTree.root, gf)
+				mainFlex.guildsTree.createGuildNode(mainFlex.guildsTree.root, *g)
+			} else {
+				mainFlex.guildsTree.createGuildFolderNode(mainFlex.guildsTree.root, gf)
+			}
 		}
 	}
 
diff --git a/internal/config/theme.go b/internal/config/theme.go
index 9e8907f..ea1071d 100644
--- a/internal/config/theme.go
+++ b/internal/config/theme.go
@@ -6,7 +6,7 @@ type (
 	Theme struct {
 		Border        bool   `toml:"border"`
 		BorderColor   string `toml:"border_color"`
-		BorderPadding [4]int `toml:"border_padding,flow"`
+		BorderPadding [4]int `toml:"border_padding"`
 
 		TitleColor      string `toml:"title_color"`
 		BackgroundColor string `toml:"background_color"`