~emersion/soju

4af7a1b8e5a0a69dd18c10a05de1b9f06ded2696 — Simon Ser 8 days ago c50fb4a master
Rename join to generateJoin

For consistency with other functions.
2 files changed, 2 insertions(+), 2 deletions(-)

M irc.go
M upstream.go
M irc.go => irc.go +1 -1
@@ 300,7 300,7 @@ type batch struct {
	Label  string
}

func join(channels, keys []string) []*irc.Message {
func generateJoin(channels, keys []string) []*irc.Message {
	// Put channels with a key first
	js := joinSorter{channels, keys}
	sort.Sort(&js)

M upstream.go => upstream.go +1 -1
@@ 773,7 773,7 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
				keys = append(keys, ch.Key)
			}

			for _, msg := range join(channels, keys) {
			for _, msg := range generateJoin(channels, keys) {
				uc.SendMessage(ctx, msg)
			}
		}