status-im
/
matterbridge
mirror of https://github.com/status-im/matterbridge.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor sshchat bridge (#650) 

* Decrease complexity in Send()
* Add handleUploadFile() function
This commit is contained in:
Wim 2018-12-12 23:47:07 +01:00 committed by GitHub
parent d887855e16
commit 2f7b4d7f68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bridge/sshchat/sshchat.go
View File

@ -64,24 +64,7 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {
b.Log.Errorf("Could not send extra message: %#v", err) b.Log.Errorf("Could not send extra message: %#v", err)
} }
} }
if len(msg.Extra["file"]) > 0 { return b.handleUploadFile(&msg)
for _, f := range msg.Extra["file"] {
fi := f.(config.FileInfo)
if fi.Comment != "" {
msg.Text += fi.Comment + ": "
}
if fi.URL != "" {
msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
}
if _, err := b.w.Write([]byte(msg.Username + msg.Text)); err != nil {
b.Log.Errorf("Could not send file message: %#v", err)
}
}
return "", nil
}
} }
_, err := b.w.Write([]byte(msg.Username + msg.Text + "\r\n")) _, err := b.w.Write([]byte(msg.Username + msg.Text + "\r\n"))
return "", err return "", err
@ -144,3 +127,22 @@ func (b *Bsshchat) handleSSHChat() error {
} }
} }
} }
func (b *Bsshchat) handleUploadFile(msg *config.Message) (string, error) {
for _, f := range msg.Extra["file"] {
fi := f.(config.FileInfo)
if fi.Comment != "" {
msg.Text += fi.Comment + ": "
}
if fi.URL != "" {
msg.Text = fi.URL
if fi.Comment != "" {
msg.Text = fi.Comment + ": " + fi.URL
}
}
if _, err := b.w.Write([]byte(msg.Username + msg.Text)); err != nil {
b.Log.Errorf("Could not send file message: %#v", err)
}
}
return "", nil
}