summaryrefslogtreecommitdiffstats
path: root/bridge
diff options
context:
space:
mode:
authorWim <wim@42.be>2020-03-01 20:59:19 +0100
committerGitHub <noreply@github.com>2020-03-01 20:59:19 +0100
commit250b3bb5795240d5ebdab5416ab99dbc41be734b (patch)
tree11e44ec2e7e37cd7eb0deaf0a7843fe6bf3c0e40 /bridge
parente9edbfc051afc643d91fc04bc7fb3fe70039c213 (diff)
downloadmatterbridge-msglm-250b3bb5795240d5ebdab5416ab99dbc41be734b.tar.gz
matterbridge-msglm-250b3bb5795240d5ebdab5416ab99dbc41be734b.tar.bz2
matterbridge-msglm-250b3bb5795240d5ebdab5416ab99dbc41be734b.zip
Use upstream slack-go/slack again (#1018)
Diffstat (limited to 'bridge')
-rw-r--r--bridge/slack/handlers.go2
-rw-r--r--bridge/slack/helpers.go2
-rw-r--r--bridge/slack/legacy.go2
-rw-r--r--bridge/slack/slack.go2
-rw-r--r--bridge/slack/users_channels.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go
index 829cfb6a..10ed0ae5 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -7,7 +7,7 @@ import (
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
- "github.com/nlopes/slack"
+ "github.com/slack-go/slack"
)
func (b *Bslack) handleSlack() {
diff --git a/bridge/slack/helpers.go b/bridge/slack/helpers.go
index b95ae878..c970b0d7 100644
--- a/bridge/slack/helpers.go
+++ b/bridge/slack/helpers.go
@@ -7,8 +7,8 @@ import (
"time"
"github.com/42wim/matterbridge/bridge/config"
- "github.com/nlopes/slack"
"github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
)
// populateReceivedMessage shapes the initial Matterbridge message that we will forward to the
diff --git a/bridge/slack/legacy.go b/bridge/slack/legacy.go
index 5c2eca20..d89d286d 100644
--- a/bridge/slack/legacy.go
+++ b/bridge/slack/legacy.go
@@ -5,7 +5,7 @@ import (
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/matterhook"
- "github.com/nlopes/slack"
+ "github.com/slack-go/slack"
)
type BLegacy struct {
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 94f13025..23c856bd 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -13,8 +13,8 @@ import (
"github.com/42wim/matterbridge/bridge/helper"
"github.com/42wim/matterbridge/matterhook"
lru "github.com/hashicorp/golang-lru"
- "github.com/nlopes/slack"
"github.com/rs/xid"
+ "github.com/slack-go/slack"
)
type Bslack struct {
diff --git a/bridge/slack/users_channels.go b/bridge/slack/users_channels.go
index ce14e509..6886414e 100644
--- a/bridge/slack/users_channels.go
+++ b/bridge/slack/users_channels.go
@@ -8,8 +8,8 @@ import (
"time"
"github.com/42wim/matterbridge/bridge/config"
- "github.com/nlopes/slack"
"github.com/sirupsen/logrus"
+ "github.com/slack-go/slack"
)
const minimumRefreshInterval = 10 * time.Second