Skip to content

Fix bridge/slack build breakage from slack-go/slack v0.23.1 API changes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnnyxmas merged 1 commit into from
Aug 3, 2026
Merged

Fix bridge/slack build breakage from slack-go/slack v0.23.1 API changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 24 additions & 29 deletions bridge/slack/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,25 +168,16 @@ func (b *Bslack) skipMessageEvent(ev *slackevents.MessageEvent) bool {
break
}
}
// Check blocks inside attachments (legacy / RTM)
if !hasOurCallbackID {
for _, att := range ev.Attachments {
for _, blk := range att.Blocks.BlockSet {
if section, ok := blk.(*slack.SectionBlock); ok && section.BlockID == callbackBlockID {
hasOurCallbackID = true
break
}
}
if hasOurCallbackID {
break
}
}
}
// Note: attachment blocks are only checked via ev.Message.Attachments below.
// MessageEvent no longer carries its own top-level Attachments field; since
// ev.Message is now always populated (synthesized from the top-level fields
// for regular messages, or the real nested object for message_changed), the
// ev.Message.Attachments check below covers both cases uniformly.

if ev.Message != nil {
// It seems ev.Message.Edited == nil when slack unfurls.
// Do not forward these messages. See Github issue #266.
if ev.Message.ThreadTimeStamp != ev.Message.TimeStamp &&
if ev.Message.ThreadTimestamp != ev.Message.Timestamp &&
ev.Message.Edited == nil {
return true
}
Expand Down Expand Up @@ -228,13 +219,13 @@ func (b *Bslack) skipMessageEvent(ev *slackevents.MessageEvent) bool {
return true
}

if len(ev.Files) > 0 {
return b.filesCached(ev.Files)
if ev.Message != nil && len(ev.Message.Files) > 0 {
return b.filesCached(ev.Message.Files)
}
return false
}

func (b *Bslack) filesCached(files []slackevents.File) bool {
func (b *Bslack) filesCached(files []slack.File) bool {
for i := range files {
if !b.fileCached(&files[i]) {
return false
Expand Down Expand Up @@ -274,7 +265,7 @@ func (b *Bslack) handleMessageEvent(ev *slackevents.MessageEvent) (*config.Messa

// Verify that we have the right information and the message
// is well-formed before sending it out to the router.
if len(ev.Files) == 0 && (rmsg.Text == "" || rmsg.Username == "") {
if (ev.Message == nil || len(ev.Message.Files) == 0) && (rmsg.Text == "" || rmsg.Username == "") {
if ev.BotID != "" {
// This is probably a webhook we couldn't resolve.
return nil, fmt.Errorf("message handling resulted in an empty bot message (probably an incoming webhook we couldn't resolve): %#v", ev)
Expand Down Expand Up @@ -309,7 +300,7 @@ func (b *Bslack) handleStatusEvent(ev *slackevents.MessageEvent, rmsg *config.Me
case sMessageDeleted:
rmsg.Text = config.EventMsgDelete
rmsg.Event = config.EventMsgDelete
rmsg.ID = ev.PreviousMessage.TimeStamp
rmsg.ID = ev.PreviousMessage.Timestamp
// If a message is being deleted we do not need to process
// the event any further so we return 'true'.
return true
Expand All @@ -332,12 +323,16 @@ func (b *Bslack) handleAttachments(ev *slackevents.MessageEvent, rmsg *config.Me
rmsg.Username = sSystemUser
}

if ev.Message == nil {
return
}

// See if we have some text in the attachments.
if rmsg.Text == "" {
for i, attach := range ev.Attachments {
for i, attach := range ev.Message.Attachments {
if attach.Text != "" {
if attach.Title != "" {
rmsg.Text = getMessageTitle(&ev.Attachments[i])
rmsg.Text = getMessageTitle(&ev.Message.Attachments[i])
}
rmsg.Text += attach.Text
if attach.Footer != "" {
Expand All @@ -350,22 +345,22 @@ func (b *Bslack) handleAttachments(ev *slackevents.MessageEvent, rmsg *config.Me
}

// Save the attachments, so that we can send them to other slack (compatible) bridges.
if len(ev.Attachments) > 0 {
rmsg.Extra[sSlackAttachment] = append(rmsg.Extra[sSlackAttachment], ev.Attachments)
if len(ev.Message.Attachments) > 0 {
rmsg.Extra[sSlackAttachment] = append(rmsg.Extra[sSlackAttachment], ev.Message.Attachments)
}

// If we have files attached, download them (in memory) and put a pointer to it in msg.Extra.
for i := range ev.Files {
for i := range ev.Message.Files {
// keep reference in cache on which channel we added this file
b.cache.Add(cfileDownloadChannel+ev.Files[i].ID, ev.Channel)
if err := b.handleDownloadFile(rmsg, &ev.Files[i], false); err != nil {
b.cache.Add(cfileDownloadChannel+ev.Message.Files[i].ID, ev.Channel)
if err := b.handleDownloadFile(rmsg, &ev.Message.Files[i], false); err != nil {
b.Log.Errorf("Could not download incoming file: %#v", err)
}
}
}

// handleDownloadFile handles file download
func (b *Bslack) handleDownloadFile(rmsg *config.Message, file *slackevents.File, retry bool) error {
func (b *Bslack) handleDownloadFile(rmsg *config.Message, file *slack.File, retry bool) error {
if b.fileCached(file) {
return nil
}
Expand Down Expand Up @@ -427,7 +422,7 @@ func (b *Bslack) handleGetChannelMembers(rmsg *config.Message) bool {
// identically named file but with different content will be uploaded correctly
// (the assumption is that such name collisions will not occur within the given
// timeframes).
func (b *Bslack) fileCached(file *slackevents.File) bool {
func (b *Bslack) fileCached(file *slack.File) bool {
if ts, ok := b.cache.Get("file" + file.ID); ok && time.Since(ts.(time.Time)) < time.Minute {
return true
} else if ts, ok = b.cache.Get("filename" + file.Name); ok && time.Since(ts.(time.Time)) < 10*time.Second {
Expand Down
6 changes: 3 additions & 3 deletions bridge/slack/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func (b *Bslack) populateReceivedMessage(ev *slackevents.MessageEvent) (*config.

// Handle 'edit' messages.
if ev.Message != nil && !b.GetBool(editDisableConfig) {
rmsg.ID = ev.Message.TimeStamp
if ev.Message.ThreadTimeStamp != ev.Message.TimeStamp {
rmsg.ID = ev.Message.Timestamp
if ev.Message.ThreadTimestamp != ev.Message.Timestamp {
b.Log.Debugf("SubMessage %#v", ev.Message)
rmsg.Text = ev.Message.Text + b.GetString(editSuffixConfig)
}
Expand All @@ -47,7 +47,7 @@ func (b *Bslack) populateReceivedMessage(ev *slackevents.MessageEvent) (*config.
// Ensures edits to threaded messages maintain their prefix hint on the
// unthreaded end.
if ev.Message != nil {
rmsg.ParentID = ev.Message.ThreadTimeStamp
rmsg.ParentID = ev.Message.ThreadTimestamp
}

if err = b.populateMessageWithUserInfo(ev, rmsg); err != nil {
Expand Down
45 changes: 27 additions & 18 deletions bridge/slack/slack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ type Bslack struct {
}

const (
sChannelJoin = "channel_join"
sChannelLeave = "channel_leave"
sChannelJoined = "channel_joined"
sMemberJoined = "member_joined_channel"
sMessageChanged = "message_changed"
sMessageDeleted = "message_deleted"
sSlackAttachment = "slack_attachment"
sPinnedItem = "pinned_item"
sUnpinnedItem = "unpinned_item"
sChannelTopic = "channel_topic"
sChannelPurpose = "channel_purpose"
sFileComment = "file_comment"
sMeMessage = "me_message"
sChannelJoin = "channel_join"
sChannelLeave = "channel_leave"
sChannelJoined = "channel_joined"
sMemberJoined = "member_joined_channel"
sMessageChanged = "message_changed"
sMessageDeleted = "message_deleted"
sSlackAttachment = "slack_attachment"
sPinnedItem = "pinned_item"
sUnpinnedItem = "unpinned_item"
sChannelTopic = "channel_topic"
sChannelPurpose = "channel_purpose"
sFileComment = "file_comment"
sMeMessage = "me_message"
sSystemUser = "system"
sSlackBotUser = "slackbot"
cfileDownloadChannel = "file_download_channel"
Expand Down Expand Up @@ -471,10 +471,11 @@ func (b *Bslack) uploadFile(msg *config.Message, channelID string) (string, erro
if fi.Comment != "" {
initialComment += fmt.Sprintf(" with comment: %s", fi.Comment)
}
res, err := b.sc.UploadFile(slack.FileUploadParameters{
res, err := b.sc.UploadFile(slack.UploadFileParameters{
Reader: bytes.NewReader(*fi.Data),
Filename: fi.Name,
Channels: []string{channelID},
FileSize: len(*fi.Data),
Channel: channelID,
InitialComment: initialComment,
ThreadTimestamp: msg.ParentID,
})
Expand All @@ -486,11 +487,19 @@ func (b *Bslack) uploadFile(msg *config.Message, channelID string) (string, erro
b.Log.Debugf("Adding file ID %s to cache with timestamp %s", res.ID, ts.String())
b.cache.Add("file"+res.ID, ts)

// search for message id by uploaded file in private/public channels, get thread timestamp from uploaded file
if v, ok := res.Shares.Private[channelID]; ok && len(v) > 0 {
// UploadFile's FileSummary no longer carries share info since the
// files.upload -> files.upload.v2 migration, so fetch the full File
// to search for message id by uploaded file in private/public
// channels, and get the thread timestamp from the uploaded file.
fullFile, _, _, ferr := b.sc.GetFileInfo(res.ID, 0, 0)
if ferr != nil {
b.Log.Errorf("getfileinfo %#v", ferr)
continue
}
if v, ok := fullFile.Shares.Private[channelID]; ok && len(v) > 0 {
messageID = v[0].Ts
}
if v, ok := res.Shares.Public[channelID]; ok && len(v) > 0 {
if v, ok := fullFile.Shares.Public[channelID]; ok && len(v) > 0 {
messageID = v[0].Ts
}
}
Expand Down