|
@@ -17,11 +17,13 @@ import (
|
|
|
|
|
|
|
|
type MessageInput struct {
|
|
type MessageInput struct {
|
|
|
*tview.TextArea
|
|
*tview.TextArea
|
|
|
|
|
+ replyMessageIdx int
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func newMessageInput() *MessageInput {
|
|
func newMessageInput() *MessageInput {
|
|
|
mi := &MessageInput{
|
|
mi := &MessageInput{
|
|
|
TextArea: tview.NewTextArea(),
|
|
TextArea: tview.NewTextArea(),
|
|
|
|
|
+ replyMessageIdx: -1,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
mi.SetTextStyle(tcell.StyleDefault.Background(tcell.GetColor(cfg.Theme.BackgroundColor)))
|
|
mi.SetTextStyle(tcell.StyleDefault.Background(tcell.GetColor(cfg.Theme.BackgroundColor)))
|
|
@@ -62,6 +64,7 @@ func (mi *MessageInput) onInputCapture(event *tcell.EventKey) *tcell.EventKey {
|
|
|
mainFlex.messageInput.launchEditorAction()
|
|
mainFlex.messageInput.launchEditorAction()
|
|
|
return nil
|
|
return nil
|
|
|
case cfg.Keys.Cancel:
|
|
case cfg.Keys.Cancel:
|
|
|
|
|
+ mi.replyMessageIdx = -1
|
|
|
mi.reset()
|
|
mi.reset()
|
|
|
return nil
|
|
return nil
|
|
|
}
|
|
}
|
|
@@ -79,7 +82,7 @@ func (mi *MessageInput) sendAction() {
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if mainFlex.messagesText.selectedMessage != -1 {
|
|
|
|
|
|
|
+ if mi.replyMessageIdx != -1 {
|
|
|
ms, err := discordState.Cabinet.Messages(mainFlex.guildsTree.selectedChannelID)
|
|
ms, err := discordState.Cabinet.Messages(mainFlex.guildsTree.selectedChannelID)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
log.Println(err)
|
|
log.Println(err)
|
|
@@ -88,7 +91,7 @@ func (mi *MessageInput) sendAction() {
|
|
|
|
|
|
|
|
data := api.SendMessageData{
|
|
data := api.SendMessageData{
|
|
|
Content: text,
|
|
Content: text,
|
|
|
- Reference: &discord.MessageReference{MessageID: ms[mainFlex.messagesText.selectedMessage].ID},
|
|
|
|
|
|
|
+ Reference: &discord.MessageReference{MessageID: ms[mi.replyMessageIdx].ID},
|
|
|
AllowedMentions: &api.AllowedMentions{RepliedUser: option.False},
|
|
AllowedMentions: &api.AllowedMentions{RepliedUser: option.False},
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -101,7 +104,7 @@ func (mi *MessageInput) sendAction() {
|
|
|
go discordState.SendMessage(mainFlex.guildsTree.selectedChannelID, text)
|
|
go discordState.SendMessage(mainFlex.guildsTree.selectedChannelID, text)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- mainFlex.messagesText.selectedMessage = -1
|
|
|
|
|
|
|
+ mi.replyMessageIdx = -1
|
|
|
mainFlex.messagesText.Highlight()
|
|
mainFlex.messagesText.Highlight()
|
|
|
mi.reset()
|
|
mi.reset()
|
|
|
}
|
|
}
|