diff --git a/bridge/slack/legacy.go b/bridge/slack/legacy.go deleted file mode 100644 index be372edd..00000000 --- a/bridge/slack/legacy.go +++ /dev/null @@ -1,74 +0,0 @@ -package bslack - -import ( - "errors" - - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/matterhook" - "github.com/nlopes/slack" -) - -type BLegacy struct { - *Bslack -} - -func NewLegacy(cfg *bridge.Config) bridge.Bridger { - return &BLegacy{Bslack: newBridge(cfg)} -} - -func (b *BLegacy) Connect() error { - b.RLock() - defer b.RUnlock() - if b.GetString(incomingWebhookConfig) != "" { - switch { - case b.GetString(outgoingWebhookConfig) != "": - b.Log.Info("Connecting using webhookurl (sending) and webhookbindaddress (receiving)") - b.mh = matterhook.New(b.GetString(outgoingWebhookConfig), matterhook.Config{ - InsecureSkipVerify: b.GetBool(skipTLSConfig), - BindAddress: b.GetString(incomingWebhookConfig), - }) - case b.GetString(tokenConfig) != "": - b.Log.Info("Connecting using token (sending)") - b.sc = slack.New(b.GetString(tokenConfig)) - b.rtm = b.sc.NewRTM() - go b.rtm.ManageConnection() - b.Log.Info("Connecting using webhookbindaddress (receiving)") - b.mh = matterhook.New(b.GetString(outgoingWebhookConfig), matterhook.Config{ - InsecureSkipVerify: b.GetBool(skipTLSConfig), - BindAddress: b.GetString(incomingWebhookConfig), - }) - default: - b.Log.Info("Connecting using webhookbindaddress (receiving)") - b.mh = matterhook.New(b.GetString(outgoingWebhookConfig), matterhook.Config{ - InsecureSkipVerify: b.GetBool(skipTLSConfig), - BindAddress: b.GetString(incomingWebhookConfig), - }) - } - go b.handleSlack() - return nil - } - if b.GetString(outgoingWebhookConfig) != "" { - b.Log.Info("Connecting using webhookurl (sending)") - b.mh = matterhook.New(b.GetString(outgoingWebhookConfig), matterhook.Config{ - InsecureSkipVerify: b.GetBool(skipTLSConfig), - DisableServer: true, - }) - if b.GetString(tokenConfig) != "" { - b.Log.Info("Connecting using token (receiving)") - b.sc = slack.New(b.GetString(tokenConfig)) - b.rtm = b.sc.NewRTM() - go b.rtm.ManageConnection() - go b.handleSlack() - } - } else if b.GetString(tokenConfig) != "" { - b.Log.Info("Connecting using token (sending and receiving)") - b.sc = slack.New(b.GetString(tokenConfig)) - b.rtm = b.sc.NewRTM() - go b.rtm.ManageConnection() - go b.handleSlack() - } - if b.GetString(incomingWebhookConfig) == "" && b.GetString(outgoingWebhookConfig) == "" && b.GetString(tokenConfig) == "" { - return errors.New("no connection method found. See that you have WebhookBindAddress, WebhookURL or Token configured") - } - return nil -} diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 0d3dc3c0..20940c41 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -80,7 +80,6 @@ func New(cfg *bridge.Config) bridge.Bridger { cfg.Log.Warn("Non-bot token detected. It is STRONGLY recommended to use a proper bot-token instead.") cfg.Log.Warn("Legacy tokens may be deprecated by Slack at short notice. See the Matterbridge GitHub wiki for a migration guide.") cfg.Log.Warn("See https://github.com/42wim/matterbridge/wiki/Slack-bot-setup") - return NewLegacy(cfg) } return newBridge(cfg) } diff --git a/gateway/bridgemap/bridgemap.go b/gateway/bridgemap/bridgemap.go index 20577dc1..a36e5b8a 100644 --- a/gateway/bridgemap/bridgemap.go +++ b/gateway/bridgemap/bridgemap.go @@ -25,7 +25,6 @@ var FullMap = map[string]bridge.Factory{ "mattermost": bmattermost.New, "matrix": bmatrix.New, "rocketchat": brocketchat.New, - "slack-legacy": bslack.NewLegacy, "slack": bslack.New, "sshchat": bsshchat.New, "steam": bsteam.New,