rani/matterbridge.git

commit 8602a5efd8353bdca5a2826434e45fd5eb2cf7f3 Author: Liam Stanley <me@liamstanley.io> Date: Sat Jun 09 06:47:40 2018 +0000 Reconnect on quit. (irc) See #431 (#445) * potential fixes for #431 * go: fix formatting/gofmt/goreturns diff --git a/bridge/api/api.go b/bridge/api/api.go index 54eea4a..28c5710 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -214 +215 @@ package api    import (   "encoding/json" + "net/http" + "sync" + "time" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/labstack/echo"   "github.com/labstack/echo/middleware"   "github.com/zfjagann/golang-ring" - "net/http" - "sync" - "time"  )    type Api struct { diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index ef4e5ca..81f0cbe 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -313 +314 @@ package bdiscord  import (   "bytes"   "fmt" + "regexp" + "strings" + "sync" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper"   "github.com/bwmarrin/discordgo" - "regexp" - "strings" - "sync"  )    type Bdiscord struct { diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go index faa86e5..f47ca7e 100644 --- a/bridge/gitter/gitter.go +++ b/bridge/gitter/gitter.go @@ -211 +212 @@ package bgitter    import (   "fmt" + "strings" +   "github.com/42wim/go-gitter"   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper" - "strings"  )    type Bgitter struct { diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go index c4ac0ae..a3f4255 100644 --- a/bridge/helper/helper.go +++ b/bridge/helper/helper.go @@ -312 +313 @@ package helper  import (   "bytes"   "fmt" - "github.com/42wim/matterbridge/bridge/config" - log "github.com/sirupsen/logrus"   "io"   "net/http"   "strings"   "time" + + "github.com/42wim/matterbridge/bridge/config" + log "github.com/sirupsen/logrus"  )    func DownloadFile(url string) (*[]byte, error) { diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index 4919c85..fe1e0d3 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -414 +46 @@ import (   "bytes"   "crypto/tls"   "fmt" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/dfordsoft/golib/ic" - "github.com/lrstanley/girc" - "github.com/paulrosania/go-charset/charset" - _ "github.com/paulrosania/go-charset/data" - "github.com/saintfish/chardet"   "hash/crc32"   "io"   "io/ioutil" @@ -226 +1415 @@ import (   "strings"   "time"   "unicode/utf8" + + "github.com/42wim/matterbridge/bridge" + "github.com/42wim/matterbridge/bridge/config" + "github.com/42wim/matterbridge/bridge/helper" + "github.com/dfordsoft/golib/ic" + "github.com/lrstanley/girc" + "github.com/paulrosania/go-charset/charset" + _ "github.com/paulrosania/go-charset/data" + "github.com/saintfish/chardet"  )    type Birc struct { @@ -11418 +11519 @@ func (b *Birc) Connect() error {   go func() {   for {   if err := i.Connect(); err != nil { - b.Log.Errorf("error: %s", err) - b.Log.Info("reconnecting in 30 seconds...") - time.Sleep(30 * time.Second) - i.Handlers.Clear(girc.RPL_WELCOME) - i.Handlers.Add(girc.RPL_WELCOME, func(client *girc.Client, event girc.Event) { - b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS} - // set our correct nick on reconnect if necessary - b.Nick = event.Source.Name - }) + b.Log.Errorf("disconnect: error: %s", err)   } else { - return + b.Log.Info("disconnect: client requested quit")   } + + b.Log.Info("reconnecting in 30 seconds...") + time.Sleep(30 * time.Second) + i.Handlers.Clear(girc.RPL_WELCOME) + i.Handlers.Add(girc.RPL_WELCOME, func(client *girc.Client, event girc.Event) { + b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS} + // set our correct nick on reconnect if necessary + b.Nick = event.Source.Name + })   }   }()   b.i = i diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index ed3d5bf..95ba6b4 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -314 +315 @@ package bmatrix  import (   "bytes"   "fmt" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - matrix "github.com/matterbridge/gomatrix"   "mime"   "regexp"   "strings"   "sync" + + "github.com/42wim/matterbridge/bridge" + "github.com/42wim/matterbridge/bridge/config" + "github.com/42wim/matterbridge/bridge/helper" + matrix "github.com/matterbridge/gomatrix"  )    type Bmatrix struct { diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index ae5d9db..14c71af 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -313 +314 @@ package bmattermost  import (   "errors"   "fmt" + "strings" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper"   "github.com/42wim/matterbridge/matterclient"   "github.com/42wim/matterbridge/matterhook"   "github.com/rs/xid" - "strings"  )    type Bmattermost struct { diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go index 6e879e8..846a908 100644 --- a/bridge/sshchat/sshchat.go +++ b/bridge/sshchat/sshchat.go @@ -213 +214 @@ package bsshchat    import (   "bufio" + "io" + "strings" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper"   "github.com/shazow/ssh-chat/sshd"   log "github.com/sirupsen/logrus" - "io" - "strings"  )    type Bsshchat struct { diff --git a/bridge/telegram/html.go b/bridge/telegram/html.go index 5e7bdc7..85547d7 100644 --- a/bridge/telegram/html.go +++ b/bridge/telegram/html.go @@ -28 +29 @@ package btelegram    import (   "bytes" - "github.com/russross/blackfriday"   "html" + + "github.com/russross/blackfriday"  )    type customHTML struct { diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index cb0da1b..0e2d951 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -214 +215 @@ package bxmpp    import (   "crypto/tls" + "strings" + "time" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config"   "github.com/42wim/matterbridge/bridge/helper"   "github.com/jpillora/backoff" - "github.com/rs/xid"   "github.com/matterbridge/go-xmpp" - "strings" - "time" + "github.com/rs/xid"  )    type Bxmpp struct { diff --git a/gateway/gateway.go b/gateway/gateway.go index b926912..6529393 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -1018 +1018 @@ import (   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/api"   "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/discord" - "github.com/42wim/matterbridge/bridge/gitter" - "github.com/42wim/matterbridge/bridge/irc" - "github.com/42wim/matterbridge/bridge/matrix" - "github.com/42wim/matterbridge/bridge/mattermost" - "github.com/42wim/matterbridge/bridge/rocketchat" - "github.com/42wim/matterbridge/bridge/slack" - "github.com/42wim/matterbridge/bridge/sshchat" - "github.com/42wim/matterbridge/bridge/steam" - "github.com/42wim/matterbridge/bridge/telegram" - "github.com/42wim/matterbridge/bridge/xmpp" - "github.com/42wim/matterbridge/bridge/zulip" + bdiscord "github.com/42wim/matterbridge/bridge/discord" + bgitter "github.com/42wim/matterbridge/bridge/gitter" + birc "github.com/42wim/matterbridge/bridge/irc" + bmatrix "github.com/42wim/matterbridge/bridge/matrix" + bmattermost "github.com/42wim/matterbridge/bridge/mattermost" + brocketchat "github.com/42wim/matterbridge/bridge/rocketchat" + bslack "github.com/42wim/matterbridge/bridge/slack" + bsshchat "github.com/42wim/matterbridge/bridge/sshchat" + bsteam "github.com/42wim/matterbridge/bridge/steam" + btelegram "github.com/42wim/matterbridge/bridge/telegram" + bxmpp "github.com/42wim/matterbridge/bridge/xmpp" + bzulip "github.com/42wim/matterbridge/bridge/zulip"   "github.com/hashicorp/golang-lru"   log "github.com/sirupsen/logrus"   // "github.com/davecgh/go-spew/spew" diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go index 2524217..bf9461c 100644 --- a/gateway/gateway_test.go +++ b/gateway/gateway_test.go @@ -29 +210 @@ package gateway    import (   "fmt" + "strconv" +   "github.com/42wim/matterbridge/bridge/config"   "github.com/stretchr/testify/assert" - "strconv"     "testing"  ) diff --git a/gateway/router.go b/gateway/router.go index 264486c..3a45de3 100644 --- a/gateway/router.go +++ b/gateway/router.go @@ -29 +210 @@ package gateway    import (   "fmt" +   "github.com/42wim/matterbridge/bridge"   "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/gateway/samechannel" + samechannelgateway "github.com/42wim/matterbridge/gateway/samechannel"   // "github.com/davecgh/go-spew/spew"   "time"  ) diff --git a/gateway/samechannel/samechannel_test.go b/gateway/samechannel/samechannel_test.go index 7e48ebc..7c75444 100644 --- a/gateway/samechannel/samechannel_test.go +++ b/gateway/samechannel/samechannel_test.go @@ -26 +27 @@ package samechannelgateway    import (   "fmt" +   "github.com/42wim/matterbridge/bridge/config"   "github.com/BurntSushi/toml"   "github.com/stretchr/testify/assert" diff --git a/matterhook/matterhook.go b/matterhook/matterhook.go index 11453e3..9287baa 100644 --- a/matterhook/matterhook.go +++ b/matterhook/matterhook.go @@ -614 +615 @@ import (   "crypto/tls"   "encoding/json"   "fmt" - "github.com/gorilla/schema" - "github.com/nlopes/slack"   "io"   "io/ioutil"   "log"   "net"   "net/http"   "time" + + "github.com/gorilla/schema" + "github.com/nlopes/slack"  )    // OMessage for mattermost incoming webhook. (send to mattermost)