summaryrefslogtreecommitdiffstats
path: root/gateway
diff options
context:
space:
mode:
authorWim <wim@42.be>2023-04-05 23:39:15 +0200
committerGitHub <noreply@github.com>2023-04-05 23:39:15 +0200
commit89b0d362d29179b389b203e046b22b5b6e5f8310 (patch)
tree87e68ae33885d3de4a2c6a78a6afc6822ab7dd3e /gateway
parent574f25337df2a3a7dbfa18093a4fcbe056b8824b (diff)
downloadmatterbridge-msglm-89b0d362d29179b389b203e046b22b5b6e5f8310.tar.gz
matterbridge-msglm-89b0d362d29179b389b203e046b22b5b6e5f8310.tar.bz2
matterbridge-msglm-89b0d362d29179b389b203e046b22b5b6e5f8310.zip
Remove gitter bridge (#2035)
See https://blog.gitter.im/2023/02/13/gitter-has-fully-migrated-to-matrix/
Diffstat (limited to 'gateway')
-rw-r--r--gateway/bridgemap/bgitter.go11
-rw-r--r--gateway/gateway_test.go48
2 files changed, 8 insertions, 51 deletions
diff --git a/gateway/bridgemap/bgitter.go b/gateway/bridgemap/bgitter.go
deleted file mode 100644
index 64b3c259..00000000
--- a/gateway/bridgemap/bgitter.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !nogitter
-
-package bridgemap
-
-import (
- bgitter "github.com/42wim/matterbridge/bridge/gitter"
-)
-
-func init() {
- FullMap["gitter"] = bgitter.New
-}
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index 21700588..c1e4ab99 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -18,8 +18,6 @@ var testconfig = []byte(`
server=""
[mattermost.test]
server=""
-[gitter.42wim]
-server=""
[discord.test]
server=""
[slack.test]
@@ -34,11 +32,6 @@ server=""
channel = "#wimtesting"
[[gateway.inout]]
- account="gitter.42wim"
- channel="42wim/testroom"
- #channel="matterbridge/Lobby"
-
- [[gateway.inout]]
account = "discord.test"
channel = "general"
@@ -52,8 +45,6 @@ var testconfig2 = []byte(`
server=""
[mattermost.test]
server=""
-[gitter.42wim]
-server=""
[discord.test]
server=""
[slack.test]
@@ -67,10 +58,6 @@ server=""
account = "irc.freenode"
channel = "#wimtesting"
- [[gateway.in]]
- account="gitter.42wim"
- channel="42wim/testroom"
-
[[gateway.inout]]
account = "discord.test"
channel = "general"
@@ -87,10 +74,6 @@ server=""
channel = "#wimtesting2"
[[gateway.out]]
- account="gitter.42wim"
- channel="42wim/testroom"
-
- [[gateway.out]]
account = "discord.test"
channel = "general2"
`)
@@ -184,31 +167,18 @@ func maketestRouter(input []byte) *Router {
}
return r
}
+
func TestNewRouter(t *testing.T) {
r := maketestRouter(testconfig)
assert.Equal(t, 1, len(r.Gateways))
- assert.Equal(t, 4, len(r.Gateways["bridge1"].Bridges))
- assert.Equal(t, 4, len(r.Gateways["bridge1"].Channels))
+ assert.Equal(t, 3, len(r.Gateways["bridge1"].Bridges))
+ assert.Equal(t, 3, len(r.Gateways["bridge1"].Channels))
r = maketestRouter(testconfig2)
assert.Equal(t, 2, len(r.Gateways))
- assert.Equal(t, 4, len(r.Gateways["bridge1"].Bridges))
- assert.Equal(t, 3, len(r.Gateways["bridge2"].Bridges))
- assert.Equal(t, 4, len(r.Gateways["bridge1"].Channels))
- assert.Equal(t, 3, len(r.Gateways["bridge2"].Channels))
- assert.Equal(t, &config.ChannelInfo{
- Name: "42wim/testroom",
- Direction: "out",
- ID: "42wim/testroomgitter.42wim",
- Account: "gitter.42wim",
- SameChannel: map[string]bool{"bridge2": false},
- }, r.Gateways["bridge2"].Channels["42wim/testroomgitter.42wim"])
- assert.Equal(t, &config.ChannelInfo{
- Name: "42wim/testroom",
- Direction: "in",
- ID: "42wim/testroomgitter.42wim",
- Account: "gitter.42wim",
- SameChannel: map[string]bool{"bridge1": false},
- }, r.Gateways["bridge1"].Channels["42wim/testroomgitter.42wim"])
+ assert.Equal(t, 3, len(r.Gateways["bridge1"].Bridges))
+ assert.Equal(t, 2, len(r.Gateways["bridge2"].Bridges))
+ assert.Equal(t, 3, len(r.Gateways["bridge1"].Channels))
+ assert.Equal(t, 2, len(r.Gateways["bridge2"].Channels))
assert.Equal(t, &config.ChannelInfo{
Name: "general",
Direction: "inout",
@@ -241,8 +211,6 @@ func TestGetDestChannel(t *testing.T) {
SameChannel: map[string]bool{"bridge1": false},
Options: config.ChannelOptions{Key: ""},
}}, r.Gateways["bridge1"].getDestChannel(msg, *br))
- case "gitter.42wim":
- assert.Equal(t, []config.ChannelInfo(nil), r.Gateways["bridge1"].getDestChannel(msg, *br))
case "irc.freenode":
assert.Equal(t, []config.ChannelInfo(nil), r.Gateways["bridge1"].getDestChannel(msg, *br))
}
@@ -420,6 +388,7 @@ func (s *ignoreTestSuite) SetupSuite() {
logger.SetOutput(ioutil.Discard)
s.gw = &Gateway{logger: logrus.NewEntry(logger)}
}
+
func (s *ignoreTestSuite) TestIgnoreTextEmpty() {
extraFile := make(map[string][]interface{})
extraAttach := make(map[string][]interface{})
@@ -461,7 +430,6 @@ func (s *ignoreTestSuite) TestIgnoreTextEmpty() {
output := s.gw.ignoreTextEmpty(testcase.input)
s.Assert().Equalf(testcase.output, output, "case '%s' failed", testname)
}
-
}
func (s *ignoreTestSuite) TestIgnoreTexts() {