bump irc-go

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-test/deep v1.0.6 // indirect
 	github.com/gorilla/websocket v1.4.2
-	github.com/goshuirc/irc-go v0.0.0-20210304031553-cf78e9176f96
+	github.com/goshuirc/irc-go v0.0.0-20210311004346-ea7a188a73fe
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/oragono/confusables v0.0.0-20201108231250-4ab98ab61fb1

go.sum

@@ -42,6 +42,8 @@ github.com/goshuirc/irc-go v0.0.0-20210301225436-2c4b83d64847 h1:MmsZRpAsMxyw0P5
 github.com/goshuirc/irc-go v0.0.0-20210301225436-2c4b83d64847/go.mod h1:q/JhvvKLmif3y9q8MDQM+gRCnjEKnu5ClF298TTXJug=
 github.com/goshuirc/irc-go v0.0.0-20210304031553-cf78e9176f96 h1:sihI3HsrJWyS4MtBmxh5W4gDZD34SWodkWyUvJltswY=
 github.com/goshuirc/irc-go v0.0.0-20210304031553-cf78e9176f96/go.mod h1:q/JhvvKLmif3y9q8MDQM+gRCnjEKnu5ClF298TTXJug=
+github.com/goshuirc/irc-go v0.0.0-20210311004346-ea7a188a73fe h1:5UsPgeXJBkFgJK3Ml0nj6ljasjd26xiUxALnDJHmipE=
+github.com/goshuirc/irc-go v0.0.0-20210311004346-ea7a188a73fe/go.mod h1:q/JhvvKLmif3y9q8MDQM+gRCnjEKnu5ClF298TTXJug=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

vendor/github.com/goshuirc/irc-go/ircmsg/message.go

@@ -61,10 +61,10 @@ var (
 	ErrorBadParam = errors.New("Cannot have an empty param, a param with spaces, or a param that starts with ':' before the last parameter")
 )
 
-// IRCMessage represents an IRC message, as defined by the RFCs and as
+// Message represents an IRC message, as defined by the RFCs and as
 // extended by the IRCv3 Message Tags specification with the introduction
 // of message tags.
-type IRCMessage struct {
+type Message struct {
 	Prefix         string
 	Command        string
 	Params         []string
@@ -77,12 +77,12 @@ type IRCMessage struct {
 // will be encoded as a "trailing parameter" (preceded by a colon). This is
 // almost never necessary and should not be used except when having to interact
 // with broken implementations that don't correctly interpret IRC messages.
-func (msg *IRCMessage) ForceTrailing() {
+func (msg *Message) ForceTrailing() {
 	msg.forceTrailing = true
 }
 
 // GetTag returns whether a tag is present, and if so, what its value is.
-func (msg *IRCMessage) GetTag(tagName string) (present bool, value string) {
+func (msg *Message) GetTag(tagName string) (present bool, value string) {
 	if len(tagName) == 0 {
 		return
 	} else if tagName[0] == '+' {
@@ -95,13 +95,13 @@ func (msg *IRCMessage) GetTag(tagName string) (present bool, value string) {
 }
 
 // HasTag returns whether a tag is present.
-func (msg *IRCMessage) HasTag(tagName string) (present bool) {
+func (msg *Message) HasTag(tagName string) (present bool) {
 	present, _ = msg.GetTag(tagName)
 	return
 }
 
 // SetTag sets a tag.
-func (msg *IRCMessage) SetTag(tagName, tagValue string) {
+func (msg *Message) SetTag(tagName, tagValue string) {
 	if len(tagName) == 0 {
 		return
 	} else if tagName[0] == '+' {
@@ -118,7 +118,7 @@ func (msg *IRCMessage) SetTag(tagName, tagValue string) {
 }
 
 // DeleteTag deletes a tag.
-func (msg *IRCMessage) DeleteTag(tagName string) {
+func (msg *Message) DeleteTag(tagName string) {
 	if len(tagName) == 0 {
 		return
 	} else if tagName[0] == '+' {
@@ -129,14 +129,14 @@ func (msg *IRCMessage) DeleteTag(tagName string) {
 }
 
 // UpdateTags is a convenience to set multiple tags at once.
-func (msg *IRCMessage) UpdateTags(tags map[string]string) {
+func (msg *Message) UpdateTags(tags map[string]string) {
 	for name, value := range tags {
 		msg.SetTag(name, value)
 	}
 }
 
 // AllTags returns all tags as a single map.
-func (msg *IRCMessage) AllTags() (result map[string]string) {
+func (msg *Message) AllTags() (result map[string]string) {
 	result = make(map[string]string, len(msg.tags)+len(msg.clientOnlyTags))
 	for name, value := range msg.tags {
 		result[name] = value
@@ -148,23 +148,23 @@ func (msg *IRCMessage) AllTags() (result map[string]string) {
 }
 
 // ClientOnlyTags returns the client-only tags (the tags with the + prefix).
-// The returned map may be internal storage of the IRCMessage object and
+// The returned map may be internal storage of the Message object and
 // should not be modified.
-func (msg *IRCMessage) ClientOnlyTags() map[string]string {
+func (msg *Message) ClientOnlyTags() map[string]string {
 	return msg.clientOnlyTags
 }
 
 // ParseLine creates and returns a message from the given IRC line.
-func ParseLine(line string) (ircmsg IRCMessage, err error) {
+func ParseLine(line string) (ircmsg Message, err error) {
 	return parseLine(line, 0, 0)
 }
 
-// ParseLineStrict creates and returns an IRCMessage from the given IRC line,
+// ParseLineStrict creates and returns an Message from the given IRC line,
 // taking the maximum length into account and truncating the message as appropriate.
 // If fromClient is true, it enforces the client limit on tag data length (4094 bytes),
 // allowing the server to return ERR_INPUTTOOLONG as appropriate. If truncateLen is
 // nonzero, it is the length at which the non-tag portion of the message is truncated.
-func ParseLineStrict(line string, fromClient bool, truncateLen int) (ircmsg IRCMessage, err error) {
+func ParseLineStrict(line string, fromClient bool, truncateLen int) (ircmsg Message, err error) {
 	maxTagDataLength := MaxlenTagData
 	if fromClient {
 		maxTagDataLength = MaxlenClientTagData
@@ -180,7 +180,7 @@ func trimInitialSpaces(str string) string {
 	return str[i:]
 }
 
-func parseLine(line string, maxTagDataLength int, truncateLen int) (ircmsg IRCMessage, err error) {
+func parseLine(line string, maxTagDataLength int, truncateLen int) (ircmsg Message, err error) {
 	// remove either \n or \r\n from the end of the line:
 	line = strings.TrimSuffix(line, "\n")
 	line = strings.TrimSuffix(line, "\r")
@@ -279,7 +279,7 @@ func parseLine(line string, maxTagDataLength int, truncateLen int) (ircmsg IRCMe
 }
 
 // helper to parse tags
-func (ircmsg *IRCMessage) parseTags(tags string) (err error) {
+func (ircmsg *Message) parseTags(tags string) (err error) {
 	for 0 < len(tags) {
 		tagEnd := strings.IndexByte(tags, ';')
 		endPos := tagEnd
@@ -311,8 +311,8 @@ func (ircmsg *IRCMessage) parseTags(tags string) (err error) {
 	return nil
 }
 
-// MakeMessage provides a simple way to create a new IRCMessage.
+// MakeMessage provides a simple way to create a new Message.
-func MakeMessage(tags map[string]string, prefix string, command string, params ...string) (ircmsg IRCMessage) {
+func MakeMessage(tags map[string]string, prefix string, command string, params ...string) (ircmsg Message) {
 	ircmsg.Prefix = prefix
 	ircmsg.Command = command
 	ircmsg.Params = params
@@ -320,8 +320,8 @@ func MakeMessage(tags map[string]string, prefix string, command string, params .
 	return ircmsg
 }
 
-// Line returns a sendable line created from an IRCMessage.
+// Line returns a sendable line created from an Message.
-func (ircmsg *IRCMessage) Line() (result string, err error) {
+func (ircmsg *Message) Line() (result string, err error) {
 	bytes, err := ircmsg.line(0, 0, 0, 0)
 	if err == nil {
 		result = string(bytes)
@@ -329,17 +329,17 @@ func (ircmsg *IRCMessage) Line() (result string, err error) {
 	return
 }
 
-// LineBytes returns a sendable line created from an IRCMessage.
+// LineBytes returns a sendable line created from an Message.
-func (ircmsg *IRCMessage) LineBytes() (result []byte, err error) {
+func (ircmsg *Message) LineBytes() (result []byte, err error) {
 	result, err = ircmsg.line(0, 0, 0, 0)
 	return
 }
 
-// LineBytesStrict returns a sendable line, as a []byte, created from an IRCMessage.
+// LineBytesStrict returns a sendable line, as a []byte, created from an Message.
 // fromClient controls whether the server-side or client-side tag length limit
 // is enforced. If truncateLen is nonzero, it is the length at which the
 // non-tag portion of the message is truncated.
-func (ircmsg *IRCMessage) LineBytesStrict(fromClient bool, truncateLen int) ([]byte, error) {
+func (ircmsg *Message) LineBytesStrict(fromClient bool, truncateLen int) ([]byte, error) {
 	var tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit int
 	if fromClient {
 		// enforce client max tags:
@@ -359,8 +359,8 @@ func paramRequiresTrailing(param string) bool {
 	return len(param) == 0 || strings.IndexByte(param, ' ') != -1 || param[0] == ':'
 }
 
-// line returns a sendable line created from an IRCMessage.
+// line returns a sendable line created from an Message.
-func (ircmsg *IRCMessage) line(tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit, truncateLen int) (result []byte, err error) {
+func (ircmsg *Message) line(tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit, truncateLen int) (result []byte, err error) {
 	if len(ircmsg.Command) == 0 {
 		return nil, ErrorCommandMissing
 	}

vendor/github.com/goshuirc/irc-go/ircmsg/tags.go

@@ -30,7 +30,7 @@ func init() {
 // EscapeTagValue takes a value, and returns an escaped message tag value.
 //
 // This function is automatically used when lines are created from an
-// IRCMessage, so you don't need to call it yourself before creating a line.
+// Message, so you don't need to call it yourself before creating a line.
 func EscapeTagValue(inString string) string {
 	return valtoescape.Replace(inString)
 }

vendor/github.com/goshuirc/irc-go/ircreader/ircreader.go

@@ -10,7 +10,7 @@ import (
 )
 
 /*
-IRCReader is an optimized line reader for IRC lines containing tags;
+Reader is an optimized line reader for IRC lines containing tags;
 most IRC lines will not approach the maximum line length (8191 bytes
 of tag data, plus 512 bytes of message data), so we want a buffered
 reader that can start with a smaller buffer and expand if necessary,
@@ -21,7 +21,7 @@ var (
 	ErrReadQ = errors.New("readQ exceeded (read too many bytes without terminating newline)")
 )
 
-type IRCReader struct {
+type Reader struct {
 	conn io.Reader
 
 	initialSize int
@@ -34,17 +34,17 @@ type IRCReader struct {
 	eof        bool
 }
 
-// Returns a new *IRCReader with sane buffer size limits.
+// Returns a new *Reader with sane buffer size limits.
-func NewIRCReader(conn io.Reader) *IRCReader {
+func NewIRCReader(conn io.Reader) *Reader {
-	var reader IRCReader
+	var reader Reader
 	reader.Initialize(conn, 512, 8192+1024)
 	return &reader
 }
 
-// "Placement new" for an IRCReader; initializes it with custom buffer size
+// "Placement new" for a Reader; initializes it with custom buffer size
 // limits.
-func (cc *IRCReader) Initialize(conn io.Reader, initialSize, maxSize int) {
+func (cc *Reader) Initialize(conn io.Reader, initialSize, maxSize int) {
-	*cc = IRCReader{}
+	*cc = Reader{}
 	cc.conn = conn
 	cc.initialSize = initialSize
 	cc.maxSize = maxSize
@@ -54,7 +54,7 @@ func (cc *IRCReader) Initialize(conn io.Reader, initialSize, maxSize int) {
 // or \r\n as the line terminator (but not \r in isolation). Passes through
 // errors from the underlying connection. Returns ErrReadQ if the buffer limit
 // was exceeded without a terminating \n.
-func (cc *IRCReader) ReadLine() ([]byte, error) {
+func (cc *Reader) ReadLine() ([]byte, error) {
 	for {
 		// try to find a terminated line in the buffered data already read
 		nlidx := bytes.IndexByte(cc.buf[cc.searchFrom:cc.end], '\n')

vendor/modules.txt

@@ -21,7 +21,7 @@ github.com/go-sql-driver/mysql
 # github.com/gorilla/websocket v1.4.2 => github.com/oragono/websocket v1.4.2-oragono1
 ## explicit
 github.com/gorilla/websocket
-# github.com/goshuirc/irc-go v0.0.0-20210304031553-cf78e9176f96
+# github.com/goshuirc/irc-go v0.0.0-20210311004346-ea7a188a73fe
 ## explicit
 github.com/goshuirc/irc-go/ircfmt
 github.com/goshuirc/irc-go/ircmsg