From e957a89ee24e1365ce0fb0d2bb832c08236e8b61 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 15 Feb 2021 11:27:04 -0500 Subject: [PATCH] bump irc-go for the IRCMessage rename --- go.mod | 2 +- go.sum | 2 + irc/client.go | 6 +- irc/commands.go | 4 +- irc/handlers.go | 142 +++++++++--------- irc/message_cache.go | 8 +- irc/monitor.go | 2 +- irc/responsebuffer.go | 10 +- irc/services.go | 2 +- irc/uban.go | 2 +- .../goshuirc/irc-go/ircmsg/message.go | 52 +++---- .../github.com/goshuirc/irc-go/ircmsg/tags.go | 2 +- vendor/modules.txt | 2 +- 13 files changed, 119 insertions(+), 117 deletions(-) diff --git a/go.mod b/go.mod index 50af4f90..c25ae525 100644 --- a/go.mod +++ b/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-20210214015142-9d703e6ac38a + github.com/goshuirc/irc-go v0.0.0-20210215162435-14cd697c0c8c 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 diff --git a/go.sum b/go.sum index ac5acfa1..dccff417 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/goshuirc/irc-go v0.0.0-20210214005848-fcaabd19f360 h1:ChbmWPZwyfgsZd6 github.com/goshuirc/irc-go v0.0.0-20210214005848-fcaabd19f360/go.mod h1:q/JhvvKLmif3y9q8MDQM+gRCnjEKnu5ClF298TTXJug= github.com/goshuirc/irc-go v0.0.0-20210214015142-9d703e6ac38a h1:PR1tw21nn93AwKmjEPA7IVHiT+ld9qgO1H32APCMvL0= github.com/goshuirc/irc-go v0.0.0-20210214015142-9d703e6ac38a/go.mod h1:q/JhvvKLmif3y9q8MDQM+gRCnjEKnu5ClF298TTXJug= +github.com/goshuirc/irc-go v0.0.0-20210215162435-14cd697c0c8c h1:pOTMO5A1nszuxNyKieZa3owgDqCpN1OhOGbBg8EuLzk= +github.com/goshuirc/irc-go v0.0.0-20210215162435-14cd697c0c8c/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= diff --git a/irc/client.go b/irc/client.go index 05c5220b..6fcb3cf6 100644 --- a/irc/client.go +++ b/irc/client.go @@ -1662,7 +1662,7 @@ func (session *Session) sendFromClientInternal(blocking bool, serverTime time.Ti return session.SendRawMessage(msg, blocking) } -func composeMultilineBatch(batchID, fromNickMask, fromAccount string, tags map[string]string, command, target string, message utils.SplitMessage) (result []ircmsg.IrcMessage) { +func composeMultilineBatch(batchID, fromNickMask, fromAccount string, tags map[string]string, command, target string, message utils.SplitMessage) (result []ircmsg.IRCMessage) { batchStart := ircmsg.MakeMessage(tags, fromNickMask, "BATCH", "+"+batchID, caps.MultilineBatchType, target) batchStart.SetTag("time", message.Time.Format(IRCv3TimestampFormat)) batchStart.SetTag("msgid", message.Msgid) @@ -1702,7 +1702,7 @@ var ( ) // SendRawMessage sends a raw message to the client. -func (session *Session) SendRawMessage(message ircmsg.IrcMessage, blocking bool) error { +func (session *Session) SendRawMessage(message ircmsg.IRCMessage, blocking bool) error { // use dumb hack to force the last param to be a trailing param if required config := session.client.server.Config() if config.Server.Compatibility.forceTrailing && commandsThatMustUseTrailing[message.Command] { @@ -1764,7 +1764,7 @@ func (session *Session) Send(tags map[string]string, prefix string, command stri return session.SendRawMessage(msg, false) } -func (session *Session) setTimeTag(msg *ircmsg.IrcMessage, serverTime time.Time) { +func (session *Session) setTimeTag(msg *ircmsg.IRCMessage, serverTime time.Time) { if session.capabilities.Has(caps.ServerTime) && !msg.HasTag("time") { if serverTime.IsZero() { serverTime = time.Now() diff --git a/irc/commands.go b/irc/commands.go index 7fa70287..19f62e1d 100644 --- a/irc/commands.go +++ b/irc/commands.go @@ -11,7 +11,7 @@ import ( // Command represents a command accepted from a client. type Command struct { - handler func(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool + handler func(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool usablePreReg bool allowedInBatch bool // allowed in client-to-server batches minParams int @@ -19,7 +19,7 @@ type Command struct { } // Run runs this command with the given client/message. -func (cmd *Command) Run(server *Server, client *Client, session *Session, msg ircmsg.IrcMessage) (exiting bool) { +func (cmd *Command) Run(server *Server, client *Client, session *Session, msg ircmsg.IRCMessage) (exiting bool) { rb := NewResponseBuffer(session) rb.Label = GetLabel(msg) diff --git a/irc/handlers.go b/irc/handlers.go index 7443e250..1b8a4af6 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -138,7 +138,7 @@ func (server *Server) sendLoginSnomask(nickMask, accountName string) { } // AUTHENTICATE [||*] -func authenticateHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func authenticateHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { session := rb.session config := server.Config() details := client.Details() @@ -340,7 +340,7 @@ func authExternalHandler(server *Server, client *Client, mechanism string, value } // AWAY [] -func awayHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func awayHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var isAway bool var awayMessage string if len(msg.Params) > 0 { @@ -377,7 +377,7 @@ func dispatchAwayNotify(client *Client, isAway bool, awayMessage string) { } // BATCH {+,-}reference-tag type [params...] -func batchHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func batchHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { tag := msg.Params[0] fail := false sendErrors := rb.session.batch.command != "NOTICE" @@ -421,7 +421,7 @@ func batchHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // BRB [message] -func brbHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func brbHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { success, duration := client.brbTimer.Enable() if !success { rb.Add(nil, server.name, "FAIL", "BRB", "CANNOT_BRB", client.t("Your client does not support BRB")) @@ -446,7 +446,7 @@ func brbHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo } // CAP [] -func capHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func capHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { details := client.Details() subCommand := strings.ToUpper(msg.Params[0]) toAdd := caps.NewSet() @@ -564,7 +564,7 @@ func capHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo // e.g., CHATHISTORY #ircv3 AFTER id=ytNBbt565yt4r3err3 10 // CHATHISTORY BETWEEN [] // e.g., CHATHISTORY #ircv3 BETWEEN timestamp=YYYY-MM-DDThh:mm:ss.sssZ timestamp=YYYY-MM-DDThh:mm:ss.sssZ + 100 -func chathistoryHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) (exiting bool) { +func chathistoryHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) (exiting bool) { var items []history.Item unknown_command := false var target string @@ -702,7 +702,7 @@ func chathistoryHandler(server *Server, client *Client, msg ircmsg.IrcMessage, r } // DEBUG -func debugHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func debugHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { param := strings.ToUpper(msg.Params[0]) switch param { @@ -775,7 +775,7 @@ func debugHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res return false } -func defconHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func defconHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if len(msg.Params) > 0 { level, err := strconv.Atoi(msg.Params[0]) if err == nil && 1 <= level && level <= 5 { @@ -823,7 +823,7 @@ func formatBanForListing(client *Client, key string, info IPBanInfo) string { // DLINE [ANDKILL] [MYSELF] [duration] / [ON ] [reason [| oper reason]] // DLINE LIST -func dlineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func dlineHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { // check oper permissions oper := client.Oper() if !oper.HasRoleCapab("ban") { @@ -962,7 +962,7 @@ func dlineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // EXTJWT [service_name] -func extjwtHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func extjwtHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { accountName := client.AccountName() if accountName == "*" { accountName = "" @@ -1030,7 +1030,7 @@ func extjwtHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re // HELP [] // HELPOP [] -func helpHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func helpHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if len(msg.Params) == 0 { client.sendHelp("HELPOP", client.t(`HELPOP @@ -1065,7 +1065,7 @@ Get an explanation of , or "index" for a list of help topics.`), rb) // e.g., HISTORY #ubuntu 10 // HISTORY me 15 // HISTORY #darwin 1h -func historyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func historyHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { config := server.Config() if !config.History.Enabled { rb.Notice(client.t("This command has been disabled by the server administrators")) @@ -1093,7 +1093,7 @@ func historyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } // INFO -func infoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func infoHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nick := client.Nick() // we do the below so that the human-readable lines in info can be translated. for _, line := range infoString1 { @@ -1133,7 +1133,7 @@ func infoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp // INVITE // UNINVITE -func inviteHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func inviteHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { invite := msg.Command == "INVITE" nickname := msg.Params[0] channelName := msg.Params[1] @@ -1160,7 +1160,7 @@ func inviteHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // ISON { } -func isonHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func isonHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var nicks = msg.Params ison := make([]string, 0, len(msg.Params)) @@ -1176,7 +1176,7 @@ func isonHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // JOIN {,} [{,}] -func joinHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func joinHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { // #1417: allow `JOIN 0` with a confirmation code if msg.Params[0] == "0" { expectedCode := utils.ConfirmationCode("", rb.session.ctime) @@ -1253,7 +1253,7 @@ func sendJoinError(client *Client, name string, rb *ResponseBuffer, err error) { } // SAJOIN [nick] #channel{,#channel} -func sajoinHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func sajoinHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var target *Client var channelString string if strings.HasPrefix(msg.Params[0], "#") { @@ -1288,7 +1288,7 @@ func sajoinHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // KICK {,} {,} [] -func kickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func kickHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { hasPrivs := client.HasRoleCapabs("samode") channels := strings.Split(msg.Params[0], ",") users := strings.Split(msg.Params[1], ",") @@ -1339,7 +1339,7 @@ func kickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // KILL -func killHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func killHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nickname := msg.Params[0] comment := "" if len(msg.Params) > 1 { @@ -1365,7 +1365,7 @@ func killHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp // KLINE [ANDKILL] [MYSELF] [duration] [ON ] [reason [| oper reason]] // KLINE LIST -func klineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func klineHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { details := client.Details() // check oper permissions oper := client.Oper() @@ -1507,7 +1507,7 @@ func klineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // LANGUAGE { } -func languageHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func languageHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nick := client.Nick() alreadyDoneLanguages := make(map[string]bool) var appliedLanguages []string @@ -1561,7 +1561,7 @@ func languageHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * } // LIST [{,}] [{,}] -func listHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func listHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { config := server.Config() if time.Since(client.ctime) < config.Channels.ListDelay && client.Account() == "" && !client.HasMode(modes.Operator) { remaining := time.Until(client.ctime.Add(config.Channels.ListDelay)) @@ -1649,13 +1649,13 @@ func listHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // LUSERS [ []] -func lusersHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func lusersHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { server.Lusers(client, rb) return false } // MODE [ [...]] -func modeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func modeHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if 0 < len(msg.Params[0]) && msg.Params[0][0] == '#' { return cmodeHandler(server, client, msg, rb) } @@ -1663,7 +1663,7 @@ func modeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // MODE [ [...]] -func cmodeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func cmodeHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { channel := server.channels.Get(msg.Params[0]) if channel == nil { @@ -1721,7 +1721,7 @@ func announceCmodeChanges(channel *Channel, applied modes.ModeChanges, source, a } // MODE [ [...]] -func umodeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func umodeHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { cDetails := client.Details() target := server.clients.Get(msg.Params[0]) if target == nil { @@ -1793,7 +1793,7 @@ func (server *Server) getCurrentNick(nick string) (result string) { } // MONITOR [params...] -func monitorHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { handler, exists := monitorSubcommands[strings.ToLower(msg.Params[0])] if !exists { @@ -1805,7 +1805,7 @@ func monitorHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } // MONITOR - {,} -func monitorRemoveHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorRemoveHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if len(msg.Params) < 2 { rb.Add(nil, server.name, ERR_NEEDMOREPARAMS, client.Nick(), msg.Command, client.t("Not enough parameters")) return false @@ -1820,7 +1820,7 @@ func monitorRemoveHandler(server *Server, client *Client, msg ircmsg.IrcMessage, } // MONITOR + {,} -func monitorAddHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorAddHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if len(msg.Params) < 2 { rb.Add(nil, server.name, ERR_NEEDMOREPARAMS, client.Nick(), msg.Command, client.t("Not enough parameters")) return false @@ -1867,13 +1867,13 @@ func monitorAddHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb } // MONITOR C -func monitorClearHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorClearHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { server.monitorManager.RemoveAll(rb.session) return false } // MONITOR L -func monitorListHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorListHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nick := client.Nick() monitorList := server.monitorManager.List(rb.session) @@ -1898,7 +1898,7 @@ func monitorListHandler(server *Server, client *Client, msg ircmsg.IrcMessage, r } // MONITOR S -func monitorStatusHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func monitorStatusHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var online []string var offline []string @@ -1928,13 +1928,13 @@ func monitorStatusHandler(server *Server, client *Client, msg ircmsg.IrcMessage, } // MOTD -func motdHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func motdHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { server.MOTD(client, rb) return false } // NAMES [{,} [target]] -func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func namesHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var channels []string if len(msg.Params) > 0 { channels = strings.Split(msg.Params[0], ",") @@ -1968,7 +1968,7 @@ func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // NICK -func nickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func nickHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if client.registered { if client.account == "" && server.Config().Accounts.NickReservation.ForbidAnonNickChanges { rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), client.t("You may not change your nickname")) @@ -1982,7 +1982,7 @@ func nickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // helper to store a batched PRIVMSG in the session object -func absorbBatchedMessage(server *Server, client *Client, msg ircmsg.IrcMessage, batchTag string, histType history.ItemType, rb *ResponseBuffer) { +func absorbBatchedMessage(server *Server, client *Client, msg ircmsg.IRCMessage, batchTag string, histType history.ItemType, rb *ResponseBuffer) { var errorCode, errorMessage string defer func() { if errorCode != "" { @@ -2022,7 +2022,7 @@ func absorbBatchedMessage(server *Server, client *Client, msg ircmsg.IrcMessage, // NOTICE {,} // PRIVMSG {,} // TAGMSG {,} -func messageHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func messageHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { histType, err := msgCommandToHistType(msg.Command) if err != nil { return false @@ -2227,7 +2227,7 @@ func itemIsStorable(item *history.Item, config *Config) bool { } // NPC -func npcHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func npcHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { target := msg.Params[0] fakeSource := msg.Params[1] message := msg.Params[2:] @@ -2238,7 +2238,7 @@ func npcHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo } // NPCA -func npcaHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func npcaHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { target := msg.Params[0] fakeSource := msg.Params[1] message := msg.Params[2:] @@ -2249,7 +2249,7 @@ func npcaHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // OPER [password] -func operHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func operHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if client.HasMode(modes.Operator) { rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), "OPER", client.t("You're already opered-up!")) return false @@ -2334,7 +2334,7 @@ func applyOper(client *Client, oper *Oper, rb *ResponseBuffer) { } // DEOPER -func deoperHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func deoperHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if client.Oper() == nil { rb.Notice(client.t("Insufficient oper privs")) return false @@ -2345,7 +2345,7 @@ func deoperHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // PART {,} [] -func partHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func partHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { channels := strings.Split(msg.Params[0], ",") var reason string if len(msg.Params) > 1 { @@ -2365,7 +2365,7 @@ func partHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // PASS -func passHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func passHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if client.registered { rb.Add(nil, server.name, ERR_ALREADYREGISTRED, client.nick, client.t("You may not reregister")) return false @@ -2420,19 +2420,19 @@ func passHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // PING [params...] -func pingHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func pingHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, "PONG", server.name, msg.Params[0]) return false } // PONG [params...] -func pongHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func pongHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { // client gets touched when they send this command, so we don't need to do anything return false } // QUIT [] -func quitHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func quitHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { reason := "Quit" if len(msg.Params) > 0 { reason += ": " + msg.Params[0] @@ -2442,7 +2442,7 @@ func quitHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp } // REGISTER < email | * > -func registerHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) (exiting bool) { +func registerHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) (exiting bool) { config := server.Config() if !config.Accounts.Registration.Enabled { rb.Add(nil, server.name, "FAIL", "REGISTER", "DISALLOWED", client.t("Account registration is disabled")) @@ -2509,7 +2509,7 @@ func registerHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * } // VERIFY -func verifyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) (exiting bool) { +func verifyHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) (exiting bool) { config := server.Config() if !config.Accounts.Registration.Enabled { rb.Add(nil, server.name, "FAIL", "VERIFY", "DISALLOWED", client.t("Account registration is disabled")) @@ -2551,7 +2551,7 @@ func verifyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // REHASH -func rehashHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func rehashHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nick := client.Nick() server.logger.Info("server", "REHASH command used by", nick) err := server.rehash() @@ -2569,7 +2569,7 @@ func rehashHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // RELAYMSG : -func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) (result bool) { +func relaymsgHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) (result bool) { config := server.Config() if !config.Server.Relaymsg.Enabled { rb.Add(nil, server.name, "FAIL", "RELAYMSG", "NOT_ENABLED", client.t("RELAYMSG has been disabled")) @@ -2638,7 +2638,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * } // RENAME [] -func renameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func renameHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { oldName, newName := msg.Params[0], msg.Params[1] var reason string if 2 < len(msg.Params) { @@ -2724,7 +2724,7 @@ func renameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // RESUME [timestamp] -func resumeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func resumeHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { details := ResumeDetails{ PresentedToken: msg.Params[0], } @@ -2748,7 +2748,7 @@ func resumeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // SANICK -func sanickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func sanickHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { targetNick := msg.Params[0] target := server.clients.Get(targetNick) if target == nil { @@ -2760,7 +2760,7 @@ func sanickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // SCENE -func sceneHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func sceneHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { target := msg.Params[0] message := msg.Params[1:] @@ -2770,7 +2770,7 @@ func sceneHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // SETNAME -func setnameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func setnameHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { realname := msg.Params[0] if len(msg.Params) != 1 { // workaround for clients that turn unknown commands into raw IRC lines, @@ -2798,19 +2798,19 @@ func setnameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } // SUMMON [parameters] -func summonHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func summonHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, ERR_SUMMONDISABLED, client.Nick(), client.t("SUMMON has been disabled")) return false } // TIME -func timeHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func timeHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, RPL_TIME, client.nick, server.name, time.Now().UTC().Format(time.RFC1123)) return false } // TOPIC [] -func topicHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func topicHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { channel := server.channels.Get(msg.Params[0]) if channel == nil { rb.Add(nil, server.name, ERR_NOSUCHCHANNEL, client.nick, utils.SafeErrorParam(msg.Params[0]), client.t("No such channel")) @@ -2826,7 +2826,7 @@ func topicHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // UNDLINE | -func unDLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func unDLineHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { // check oper permissions oper := client.Oper() if !oper.HasRoleCapab("ban") { @@ -2859,7 +2859,7 @@ func unDLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } // UNKLINE -func unKLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func unKLineHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { details := client.Details() // check oper permissions oper := client.Oper() @@ -2889,7 +2889,7 @@ func unKLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } // USER * 0 -func userHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func userHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { if client.registered { rb.Add(nil, server.name, ERR_ALREADYREGISTRED, client.Nick(), client.t("You may not reregister")) return false @@ -2944,7 +2944,7 @@ func operStatusVisible(client, target *Client, hasPrivs bool) bool { } // USERHOST { } -func userhostHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func userhostHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { hasPrivs := client.HasMode(modes.Operator) returnedClients := make(ClientSet) @@ -2992,20 +2992,20 @@ func userhostHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * } // USERS [parameters] -func usersHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func usersHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, ERR_USERSDISABLED, client.Nick(), client.t("USERS has been disabled")) return false } // VERSION -func versionHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func versionHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, RPL_VERSION, client.nick, Ver, server.name) server.RplISupport(client, rb) return false } // WEBIRC [:flag1 flag2=x flag3] -func webircHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func webircHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { // only allow unregistered clients to use this command if client.registered || client.proxiedIP != nil { return false @@ -3179,7 +3179,7 @@ func (client *Client) rplWhoReply(channel *Channel, target *Client, rb *Response } // WHO [%,] -func whoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func whoHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { mask := msg.Params[0] var err error if mask == "" { @@ -3287,7 +3287,7 @@ func whoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo } // WHOIS [] {,} -func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func whoisHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { var masksString string //var target string @@ -3348,7 +3348,7 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } // WHOWAS [ []] -func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func whowasHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { nicknames := strings.Split(msg.Params[0], ",") // 0 means "all the entries", as does a negative number @@ -3382,7 +3382,7 @@ func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re } // ZNC [params] -func zncHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func zncHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { params := msg.Params[1:] // #1205: compatibility with Palaver, which sends `ZNC *playback :play ...` if len(params) == 1 && strings.IndexByte(params[0], ' ') != -1 { @@ -3393,13 +3393,13 @@ func zncHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo } // fake handler for unknown commands -func unknownCommandHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func unknownCommandHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, ERR_UNKNOWNCOMMAND, client.Nick(), utils.SafeErrorParam(msg.Command), client.t("Unknown command")) return false } // fake handler for invalid utf8 -func invalidUtf8Handler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func invalidUtf8Handler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { rb.Add(nil, server.name, "FAIL", utils.SafeErrorParam(msg.Command), "INVALID_UTF8", client.t("Message rejected for containing invalid UTF-8")) return false } diff --git a/irc/message_cache.go b/irc/message_cache.go index 55efde81..e80792e4 100644 --- a/irc/message_cache.go +++ b/irc/message_cache.go @@ -42,7 +42,7 @@ type MessageCache struct { splitMessage utils.SplitMessage } -func addAllTags(msg *ircmsg.IrcMessage, tags map[string]string, serverTime time.Time, msgid, accountName string) { +func addAllTags(msg *ircmsg.IRCMessage, tags map[string]string, serverTime time.Time, msgid, accountName string) { msg.UpdateTags(tags) msg.SetTag("time", serverTime.Format(IRCv3TimestampFormat)) if accountName != "*" { @@ -73,7 +73,7 @@ func (m *MessageCache) Initialize(server *Server, serverTime time.Time, msgid st m.command = command m.params = params - var msg ircmsg.IrcMessage + var msg ircmsg.IRCMessage config := server.Config() if config.Server.Compatibility.forceTrailing && commandsThatMustUseTrailing[command] { msg.ForceTrailing() @@ -110,7 +110,7 @@ func (m *MessageCache) InitializeSplitMessage(server *Server, nickmask, accountN if message.Is512() { isTagmsg := command == "TAGMSG" - var msg ircmsg.IrcMessage + var msg ircmsg.IRCMessage if forceTrailing { msg.ForceTrailing() } @@ -136,7 +136,7 @@ func (m *MessageCache) InitializeSplitMessage(server *Server, nickmask, accountN return } } else { - var msg ircmsg.IrcMessage + var msg ircmsg.IRCMessage if forceTrailing { msg.ForceTrailing() } diff --git a/irc/monitor.go b/irc/monitor.go index b20aa4ea..93505d1d 100644 --- a/irc/monitor.go +++ b/irc/monitor.go @@ -105,7 +105,7 @@ func (manager *MonitorManager) List(session *Session) (nicks []string) { } var ( - monitorSubcommands = map[string]func(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool{ + monitorSubcommands = map[string]func(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool{ "-": monitorRemoveHandler, "+": monitorAddHandler, "c": monitorClearHandler, diff --git a/irc/responsebuffer.go b/irc/responsebuffer.go index f981d618..102473e1 100644 --- a/irc/responsebuffer.go +++ b/irc/responsebuffer.go @@ -36,14 +36,14 @@ type ResponseBuffer struct { // nested batch.) nestedBatches []string - messages []ircmsg.IrcMessage + messages []ircmsg.IRCMessage finalized bool target *Client session *Session } // GetLabel returns the label from the given message. -func GetLabel(msg ircmsg.IrcMessage) string { +func GetLabel(msg ircmsg.IRCMessage) string { _, value := msg.GetTag(caps.LabelTagName) return value } @@ -57,7 +57,7 @@ func NewResponseBuffer(session *Session) *ResponseBuffer { } } -func (rb *ResponseBuffer) AddMessage(msg ircmsg.IrcMessage) { +func (rb *ResponseBuffer) AddMessage(msg ircmsg.IRCMessage) { if rb.finalized { rb.target.server.logger.Error("internal", "message added to finalized ResponseBuffer, undefined behavior") debug.PrintStack() @@ -72,7 +72,7 @@ func (rb *ResponseBuffer) AddMessage(msg ircmsg.IrcMessage) { rb.messages = append(rb.messages, msg) } -func (rb *ResponseBuffer) setNestedBatchTag(msg *ircmsg.IrcMessage) { +func (rb *ResponseBuffer) setNestedBatchTag(msg *ircmsg.IRCMessage) { if 0 < len(rb.nestedBatches) { msg.SetTag("batch", rb.nestedBatches[len(rb.nestedBatches)-1]) } @@ -86,7 +86,7 @@ func (rb *ResponseBuffer) Add(tags map[string]string, prefix string, command str // Broadcast adds a standard new message to our queue, then sends an unlabeled copy // to all other sessions. func (rb *ResponseBuffer) Broadcast(tags map[string]string, prefix string, command string, params ...string) { - // can't reuse the IrcMessage object because of tag pollution :-\ + // can't reuse the IRCMessage object because of tag pollution :-\ rb.Add(tags, prefix, command, params...) for _, session := range rb.session.client.Sessions() { if session != rb.session { diff --git a/irc/services.go b/irc/services.go index 5dc20077..2b6ba713 100644 --- a/irc/services.go +++ b/irc/services.go @@ -116,7 +116,7 @@ HELP returns information on the given command.`, } // generic handler for IRC commands like `/NICKSERV INFO` -func serviceCmdHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func serviceCmdHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { service, ok := oragonoServicesByCommandAlias[msg.Command] if !ok { server.logger.Warning("internal", "can't handle unrecognized service", msg.Command) diff --git a/irc/uban.go b/irc/uban.go index 1bc99c50..93eef0d0 100644 --- a/irc/uban.go +++ b/irc/uban.go @@ -98,7 +98,7 @@ func parseUbanTarget(param string) (target ubanTarget, err error) { } // UBAN [target] [DURATION ] [reason...] -func ubanHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { +func ubanHandler(server *Server, client *Client, msg ircmsg.IRCMessage, rb *ResponseBuffer) bool { subcommand := strings.ToLower(msg.Params[0]) params := msg.Params[1:] var target ubanTarget diff --git a/vendor/github.com/goshuirc/irc-go/ircmsg/message.go b/vendor/github.com/goshuirc/irc-go/ircmsg/message.go index aad1336f..2d8b29d2 100644 --- a/vendor/github.com/goshuirc/irc-go/ircmsg/message.go +++ b/vendor/github.com/goshuirc/irc-go/ircmsg/message.go @@ -48,10 +48,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 +// IRCMessage 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 IRCMessage struct { Prefix string Command string Params []string @@ -64,12 +64,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 *IRCMessage) 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 *IRCMessage) GetTag(tagName string) (present bool, value string) { if len(tagName) == 0 { return } else if tagName[0] == '+' { @@ -82,13 +82,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 *IRCMessage) HasTag(tagName string) (present bool) { present, _ = msg.GetTag(tagName) return } // SetTag sets a tag. -func (msg *IrcMessage) SetTag(tagName, tagValue string) { +func (msg *IRCMessage) SetTag(tagName, tagValue string) { if len(tagName) == 0 { return } else if tagName[0] == '+' { @@ -105,7 +105,7 @@ func (msg *IrcMessage) SetTag(tagName, tagValue string) { } // DeleteTag deletes a tag. -func (msg *IrcMessage) DeleteTag(tagName string) { +func (msg *IRCMessage) DeleteTag(tagName string) { if len(tagName) == 0 { return } else if tagName[0] == '+' { @@ -116,14 +116,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 *IRCMessage) 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 *IRCMessage) 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 @@ -135,23 +135,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 IRCMessage object and // should not be modified. -func (msg *IrcMessage) ClientOnlyTags() map[string]string { +func (msg *IRCMessage) 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 IRCMessage, err error) { return parseLine(line, 0, 0) } -// ParseLineStrict creates and returns an IrcMessage from the given IRC line, +// ParseLineStrict creates and returns an IRCMessage 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 IRCMessage, err error) { maxTagDataLength := MaxlenTagData if fromClient { maxTagDataLength = MaxlenClientTagData @@ -167,7 +167,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 IRCMessage, err error) { if strings.IndexByte(line, '\x00') != -1 { err = ErrorLineContainsBadChar return @@ -264,7 +264,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 *IRCMessage) parseTags(tags string) (err error) { for 0 < len(tags) { tagEnd := strings.IndexByte(tags, ';') endPos := tagEnd @@ -297,8 +297,8 @@ func (ircmsg *IrcMessage) parseTags(tags string) (err error) { return nil } -// MakeMessage provides a simple way to create a new IrcMessage. -func MakeMessage(tags map[string]string, prefix string, command string, params ...string) (ircmsg IrcMessage) { +// MakeMessage provides a simple way to create a new IRCMessage. +func MakeMessage(tags map[string]string, prefix string, command string, params ...string) (ircmsg IRCMessage) { ircmsg.Prefix = prefix ircmsg.Command = command ircmsg.Params = params @@ -306,8 +306,8 @@ func MakeMessage(tags map[string]string, prefix string, command string, params . return ircmsg } -// Line returns a sendable line created from an IrcMessage. -func (ircmsg *IrcMessage) Line() (result string, err error) { +// Line returns a sendable line created from an IRCMessage. +func (ircmsg *IRCMessage) Line() (result string, err error) { bytes, err := ircmsg.line(0, 0, 0, 0) if err == nil { result = string(bytes) @@ -315,17 +315,17 @@ func (ircmsg *IrcMessage) Line() (result string, err error) { return } -// LineBytes returns a sendable line created from an IrcMessage. -func (ircmsg *IrcMessage) LineBytes() (result []byte, err error) { +// LineBytes returns a sendable line created from an IRCMessage. +func (ircmsg *IRCMessage) 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 IRCMessage. // 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 *IRCMessage) LineBytesStrict(fromClient bool, truncateLen int) ([]byte, error) { var tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit int if fromClient { // enforce client max tags: @@ -345,8 +345,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. -func (ircmsg *IrcMessage) line(tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit, truncateLen int) ([]byte, error) { +// line returns a sendable line created from an IRCMessage. +func (ircmsg *IRCMessage) line(tagLimit, clientOnlyTagDataLimit, serverAddedTagDataLimit, truncateLen int) ([]byte, error) { if len(ircmsg.Command) < 1 { return nil, ErrorCommandMissing } diff --git a/vendor/github.com/goshuirc/irc-go/ircmsg/tags.go b/vendor/github.com/goshuirc/irc-go/ircmsg/tags.go index 113b9a35..a48c783a 100644 --- a/vendor/github.com/goshuirc/irc-go/ircmsg/tags.go +++ b/vendor/github.com/goshuirc/irc-go/ircmsg/tags.go @@ -27,7 +27,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. +// IRCMessage, so you don't need to call it yourself before creating a line. func EscapeTagValue(inString string) string { return valtoescape.Replace(inString) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0812d26e..030bd090 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -21,7 +21,7 @@ github.com/go-sql-driver/mysql # github.com/gorilla/websocket v1.4.2 ## explicit github.com/gorilla/websocket -# github.com/goshuirc/irc-go v0.0.0-20210214015142-9d703e6ac38a +# github.com/goshuirc/irc-go v0.0.0-20210215162435-14cd697c0c8c ## explicit github.com/goshuirc/irc-go/ircfmt github.com/goshuirc/irc-go/ircmsg