diff --git a/discordo.go b/discordo.go index e079f09..7de0876 100644 --- a/discordo.go +++ b/discordo.go @@ -239,12 +239,7 @@ func onChannelsTreeViewSelected(n *tview.TreeNode) { } } - go func() { - msgs, _ := discordSession.Messages(r.ID, conf.GetMessagesLimit) - for i := len(msgs) - 1; i >= 0; i-- { - util.WriteMessage(messagesTextView, clientID, msgs[i]) - } - }() + go writeMessages(r.ID) } else { n.SetExpanded(!n.IsExpanded()) } @@ -254,18 +249,20 @@ func onChannelsTreeViewSelected(n *tview.TreeNode) { messagesTextView.Clear() messagesTextView.SetTitle(r.Name) - go func() { - msgs, _ := discordSession.Messages(r.ID, conf.GetMessagesLimit) - for i := len(msgs) - 1; i >= 0; i-- { - util.WriteMessage(messagesTextView, clientID, msgs[i]) - } - }() + go writeMessages(r.ID) case discord.GuildStageVoice, discord.GuildVoice: messagesTextView.Clear() messagesTextView.SetTitle(r.Name) } } +func writeMessages(cID discord.ChannelID) { + msgs, _ := discordSession.Messages(cID, conf.GetMessagesLimit) + for i := len(msgs) - 1; i >= 0; i-- { + util.WriteMessage(messagesTextView, clientID, msgs[i]) + } +} + func onLoginFormLoginButtonSelected() { email := loginForm.GetFormItem(0).(*tview.InputField).GetText() password := loginForm.GetFormItem(1).(*tview.InputField).GetText()