summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/lrstanley
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/lrstanley')
-rw-r--r--vendor/github.com/lrstanley/girc/builtin.go5
-rw-r--r--vendor/github.com/lrstanley/girc/client.go3
2 files changed, 7 insertions, 1 deletions
diff --git a/vendor/github.com/lrstanley/girc/builtin.go b/vendor/github.com/lrstanley/girc/builtin.go
index 778a5c68..081e9465 100644
--- a/vendor/github.com/lrstanley/girc/builtin.go
+++ b/vendor/github.com/lrstanley/girc/builtin.go
@@ -108,7 +108,10 @@ func nickCollisionHandler(c *Client, e Event) {
return
}
- c.Cmd.Nick(c.Config.HandleNickCollide(c.GetNick()))
+ newNick := c.Config.HandleNickCollide(c.GetNick())
+ if newNick != "" {
+ c.Cmd.Nick(newNick)
+ }
}
// handlePING helps respond to ping requests from the server.
diff --git a/vendor/github.com/lrstanley/girc/client.go b/vendor/github.com/lrstanley/girc/client.go
index f8035755..3308b399 100644
--- a/vendor/github.com/lrstanley/girc/client.go
+++ b/vendor/github.com/lrstanley/girc/client.go
@@ -168,6 +168,9 @@ type Config struct {
// an invalid nickname. For example, if "test" is already in use, or is
// blocked by the network/a service, the client will try and use "test_",
// then it will attempt "test__", "test___", and so on.
+ //
+ // If HandleNickCollide returns an empty string, the client will not
+ // attempt to fix nickname collisions, and you must handle this yourself.
HandleNickCollide func(oldNick string) (newNick string)
}