commit c9f05d72535353be24e9400d793f13a519dc65d4
Author: Wim <wim@42.be>
Date: Wed Dec 12 23:47:07 2018 +0000
Refactor sshchat bridge (#650)
* Decrease complexity in Send()
* Add handleUploadFile() function
diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go
index 555759b..79ba9fb 100644
--- a/bridge/sshchat/sshchat.go
+++ b/bridge/sshchat/sshchat.go
@@ -6424 +647 @@ func (b *Bsshchat) Send(msg config.Message) (string, error) {
b.Log.Errorf("Could not send extra message: %#v", err)
}
}
- if len(msg.Extra["file"]) > 0 {
- 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
- }
+ return b.handleUploadFile(&msg)
}
_, err := b.w.Write([]byte(msg.Username + msg.Text + "\r\n"))
return "", err
@@ -1443 +12722 @@ 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
+}
