oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: rename mainTreeView to channelsTree

Browse source
This commit is contained in:
ayntgl 2021-09-27 11:29:00 +04:00
parent 90751d4c39
commit 88674c5f4d
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
discord.go
View file

@ -40,7 +40,7 @@ func onSessionReady(_ *discordgo.Session, r *discordgo.Ready) {
dmNode := tview.NewTreeNode("Direct Messages").
Collapse()
n := mainTreeView.GetRoot()
n := channelsTree.GetRoot()
n.AddChild(dmNode)
sort.Slice(r.PrivateChannels, func(i, j int) bool {
@ -76,7 +76,7 @@ func onSessionReady(_ *discordgo.Session, r *discordgo.Ready) {
n.AddChild(gn)
}
mainTreeView.SetCurrentNode(n)
channelsTree.SetCurrentNode(n)
}
func onSessionMessageCreate(_ *discordgo.Session, m *discordgo.MessageCreate) {

10
main.go
View file

@ -12,7 +12,7 @@ func main() {
tview.Styles = conf.Theme
app = newApplication()
mainTreeView = newMainTreeView()
channelsTree = newChannelsTree()
messagesTextView = newMessagesTextView()
messageInputField = newMessageInputField()
@ -21,7 +21,7 @@ func main() {
AddItem(messagesTextView, 0, 1, false).
AddItem(messageInputField, 3, 1, false)
mainFlex = tview.NewFlex().
AddItem(mainTreeView, 0, 1, false).
AddItem(channelsTree, 0, 1, false).
AddItem(rightFlex, 0, 4, false)
token := conf.Token
@ -32,7 +32,7 @@ func main() {
if token != "" {
app.
SetRoot(mainFlex, true).
SetFocus(mainTreeView)
SetFocus(channelsTree)
session = newSession()
session.Token = token
@ -67,7 +67,7 @@ func onLoginFormLoginButtonSelected() {
if lr.Token != "" && !lr.MFA {
app.
SetRoot(mainFlex, true).
SetFocus(mainTreeView)
SetFocus(channelsTree)
session.Token = lr.Token
session.Identify.Token = lr.Token
@ -91,7 +91,7 @@ func onLoginFormLoginButtonSelected() {
app.
SetRoot(mainFlex, true).
SetFocus(mainTreeView)
SetFocus(channelsTree)
session.Token = lr.Token
session.Identify.Token = lr.Token

18
ui.go
View file

@ -13,7 +13,7 @@ import (
var (
app *tview.Application
loginForm *tview.Form
mainTreeView *tview.TreeView
channelsTree *tview.TreeView
messagesTextView *tview.TextView
messageInputField *tview.InputField
mainFlex *tview.Flex
@ -31,7 +31,7 @@ func newApplication() *tview.Application {
func onAppInputCapture(e *tcell.EventKey) *tcell.EventKey {
switch e.Name() {
case conf.Keybindings.GuildsTreeViewFocus:
app.SetFocus(mainTreeView)
app.SetFocus(channelsTree)
case conf.Keybindings.MessagesTextViewFocus:
app.SetFocus(messagesTextView)
case conf.Keybindings.MessageInputFieldFocus:
@ -41,19 +41,19 @@ func onAppInputCapture(e *tcell.EventKey) *tcell.EventKey {
return e
}
func newMainTreeView() *tview.TreeView {
w := tview.NewTreeView()
w.
SetSelectedFunc(onMainTreeViewSelected).
func newChannelsTree() *tview.TreeView {
channelsTree := tview.NewTreeView()
channelsTree.
SetSelectedFunc(onChannelsTreeSelected).
SetTopLevel(1).
SetRoot(tview.NewTreeNode("")).
SetBorder(true).
SetBorderPadding(0, 0, 1, 0)
return w
return channelsTree
}
func onMainTreeViewSelected(n *tview.TreeNode) {
func onChannelsTreeSelected(n *tview.TreeNode) {
selectedChannel = nil
selectedMessage = nil
messagesTextView.
@ -195,7 +195,7 @@ func createSecondLevelChannelsTreeNodes(cs []*discordgo.Channel) {
}
func getTreeNodeByReference(r interface{}) (mn *tview.TreeNode) {
mainTreeView.GetRoot().Walk(func(n, _ *tview.TreeNode) bool {
channelsTree.GetRoot().Walk(func(n, _ *tview.TreeNode) bool {
if n.GetReference() == r {
mn = n
return false