From 4fbf35fe656c9a8e7ad7547c15b517ec19ff961f Mon Sep 17 00:00:00 2001
From: ayntgl <ayntgl@gmail.com>
Date: Tue, 1 Mar 2022 20:34:09 +0400
Subject: [PATCH] fix(ui): incorrect default keybinding value for external
 editor

---
 config/keybindings.go | 26 ++++++++++++++------------
 ui/messages.go        |  4 ++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/config/keybindings.go b/config/keybindings.go
index 598d1d5..d9715ec 100644
--- a/config/keybindings.go
+++ b/config/keybindings.go
@@ -1,12 +1,13 @@
 package config
 
 type KeybindingsConfig struct {
-	ToggleGuildsList         string `toml:"toggle_guilds_list"`
-	ToggleChannelsTreeView   string `toml:"toggle_channels_tree_view"`
-	ToggleMessagesTextView   string `toml:"toggle_messages_text_view"`
-	ToggleMessageInputField  string `toml:"toggle_message_input_field"`
-	ToggleMessageActionsList string `toml:"toggle_message_actions_list"`
-	ToggleExternalEditor     string `toml:"toggle_external_editor"`
+	ToggleGuildsList        string `toml:"toggle_guilds_list"`
+	ToggleChannelsTreeView  string `toml:"toggle_channels_tree_view"`
+	ToggleMessagesTextView  string `toml:"toggle_messages_text_view"`
+	ToggleMessageInputField string `toml:"toggle_message_input_field"`
+
+	OpenMessageActionsList string `toml:"open_message_actions_list"`
+	OpenExternalEditor     string `toml:"open_external_editor"`
 
 	SelectPreviousMessage string `toml:"select_previous_message"`
 	SelectNextMessage     string `toml:"select_next_message"`
@@ -16,12 +17,13 @@ type KeybindingsConfig struct {
 
 func newKeybindingsConfig() KeybindingsConfig {
 	return KeybindingsConfig{
-		ToggleGuildsList:         "Rune[g]",
-		ToggleChannelsTreeView:   "Rune[c]",
-		ToggleMessagesTextView:   "Rune[m]",
-		ToggleMessageInputField:  "Rune[i]",
-		ToggleMessageActionsList: "Rune[a]",
-		ToggleExternalEditor:     "Ctrl-E",
+		ToggleGuildsList:        "Rune[g]",
+		ToggleChannelsTreeView:  "Rune[c]",
+		ToggleMessagesTextView:  "Rune[m]",
+		ToggleMessageInputField: "Rune[i]",
+
+		OpenMessageActionsList: "Rune[a]",
+		OpenExternalEditor:     "Ctrl+E",
 
 		SelectPreviousMessage: "Up",
 		SelectNextMessage:     "Down",
diff --git a/ui/messages.go b/ui/messages.go
index b171097..c45815f 100644
--- a/ui/messages.go
+++ b/ui/messages.go
@@ -91,7 +91,7 @@ func (mtv *MessagesTextView) onInputCapture(e *tcell.EventKey) *tcell.EventKey {
 			ScrollToHighlight()
 
 		return nil
-	case mtv.app.Config.Keybindings.ToggleMessageActionsList:
+	case mtv.app.Config.Keybindings.OpenMessageActionsList:
 		messageActionsList := tview.NewList()
 
 		hs := mtv.app.MessagesTextView.GetHighlights()
@@ -255,7 +255,7 @@ func (mi *MessageInputField) onInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		mi.app.MessagesTextView.Highlight()
 
 		return nil
-	case mi.app.Config.Keybindings.ToggleExternalEditor:
+	case mi.app.Config.Keybindings.OpenExternalEditor:
 		e := os.Getenv("EDITOR")
 		if e == "" {
 			return nil