Просмотр исходного кода

Revert "perf(main): set channelID as reference of node"

This reverts commit 0d6f5d19fe21e2ea4554056fe0f3e62c4ca17f7b.
rigormorrtiss 4 лет назад
Родитель
Сommit
ca9eb30873
1 измененных файлов с 4 добавлено и 8 удалено
  1. 4 8
      discordo.go

+ 4 - 8
discordo.go

@@ -182,7 +182,7 @@ func onGuildsDropDownSelected(_ string, i int) {
 	for i := range channels {
 	for i := range channels {
 		channel := channels[i]
 		channel := channels[i]
 		channelNode := tview.NewTreeNode(channel.Name).
 		channelNode := tview.NewTreeNode(channel.Name).
-			SetReference(channel.ID)
+			SetReference(channel)
 		switch channel.Type {
 		switch channel.Type {
 		case discord.GuildCategory:
 		case discord.GuildCategory:
 			channelNode.SetColor(tcell.GetColor(config.Theme.TreeNodeForeground))
 			channelNode.SetColor(tcell.GetColor(config.Theme.TreeNodeForeground))
@@ -197,12 +197,7 @@ func onGuildsDropDownSelected(_ string, i int) {
 }
 }
 
 
 func onChannelsTreeViewSelected(n *tview.TreeNode) {
 func onChannelsTreeViewSelected(n *tview.TreeNode) {
-	channelID := n.GetReference().(discord.ChannelID)
-	currentChannel, err := discordState.Cabinet.Channel(channelID)
-	if err != nil {
-		return
-	}
-
+	currentChannel = n.GetReference().(discord.Channel)
 	switch currentChannel.Type {
 	switch currentChannel.Type {
 	case discord.GuildCategory:
 	case discord.GuildCategory:
 		if len(n.GetChildren()) == 0 {
 		if len(n.GetChildren()) == 0 {
@@ -215,7 +210,7 @@ func onChannelsTreeViewSelected(n *tview.TreeNode) {
 				channel := channels[i]
 				channel := channels[i]
 				if (channel.Type == discord.GuildText || channel.Type == discord.GuildNews) && channel.CategoryID == currentChannel.ID {
 				if (channel.Type == discord.GuildText || channel.Type == discord.GuildNews) && channel.CategoryID == currentChannel.ID {
 					channelNode := tview.NewTreeNode("[::d]#" + channel.Name + "[-:-:-]").
 					channelNode := tview.NewTreeNode("[::d]#" + channel.Name + "[-:-:-]").
-						SetReference(channel.ID)
+						SetReference(channel)
 					n.AddChild(channelNode)
 					n.AddChild(channelNode)
 				}
 				}
 			}
 			}
@@ -243,6 +238,7 @@ func onMessageInputFieldDone(k tcell.Key) {
 	if k == tcell.KeyEnter {
 	if k == tcell.KeyEnter {
 		currentText := messageInputField.GetText()
 		currentText := messageInputField.GetText()
 		currentText = strings.TrimSpace(currentText)
 		currentText = strings.TrimSpace(currentText)
+
 		if currentText == "" {
 		if currentText == "" {
 			return
 			return
 		}
 		}