5
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2024-11-26 00:51:36 +00:00

Handle file comment better

This commit is contained in:
Wim 2018-05-06 16:57:59 +02:00
parent 346a7284f7
commit 72ce7f06e9
4 changed files with 13 additions and 1 deletions

View File

@ -168,6 +168,9 @@ func (b *Bgitter) handleUploadFile(msg *config.Message, roomID string) (string,
} }
if fi.URL != "" { if fi.URL != "" {
msg.Text = fi.URL msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
} }
_, err := b.c.SendMessage(roomID, msg.Username+msg.Text) _, err := b.c.SendMessage(roomID, msg.Username+msg.Text)
if err != nil { if err != nil {

View File

@ -201,6 +201,9 @@ func (b *Birc) Send(msg config.Message) (string, error) {
} }
if fi.URL != "" { if fi.URL != "" {
msg.Text = fi.URL msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
} }
b.Local <- config.Message{Text: msg.Text, Username: msg.Username, Channel: msg.Channel, Event: msg.Event} b.Local <- config.Message{Text: msg.Text, Username: msg.Username, Channel: msg.Channel, Event: msg.Event}
} }

View File

@ -68,6 +68,9 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {
} }
if fi.URL != "" { if fi.URL != "" {
msg.Text = fi.URL msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
} }
b.w.Write([]byte(msg.Username + msg.Text)) b.w.Write([]byte(msg.Username + msg.Text))
} }

View File

@ -186,7 +186,10 @@ func (b *Bxmpp) handleUploadFile(msg *config.Message) (string, error) {
msg.Text += fi.Comment + ": " msg.Text += fi.Comment + ": "
} }
if fi.URL != "" { if fi.URL != "" {
msg.Text += fi.URL msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
} }
_, err := b.xc.Send(xmpp.Chat{Type: "groupchat", Remote: msg.Channel + "@" + b.GetString("Muc"), Text: msg.Username + msg.Text}) _, err := b.xc.Send(xmpp.Chat{Type: "groupchat", Remote: msg.Channel + "@" + b.GetString("Muc"), Text: msg.Username + msg.Text})
if err != nil { if err != nil {