Skip to content

Commit a96e484

Browse files
committed
Fix the case where threadtimestamp is empty
1 parent 7bd2b22 commit a96e484

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

response.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ func (r *response) ReportError(err error, options ...ReportErrorOption) {
3434
event := r.botCtx.Event()
3535
message := rtm.NewOutgoingMessage(fmt.Sprintf(errorFormat, err.Error()), event.Channel)
3636
if defaults.ThreadResponse {
37-
message.ThreadTimestamp = event.ThreadTimestamp
37+
if event.ThreadTimestamp != "" {
38+
message.ThreadTimestamp = event.ThreadTimestamp
39+
} else {
40+
message.ThreadTimestamp = event.EventTimestamp
41+
}
3842
}
3943

4044
rtm.SendMessage(message)
@@ -54,14 +58,19 @@ func (r *response) Reply(message string, options ...ReplyOption) error {
5458
rtm := r.botCtx.RTM()
5559
event := r.botCtx.Event()
5660
if defaults.ThreadResponse {
61+
if event.ThreadTimestamp != "" {
62+
threadTimestamp = event.ThreadTimestamp
63+
} else {
64+
threadTimestamp = event.EventTimestamp
65+
}
5766
_, _, err := rtm.PostMessage(
5867
event.Channel,
5968
slack.MsgOptionText(message, false),
6069
slack.MsgOptionUser(rtm.GetInfo().User.ID),
6170
slack.MsgOptionAsUser(true),
6271
slack.MsgOptionAttachments(defaults.Attachments...),
6372
slack.MsgOptionBlocks(defaults.Blocks...),
64-
slack.MsgOptionTS(event.ThreadTimestamp),
73+
slack.MsgOptionTS(threadTimestamp),
6574
)
6675
return err
6776
}

0 commit comments

Comments
 (0)