|
|
@ -198,6 +198,7 @@ func (b *Bslack) Send(msg config.Message) (string, error) {
|
|
|
|
Reader: bytes.NewReader(*fi.Data),
|
|
|
|
Reader: bytes.NewReader(*fi.Data),
|
|
|
|
Filename: fi.Name,
|
|
|
|
Filename: fi.Name,
|
|
|
|
Channels: []string{schannel.ID},
|
|
|
|
Channels: []string{schannel.ID},
|
|
|
|
|
|
|
|
InitialComment: fi.Comment,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
flog.Errorf("uploadfile %#v", err)
|
|
|
|
flog.Errorf("uploadfile %#v", err)
|
|
|
@ -294,17 +295,22 @@ func (b *Bslack) handleSlack() {
|
|
|
|
if message.Raw.File != nil {
|
|
|
|
if message.Raw.File != nil {
|
|
|
|
// limit to 1MB for now
|
|
|
|
// limit to 1MB for now
|
|
|
|
if message.Raw.File.Size <= 1000000 {
|
|
|
|
if message.Raw.File.Size <= 1000000 {
|
|
|
|
|
|
|
|
comment := ""
|
|
|
|
data, err := b.downloadFile(message.Raw.File.URLPrivateDownload)
|
|
|
|
data, err := b.downloadFile(message.Raw.File.URLPrivateDownload)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
flog.Errorf("download %s failed %#v", message.Raw.File.URLPrivateDownload, err)
|
|
|
|
flog.Errorf("download %s failed %#v", message.Raw.File.URLPrivateDownload, err)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
msg.Extra["file"] = append(msg.Extra["file"], config.FileInfo{Name: message.Raw.File.Name, Data: data})
|
|
|
|
results := regexp.MustCompile(`.*?commented: (.*)`).FindAllStringSubmatch(msg.Text, -1)
|
|
|
|
}
|
|
|
|
if len(results) > 0 {
|
|
|
|
|
|
|
|
comment = results[0][1]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
msg.Extra["file"] = append(msg.Extra["file"], config.FileInfo{Name: message.Raw.File.Name, Data: data, Comment: comment})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
flog.Debugf("Message is %#v", msg)
|
|
|
|
flog.Debugf("Message is %#v", msg)
|
|
|
|
b.Remote <- msg
|
|
|
|
b.Remote <- msg
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
|
|
|
|
func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
|
|
|
|