refactor: rename mainFlex to layout

cmd/guilds_tree.go

@@ -179,8 +179,8 @@ PARENT_CHANNELS:
 func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 	gt.selectedChannelID = 0
 
-	mainFlex.messagesText.reset()
-	mainFlex.messageInput.reset()
+	layout.messagesText.reset()
+	layout.messageInput.reset()
 
 	if len(n.GetChildren()) != 0 {
 		n.SetExpanded(!n.IsExpanded())
@@ -201,8 +201,8 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 
 		gt.createChannelNodes(n, cs)
 	case discord.ChannelID:
-		mainFlex.messagesText.drawMsgs(ref)
-		mainFlex.messagesText.ScrollToEnd()
+		layout.messagesText.drawMsgs(ref)
+		layout.messagesText.ScrollToEnd()
 
 		c, err := discordState.Cabinet.Channel(ref)
 		if err != nil {
@@ -210,10 +210,10 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 			return
 		}
 
-		mainFlex.messagesText.SetTitle(gt.channelToString(*c))
+		layout.messagesText.SetTitle(gt.channelToString(*c))
 
 		gt.selectedChannelID = ref
-		gt.app.SetFocus(mainFlex.messageInput)
+		gt.app.SetFocus(layout.messageInput)
 	case nil: // Direct messages
 		cs, err := discordState.PrivateChannels()
 		if err != nil {

cmd/message_input.go

@@ -76,7 +76,7 @@ func (mi *MessageInput) onInputCapture(event *tcell.EventKey) *tcell.EventKey {
 }
 
 func (mi *MessageInput) send() {
-	if !mainFlex.guildsTree.selectedChannelID.IsValid() {
+	if !layout.guildsTree.selectedChannelID.IsValid() {
 		return
 	}
 
@@ -97,13 +97,13 @@ func (mi *MessageInput) send() {
 		}
 
 		go func() {
-			if _, err := discordState.SendMessageComplex(mainFlex.guildsTree.selectedChannelID, data); err != nil {
+			if _, err := discordState.SendMessageComplex(layout.guildsTree.selectedChannelID, data); err != nil {
 				slog.Error("failed to send message", "err", err)
 			}
 		}()
 	} else {
 		go func() {
-			if _, err := discordState.SendMessage(mainFlex.guildsTree.selectedChannelID, text); err != nil {
+			if _, err := discordState.SendMessage(layout.guildsTree.selectedChannelID, text); err != nil {
 				slog.Error("failed to send message", "err", err)
 			}
 		}()
@@ -112,8 +112,8 @@ func (mi *MessageInput) send() {
 	mi.replyMessageID = 0
 	mi.reset()
 
-	mainFlex.messagesText.Highlight()
-	mainFlex.messagesText.ScrollToEnd()
+	layout.messagesText.Highlight()
+	layout.messagesText.ScrollToEnd()
 }
 
 func (mi *MessageInput) editor() {

cmd/messages_text.go

@@ -73,12 +73,12 @@ func (mt *MessagesText) drawMsgs(cID discord.ChannelID) {
 	}
 
 	for _, m := range slices.Backward(ms) {
-		mainFlex.messagesText.createMessage(m)
+		layout.messagesText.createMessage(m)
 	}
 }
 
 func (mt *MessagesText) reset() {
-	mainFlex.messagesText.selectedMessageID = 0
+	layout.messagesText.selectedMessageID = 0
 
 	mt.SetTitle("")
 	mt.Clear()
@@ -172,7 +172,7 @@ func (mt *MessagesText) getSelectedMessage() (*discord.Message, error) {
 		return nil, errors.New("no message is currently selected")
 	}
 
-	msg, err := discordState.Cabinet.Message(mainFlex.guildsTree.selectedChannelID, mt.selectedMessageID)
+	msg, err := discordState.Cabinet.Message(layout.guildsTree.selectedChannelID, mt.selectedMessageID)
 	if err != nil {
 		return nil, fmt.Errorf("could not retrieve selected message: %w", err)
 	}
@@ -181,7 +181,7 @@ func (mt *MessagesText) getSelectedMessage() (*discord.Message, error) {
 }
 
 func (mt *MessagesText) getSelectedMessageIndex() (int, error) {
-	ms, err := discordState.Cabinet.Messages(mainFlex.guildsTree.selectedChannelID)
+	ms, err := discordState.Cabinet.Messages(layout.guildsTree.selectedChannelID)
 	if err != nil {
 		return -1, err
 	}
@@ -221,9 +221,9 @@ func (mt *MessagesText) onInputCapture(event *tcell.EventKey) *tcell.EventKey {
 }
 
 func (mt *MessagesText) _select(name string) {
-	ms, err := discordState.Cabinet.Messages(mainFlex.guildsTree.selectedChannelID)
+	ms, err := discordState.Cabinet.Messages(layout.guildsTree.selectedChannelID)
 	if err != nil {
-		slog.Error("failed to get messages", "err", err, "channel_id", mainFlex.guildsTree.selectedChannelID)
+		slog.Error("failed to get messages", "err", err, "channel_id", layout.guildsTree.selectedChannelID)
 		return
 	}
 
@@ -347,9 +347,9 @@ func (mt *MessagesText) reply(mention bool) {
 	}
 
 	title += msg.Author.Tag()
-	mainFlex.messageInput.SetTitle(title)
-	mainFlex.messageInput.replyMessageID = mt.selectedMessageID
-	mt.app.SetFocus(mainFlex.messageInput)
+	layout.messageInput.SetTitle(title)
+	layout.messageInput.replyMessageID = mt.selectedMessageID
+	mt.app.SetFocus(layout.messageInput)
 }
 
 func (mt *MessagesText) delete() {
@@ -361,7 +361,7 @@ func (mt *MessagesText) delete() {
 
 	clientID := discordState.Ready().User.ID
 	if msg.GuildID.IsValid() {
-		ps, err := discordState.Permissions(mainFlex.guildsTree.selectedChannelID, discordState.Ready().User.ID)
+		ps, err := discordState.Permissions(layout.guildsTree.selectedChannelID, discordState.Ready().User.ID)
 		if err != nil {
 			return
 		}
@@ -375,25 +375,25 @@ func (mt *MessagesText) delete() {
 		}
 	}
 
-	if err := discordState.DeleteMessage(mainFlex.guildsTree.selectedChannelID, msg.ID, ""); err != nil {
-		slog.Error("failed to delete message", "err", err, "channel_id", mainFlex.guildsTree.selectedChannelID, "message_id", msg.ID)
+	if err := discordState.DeleteMessage(layout.guildsTree.selectedChannelID, msg.ID, ""); err != nil {
+		slog.Error("failed to delete message", "err", err, "channel_id", layout.guildsTree.selectedChannelID, "message_id", msg.ID)
 		return
 	}
 
-	if err := discordState.MessageRemove(mainFlex.guildsTree.selectedChannelID, msg.ID); err != nil {
-		slog.Error("failed to delete message", "err", err, "channel_id", mainFlex.guildsTree.selectedChannelID, "message_id", msg.ID)
+	if err := discordState.MessageRemove(layout.guildsTree.selectedChannelID, msg.ID); err != nil {
+		slog.Error("failed to delete message", "err", err, "channel_id", layout.guildsTree.selectedChannelID, "message_id", msg.ID)
 		return
 	}
 
-	ms, err := discordState.Cabinet.Messages(mainFlex.guildsTree.selectedChannelID)
+	ms, err := discordState.Cabinet.Messages(layout.guildsTree.selectedChannelID)
 	if err != nil {
-		slog.Error("failed to delete message", "err", err, "channel_id", mainFlex.guildsTree.selectedChannelID)
+		slog.Error("failed to delete message", "err", err, "channel_id", layout.guildsTree.selectedChannelID)
 		return
 	}
 
 	mt.Clear()
 
 	for _, m := range slices.Backward(ms) {
-		mainFlex.messagesText.createMessage(m)
+		layout.messagesText.createMessage(m)
 	}
 }

cmd/run.go

@@ -7,7 +7,7 @@ import (
 
 var (
 	discordState *State
-	mainFlex     *Layout
+	layout       *Layout
 )
 
 func Run(token string) error {
@@ -20,6 +20,6 @@ func Run(token string) error {
 		return err
 	}
 
-	mainFlex = newLayout(cfg)
-	return mainFlex.run(token)
+	layout = newLayout(cfg)
+	return layout.run(token)
 }

cmd/state.go

@@ -61,7 +61,7 @@ func (s *State) onRequest(r httpdriver.Request) error {
 }
 
 func (s *State) onReady(r *gateway.ReadyEvent) {
-	root := mainFlex.guildsTree.GetRoot()
+	root := layout.guildsTree.GetRoot()
 	dmNode := tview.NewTreeNode("Direct Messages")
 	dmNode.SetColor(tcell.GetColor(s.cfg.Theme.GuildsTree.PrivateChannelColor))
 	root.AddChild(dmNode)
@@ -75,32 +75,32 @@ func (s *State) onReady(r *gateway.ReadyEvent) {
 		}
 		folderGuildIds = append(folderGuildIds, folder.GuildIDs...)
 
-		mainFlex.guildsTree.createFolderNode(folder)
+		layout.guildsTree.createFolderNode(folder)
 	}
 
 	// add orphan (without folder) guilds to guilds tree
 	for _, guild := range r.Guilds {
 		if !slices.Contains(folderGuildIds, guild.ID) {
-			mainFlex.guildsTree.createGuildNode(root, guild.Guild)
+			layout.guildsTree.createGuildNode(root, guild.Guild)
 		}
 	}
 
-	mainFlex.guildsTree.SetCurrentNode(root)
-	s.app.SetFocus(mainFlex.guildsTree)
+	layout.guildsTree.SetCurrentNode(root)
+	s.app.SetFocus(layout.guildsTree)
 }
 
 func (s *State) onMessageCreate(m *gateway.MessageCreateEvent) {
-	if mainFlex.guildsTree.selectedChannelID.IsValid() && mainFlex.guildsTree.selectedChannelID == m.ChannelID {
-		mainFlex.messagesText.createMessage(m.Message)
+	if layout.guildsTree.selectedChannelID.IsValid() && layout.guildsTree.selectedChannelID == m.ChannelID {
+		layout.messagesText.createMessage(m.Message)
 	}
 }
 
 func (s *State) onMessageDelete(m *gateway.MessageDeleteEvent) {
-	if mainFlex.guildsTree.selectedChannelID == m.ChannelID {
-		mainFlex.messagesText.selectedMessageID = 0
-		mainFlex.messagesText.Highlight()
-		mainFlex.messagesText.Clear()
+	if layout.guildsTree.selectedChannelID == m.ChannelID {
+		layout.messagesText.selectedMessageID = 0
+		layout.messagesText.Highlight()
+		layout.messagesText.Clear()
 
-		mainFlex.messagesText.drawMsgs(m.ChannelID)
+		layout.messagesText.drawMsgs(m.ChannelID)
 	}
 }