From 69007026c2c272cf8ef969a555b1d5bbc585c3a5 Mon Sep 17 00:00:00 2001
From: ayntgl <ayntgl@gmail.com>
Date: Tue, 12 Oct 2021 22:37:00 +0400
Subject: [PATCH] Convert snake_case config fields to TitleCase

---
 config.go | 68 +++++++++++++++++++++++++++----------------------------
 ui.go     | 14 ++++++------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/config.go b/config.go
index 53f73d6..f211552 100644
--- a/config.go
+++ b/config.go
@@ -9,71 +9,71 @@ import (
 var conf *config
 
 type keybindingsChannelsTree struct {
-	Focus string `toml:"focus"`
+	Focus string
 }
 
-type keybindingsMessagesTextView struct {
-	Focus          string `toml:"focus"`
-	SelectPrevious string `toml:"select_previous"`
-	SelectNext     string `toml:"select_next"`
-	SelectFirst    string `toml:"select_first"`
-	SelectLast     string `toml:"select_last"`
-	Reply          string `toml:"reply"`
-	ReplyMention   string `toml:"reply_mention"`
+type keybindingsMessagesView struct {
+	Focus          string
+	SelectPrevious string
+	SelectNext     string
+	SelectFirst    string
+	SelectLast     string
+	Reply          string
+	ReplyMention   string
 }
 
 type keybindingsMessageInputField struct {
-	Focus string `toml:"focus"`
+	Focus string
 }
 
 type keybindings struct {
-	ChannelsTree      keybindingsChannelsTree      `toml:"channels_tree"`
-	MessagesTextView  keybindingsMessagesTextView  `toml:"messages_textview"`
-	MessageInputField keybindingsMessageInputField `toml:"message_inputfield"`
+	ChannelsTree      keybindingsChannelsTree
+	MessagesView      keybindingsMessagesView
+	MessageInputField keybindingsMessageInputField
 }
 
 type themeBackground struct {
 	// Main background color for primitives.
-	Primitive string `toml:"primitive"`
+	Primitive string
 	// Background color for contrasting elements.
-	Contrast string `toml:"contrast"`
+	Contrast string
 	// Background color for even more contrasting elements.
-	MoreContrast string `toml:"more_contrast"`
+	MoreContrast string
 }
 
 type themeText struct {
 	// Primary text.
-	Primary string `toml:"primary"`
+	Primary string
 	// Secondary text (e.g. labels).
-	Secondary string `toml:"secondary"`
+	Secondary string
 	// Tertiary text (e.g. subtitles, notes).
-	Tertiary string `toml:"tertiary"`
+	Tertiary string
 	// Text on primary-colored backgrounds.
-	Inverse string `toml:"inverse"`
+	Inverse string
 	// Secondary text on ContrastBackgroundColor-colored backgrounds.
-	ContrastSecondary string `toml:"contrast_secondary"`
+	ContrastSecondary string
 }
 
 type theme struct {
 	// Box borders.
-	Border string `toml:"border"`
+	Border string
 	// Box titles.
-	Title string `toml:"title"`
+	Title string
 	// Graphics.
-	Graphics string `toml:"graphics"`
+	Graphics string
 
-	Background themeBackground `toml:"background"`
-	Text       themeText       `toml:"text"`
+	Background themeBackground
+	Text       themeText
 }
 
 type config struct {
-	Token            string      `toml:"token"`
-	Mouse            bool        `toml:"mouse"`
-	Notifications    bool        `toml:"notifications"`
-	UserAgent        string      `toml:"user_agent"`
-	GetMessagesLimit int         `toml:"get_messages_limit"`
-	Theme            theme       `toml:"theme"`
-	Keybindings      keybindings `toml:"keybindings"`
+	Token            string
+	Mouse            bool
+	Notifications    bool
+	UserAgent        string
+	GetMessagesLimit int
+	Theme            theme
+	Keybindings      keybindings
 }
 
 func loadConfig() *config {
@@ -119,7 +119,7 @@ func loadConfig() *config {
 				ChannelsTree: keybindingsChannelsTree{
 					Focus: "Alt+Rune[1]",
 				},
-				MessagesTextView: keybindingsMessagesTextView{
+				MessagesView: keybindingsMessagesView{
 					Focus:          "Alt+Rune[2]",
 					SelectPrevious: "Up",
 					SelectNext:     "Down",
diff --git a/ui.go b/ui.go
index e3c86e3..1848908 100644
--- a/ui.go
+++ b/ui.go
@@ -22,7 +22,7 @@ func onAppInputCapture(e *tcell.EventKey) *tcell.EventKey {
 	switch e.Name() {
 	case conf.Keybindings.ChannelsTree.Focus:
 		app.SetFocus(channelsTree)
-	case conf.Keybindings.MessagesTextView.Focus:
+	case conf.Keybindings.MessagesView.Focus:
 		app.SetFocus(messagesView)
 	case conf.Keybindings.MessageInputField.Focus:
 		app.SetFocus(messageInputField)
@@ -189,7 +189,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 	}
 
 	switch e.Name() {
-	case conf.Keybindings.MessagesTextView.SelectPrevious:
+	case conf.Keybindings.MessagesView.SelectPrevious:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil
@@ -212,7 +212,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		}
 
 		return nil
-	case conf.Keybindings.MessagesTextView.SelectNext:
+	case conf.Keybindings.MessagesView.SelectNext:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil
@@ -235,7 +235,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		}
 
 		return nil
-	case conf.Keybindings.MessagesTextView.SelectFirst:
+	case conf.Keybindings.MessagesView.SelectFirst:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil
@@ -244,7 +244,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		messagesView.
 			Highlight(ms[0].ID).
 			ScrollToHighlight()
-	case conf.Keybindings.MessagesTextView.SelectLast:
+	case conf.Keybindings.MessagesView.SelectLast:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil
@@ -253,7 +253,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		messagesView.
 			Highlight(ms[len(ms)-1].ID).
 			ScrollToHighlight()
-	case conf.Keybindings.MessagesTextView.Reply:
+	case conf.Keybindings.MessagesView.Reply:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil
@@ -269,7 +269,7 @@ func onMessagesTextViewInputCapture(e *tcell.EventKey) *tcell.EventKey {
 			"Replying to " + selectedMessage.Author.Username,
 		)
 		app.SetFocus(messageInputField)
-	case conf.Keybindings.MessagesTextView.ReplyMention:
+	case conf.Keybindings.MessagesView.ReplyMention:
 		ms := selectedChannel.Messages
 		if len(ms) == 0 {
 			return nil