diff --git a/bridge/config/config.go b/bridge/config/config.go index eb34912d..7ae5c227 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -161,20 +161,6 @@ type SameChannelGateway struct { } type BridgeValues struct { - API map[string]Protocol - IRC map[string]Protocol - Mattermost map[string]Protocol - Matrix map[string]Protocol - Slack map[string]Protocol - SlackLegacy map[string]Protocol - Steam map[string]Protocol - Gitter map[string]Protocol - XMPP map[string]Protocol - Discord map[string]Protocol - Telegram map[string]Protocol - Rocketchat map[string]Protocol - SSHChat map[string]Protocol - Zulip map[string]Protocol General Protocol Gateway []Gateway SameChannelGateway []SameChannelGateway diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index a38bbb53..0d3dc3c0 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -77,14 +77,9 @@ func New(cfg *bridge.Config) bridge.Bridger { // Print a deprecation warning for legacy non-bot tokens (#527). token := cfg.GetString(tokenConfig) if token != "" && !strings.HasPrefix(token, "xoxb") { - cfg.Log.Error("Non-bot token detected. It is STRONGLY recommended to use a proper bot-token instead.") - cfg.Log.Error("Legacy tokens may be deprecated by Slack at short notice. See the Matterbridge GitHub wiki for a migration guide.") - cfg.Log.Error("See https://github.com/42wim/matterbridge/wiki/Slack-bot-setup") - cfg.Log.Error("") - cfg.Log.Error("To continue using a legacy token please move your configuration to a \"slack-legacy\" bridge instead.") - cfg.Log.Error("See https://github.com/42wim/matterbridge/wiki/Section-Slack-(basic)#legacy-configuration)") - cfg.Log.Error("Delaying start of bridge by 30 seconds. Future Matterbridge release will fail here unless you use a \"slack-legacy\" bridge.") - time.Sleep(30 * time.Second) + 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)