diff options
| author | Wim <wim@42.be> | 2021-06-16 21:00:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 21:00:49 +0200 |
| commit | fb5a84212c491332504fcdd4b5f4a4b97705d2e3 (patch) | |
| tree | be03e973d30d040a49a90c47f1e6b73ed8922539 /vendor/github.com/lrstanley/girc/event.go | |
| parent | dedc1c45a113d8db373d9e4638f54a0f9d29624f (diff) | |
| download | matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.gz matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.bz2 matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.zip | |
Update dependencies (#1521)
Diffstat (limited to 'vendor/github.com/lrstanley/girc/event.go')
| -rw-r--r-- | vendor/github.com/lrstanley/girc/event.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/vendor/github.com/lrstanley/girc/event.go b/vendor/github.com/lrstanley/girc/event.go index ef4633f7..423e452b 100644 --- a/vendor/github.com/lrstanley/girc/event.go +++ b/vendor/github.com/lrstanley/girc/event.go @@ -248,7 +248,7 @@ func (e *Event) Len() (length int) { // If param contains a space or it's empty, it's trailing, so it should be // prefixed with a colon (:). - if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || e.Params[i] == "") { + if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || strings.HasPrefix(e.Params[i], ":") || e.Params[i] == "") { length++ } } @@ -284,9 +284,8 @@ func (e *Event) Bytes() []byte { // Space separated list of arguments. if len(e.Params) > 0 { // buffer.WriteByte(eventSpace) - for i := 0; i < len(e.Params); i++ { - if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || e.Params[i] == "") { + if i == len(e.Params)-1 && (strings.Contains(e.Params[i], " ") || strings.HasPrefix(e.Params[i], ":") || e.Params[i] == "") { buffer.WriteString(string(eventSpace) + string(messagePrefix) + e.Params[i]) continue } @@ -363,7 +362,15 @@ func (e *Event) Pretty() (out string, ok bool) { return fmt.Sprintf("[*] CTCP query from %s: %s%s", ctcp.Source.Name, ctcp.Command, " "+ctcp.Text), true } - return fmt.Sprintf("[%s] (%s) %s", strings.Join(e.Params[0:len(e.Params)-1], ","), e.Source.Name, e.Last()), true + + var source string + if e.Command == PRIVMSG { + source = fmt.Sprintf("(%s)", e.Source.Name) + } else { // NOTICE + source = fmt.Sprintf("--%s--", e.Source.Name) + } + + return fmt.Sprintf("[%s] %s %s", strings.Join(e.Params[0:len(e.Params)-1], ","), source, e.Last()), true } if e.Command == RPL_MOTD || e.Command == RPL_MOTDSTART || |