From 28964883ce8ff13315104a971b228671788090e9 Mon Sep 17 00:00:00 2001
From: rigormorrtiss <rigormorrtiss@gmail.com>
Date: Fri, 13 Aug 2021 21:34:16 +0400
Subject: [PATCH] refactor: remove unnecessary named function parameters

---
 discordo.go       | 8 +++-----
 ui/app.go         | 2 +-
 ui/dropdowns.go   | 2 +-
 ui/forms.go       | 1 +
 ui/inputfields.go | 4 +---
 ui/treeviews.go   | 3 ++-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/discordo.go b/discordo.go
index 536f4c1..0735a1d 100644
--- a/discordo.go
+++ b/discordo.go
@@ -21,7 +21,6 @@ var (
 	app               *tview.Application
 	loginForm         *tview.Form
 	guildsTreeView    *tview.TreeView
-	guildsTreeNode    *tview.TreeNode
 	messagesTextView  *tview.TextView
 	messageInputField *tview.InputField
 	mainFlex          *tview.Flex
@@ -52,10 +51,9 @@ func main() {
 	config = util.NewConfig()
 
 	app = ui.NewApp(onAppInputCapture)
-	guildsTreeNode = tview.NewTreeNode("")
-	guildsTreeView = ui.NewGuildsTreeView(guildsTreeNode, onGuildsTreeViewSelected, config.Theme)
+	guildsTreeView = ui.NewGuildsTreeView(onGuildsTreeViewSelected, config.Theme)
 	messagesTextView = ui.NewMessagesTextView(app, config.Theme)
-	messageInputField = ui.NewMessageInputField(onMessageInputFieldInputCapture, discordSession, currentChannel, config.Theme)
+	messageInputField = ui.NewMessageInputField(onMessageInputFieldInputCapture, config.Theme)
 	mainFlex = ui.NewMainFlex(guildsTreeView, messagesTextView, messageInputField)
 
 	token := util.GetItem(kr, "token")
@@ -151,7 +149,7 @@ func onSessionReady(r *gateway.ReadyEvent) {
 		gNode := tview.NewTreeNode(g.Name).
 			SetReference(g).
 			Collapse()
-		guildsTreeNode.AddChild(gNode)
+		guildsTreeView.GetRoot().AddChild(gNode)
 
 		sort.Slice(g.Channels, func(i, j int) bool {
 			return g.Channels[i].Position < g.Channels[j].Position
diff --git a/ui/app.go b/ui/app.go
index 845bd76..0773bcf 100644
--- a/ui/app.go
+++ b/ui/app.go
@@ -5,7 +5,7 @@ import (
 	"github.com/rivo/tview"
 )
 
-func NewApp(onAppInputCapture func(event *tcell.EventKey) *tcell.EventKey) *tview.Application {
+func NewApp(onAppInputCapture func(*tcell.EventKey) *tcell.EventKey) *tview.Application {
 	app := tview.NewApplication().
 		EnableMouse(true).
 		SetInputCapture(onAppInputCapture)
diff --git a/ui/dropdowns.go b/ui/dropdowns.go
index 206768b..6c23653 100644
--- a/ui/dropdowns.go
+++ b/ui/dropdowns.go
@@ -6,7 +6,7 @@ import (
 	"github.com/rivo/tview"
 )
 
-func NewGuildsDropDown(onGuildsDropDownSelected func(text string, index int), theme *util.Theme) *tview.DropDown {
+func NewGuildsDropDown(onGuildsDropDownSelected func(string, int), theme *util.Theme) *tview.DropDown {
 	guildsDropDown := tview.NewDropDown()
 
 	guildsDropDown.
diff --git a/ui/forms.go b/ui/forms.go
index 9dee34b..aea28eb 100644
--- a/ui/forms.go
+++ b/ui/forms.go
@@ -7,6 +7,7 @@ import (
 
 func NewLoginForm(onLoginFormLoginButtonSelected func()) *tview.Form {
 	f := tview.NewForm()
+
 	f.
 		AddInputField("Email", "", 0, nil, nil).
 		AddPasswordField("Password", "", 0, 0, nil).
diff --git a/ui/inputfields.go b/ui/inputfields.go
index 8fdde73..493d18f 100644
--- a/ui/inputfields.go
+++ b/ui/inputfields.go
@@ -1,14 +1,12 @@
 package ui
 
 import (
-	"github.com/diamondburned/arikawa/v3/discord"
-	"github.com/diamondburned/arikawa/v3/session"
 	"github.com/gdamore/tcell/v2"
 	"github.com/rigormorrtiss/discordo/util"
 	"github.com/rivo/tview"
 )
 
-func NewMessageInputField(onMessageInputFieldInputCapture func(event *tcell.EventKey) *tcell.EventKey, s *session.Session, c discord.Channel, theme *util.Theme) *tview.InputField {
+func NewMessageInputField(onMessageInputFieldInputCapture func(*tcell.EventKey) *tcell.EventKey, theme *util.Theme) *tview.InputField {
 	i := tview.NewInputField()
 	i.
 		SetPlaceholder("Message...").
diff --git a/ui/treeviews.go b/ui/treeviews.go
index ca15f66..18e9b43 100644
--- a/ui/treeviews.go
+++ b/ui/treeviews.go
@@ -6,8 +6,9 @@ import (
 	"github.com/rivo/tview"
 )
 
-func NewGuildsTreeView(guildsTreeNode *tview.TreeNode, onGuildsTreeViewSelected func(node *tview.TreeNode), theme *util.Theme) *tview.TreeView {
+func NewGuildsTreeView(onGuildsTreeViewSelected func(*tview.TreeNode), theme *util.Theme) *tview.TreeView {
 	guildsTreeView := tview.NewTreeView()
+	guildsTreeNode := tview.NewTreeNode("")
 
 	guildsTreeView.
 		SetTopLevel(1).