Skip to content

Commit 450dc60

Browse files
authored
Merge pull request shomali11#68 from ccrims0n/fix_thread_timestamp
Fix thread timestamp
2 parents 2acb91a + 821efa5 commit 450dc60

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

response.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ func (r *response) ReportError(err error, options ...ReportErrorOption) {
3535
message := rtm.NewOutgoingMessage(fmt.Sprintf(errorFormat, err.Error()), event.Channel)
3636
if defaults.ThreadResponse {
3737
message.ThreadTimestamp = event.ThreadTimestamp
38+
if event.ThreadTimestamp == "" {
39+
message.ThreadTimestamp = event.EventTimestamp
40+
}
3841
}
3942

4043
rtm.SendMessage(message)
@@ -54,14 +57,18 @@ func (r *response) Reply(message string, options ...ReplyOption) error {
5457
rtm := r.botCtx.RTM()
5558
event := r.botCtx.Event()
5659
if defaults.ThreadResponse {
60+
threadTimestamp := event.ThreadTimestamp
61+
if event.ThreadTimestamp == "" {
62+
threadTimestamp = event.EventTimestamp
63+
}
5764
_, _, err := rtm.PostMessage(
5865
event.Channel,
5966
slack.MsgOptionText(message, false),
6067
slack.MsgOptionUser(rtm.GetInfo().User.ID),
6168
slack.MsgOptionAsUser(true),
6269
slack.MsgOptionAttachments(defaults.Attachments...),
6370
slack.MsgOptionBlocks(defaults.Blocks...),
64-
slack.MsgOptionTS(event.ThreadTimestamp),
71+
slack.MsgOptionTS(threadTimestamp),
6572
)
6673
return err
6774
}

0 commit comments

Comments
 (0)