diff options
| -rw-r--r-- | bridge/irc/helper.go | 2 | ||||
| -rw-r--r-- | bridge/irc/irc.go | 10 | ||||
| -rw-r--r-- | bridge/matrix/matrix.go | 3 | ||||
| -rw-r--r-- | gateway/gateway.go | 4 |
4 files changed, 8 insertions, 11 deletions
diff --git a/bridge/irc/helper.go b/bridge/irc/helper.go index dd1cc468..31382aa4 100644 --- a/bridge/irc/helper.go +++ b/bridge/irc/helper.go @@ -32,7 +32,7 @@ func tableformatter(nicks []string, nicksPerRow int, continued bool) string { } */ -func plainformatter(nicks []string, nicksPerRow int) string { +func plainformatter(nicks []string) string { return strings.Join(nicks, ", ") + " currently on IRC" } diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index c1cbdf60..25f6beec 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -271,14 +271,12 @@ func (b *Birc) endNames(client *girc.Client, event girc.Event) { channel := event.Params[1] sort.Strings(b.names[channel]) maxNamesPerPost := (300 / b.nicksPerRow()) * b.nicksPerRow() - continued := false for len(b.names[channel]) > maxNamesPerPost { - b.Remote <- config.Message{Username: b.Nick, Text: b.formatnicks(b.names[channel][0:maxNamesPerPost], continued), + b.Remote <- config.Message{Username: b.Nick, Text: b.formatnicks(b.names[channel][0:maxNamesPerPost]), Channel: channel, Account: b.Account} b.names[channel] = b.names[channel][maxNamesPerPost:] - continued = true } - b.Remote <- config.Message{Username: b.Nick, Text: b.formatnicks(b.names[channel], continued), + b.Remote <- config.Message{Username: b.Nick, Text: b.formatnicks(b.names[channel]), Channel: channel, Account: b.Account} b.names[channel] = nil b.i.Handlers.Clear(girc.RPL_NAMREPLY) @@ -464,6 +462,6 @@ func (b *Birc) storeNames(client *girc.Client, event girc.Event) { strings.Split(strings.TrimSpace(event.Trailing), " ")...) } -func (b *Birc) formatnicks(nicks []string, continued bool) string { - return plainformatter(nicks, b.nicksPerRow()) +func (b *Birc) formatnicks(nicks []string) string { + return plainformatter(nicks) } diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index ba02d4aa..18bc5572 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -129,7 +129,7 @@ func (b *Bmatrix) getRoomID(channel string) string { return "" } -func (b *Bmatrix) handlematrix() error { +func (b *Bmatrix) handlematrix() { syncer := b.mc.Syncer.(*matrix.DefaultSyncer) syncer.OnEventType("m.room.redaction", b.handleEvent) syncer.OnEventType("m.room.message", b.handleEvent) @@ -140,7 +140,6 @@ func (b *Bmatrix) handlematrix() error { } } }() - return nil } func (b *Bmatrix) handleEvent(ev *matrix.Event) { diff --git a/gateway/gateway.go b/gateway/gateway.go index fb2cff4f..e699251f 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -218,7 +218,7 @@ func (gw *Gateway) getDestChannel(msg *config.Message, dest bridge.Bridge) []con } continue } - if strings.Contains(channel.Direction, "out") && channel.Account == dest.Account && gw.validGatewayDest(msg, channel) { + if strings.Contains(channel.Direction, "out") && channel.Account == dest.Account && gw.validGatewayDest(msg) { channels = append(channels, *channel) } } @@ -537,7 +537,7 @@ func (gw *Gateway) handleFiles(msg *config.Message) { } } -func (gw *Gateway) validGatewayDest(msg *config.Message, channel *config.ChannelInfo) bool { +func (gw *Gateway) validGatewayDest(msg *config.Message) bool { return msg.Gateway == gw.Name } |