Archives/matterbridge
2
0
Fork 0
mirror of https://github.com/42wim/matterbridge synced 2024-11-17 03:26:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove need for channel when using api. Closes #195

Browse Source
This commit is contained in:
Wim 2017-06-15 00:40:23 +02:00
parent 8a55c97b4e
commit 3bc219167a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gateway/gateway.go
View File

@ -139,6 +139,9 @@ RECONNECT:
func (gw *Gateway) mapChannels() error { func (gw *Gateway) mapChannels() error {
for _, br := range append(gw.MyConfig.Out, gw.MyConfig.InOut...) { for _, br := range append(gw.MyConfig.Out, gw.MyConfig.InOut...) {
if isApi(br.Account) {
br.Channel = "api"
}
ID := br.Channel + br.Account ID := br.Channel + br.Account
_, ok := gw.Channels[ID] _, ok := gw.Channels[ID]
if !ok { if !ok {
@ -153,6 +156,9 @@ func (gw *Gateway) mapChannels() error {
} }
for _, br := range append(gw.MyConfig.In, gw.MyConfig.InOut...) { for _, br := range append(gw.MyConfig.In, gw.MyConfig.InOut...) {
if isApi(br.Account) {
br.Channel = "api"
}
ID := br.Channel + br.Account ID := br.Channel + br.Account
_, ok := gw.Channels[ID] _, ok := gw.Channels[ID]
if !ok { if !ok {
@ -298,3 +304,10 @@ func (gw *Gateway) validGatewayDest(msg *config.Message, channel *config.Channel
} }
return false return false
} }
func isApi(account string) bool {
if strings.HasPrefix(account, "api.") {
return true
}
return false
}