summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/matterbridge
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/matterbridge')
-rw-r--r--vendor/github.com/matterbridge/matterclient/matterclient.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/matterbridge/matterclient/matterclient.go b/vendor/github.com/matterbridge/matterclient/matterclient.go
index fe845efc..73d4290d 100644
--- a/vendor/github.com/matterbridge/matterclient/matterclient.go
+++ b/vendor/github.com/matterbridge/matterclient/matterclient.go
@@ -144,10 +144,6 @@ func (m *Client) Login() error {
return err
}
- if err := m.initUserChannels(); err != nil {
- return err
- }
-
if m.Team == nil {
validTeamNames := make([]string, len(m.OtherTeams))
for i, t := range m.OtherTeams {
@@ -157,6 +153,10 @@ func (m *Client) Login() error {
return fmt.Errorf("Team '%s' not found in %v", m.Credentials.Team, validTeamNames)
}
+ if err := m.initUserChannels(); err != nil {
+ return err
+ }
+
// connect websocket
m.wsConnect()
@@ -532,7 +532,7 @@ func (m *Client) wsConnect() {
}
func (m *Client) doCheckAlive() error {
- if _, _, err := m.Client.GetMe(""); err != nil {
+ if _, _, err := m.Client.GetPing(); err != nil {
return err
}