kayos/girc-atomic
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

minor fixes for IsFromUser and IsFromChannel

Browse Source
This commit is contained in:
Liam Stanley 2016-12-23 20:01:40 -05:00
parent 090976be59
commit 3364fbdbe6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
event.go
View File

@ -250,29 +250,29 @@ func (e *Event) IsAction() bool {
// IsFromChannel checks to see if a message was from a channel (rather than // IsFromChannel checks to see if a message was from a channel (rather than
// a private message). // a private message).
func (e *Event) IsFromChannel() bool { func (e *Event) IsFromChannel() bool {
if len(e.Params) != 2 { if len(e.Params) != 1 {
return false return false
} }
if e.Params[0] != "PRIVMSG" { if e.Command != "PRIVMSG" || !IsValidChannel(e.Params[0]) {
return false return false
} }
return IsValidChannel(e.Params[1]) return true
} }
// IsFromUser checks to see if a message was from a user (rather than a // IsFromUser checks to see if a message was from a user (rather than a
// channel). // channel).
func (e *Event) IsFromUser() bool { func (e *Event) IsFromUser() bool {
if len(e.Params) != 2 { if len(e.Params) != 1 {
return false return false
} }
if e.Params[0] != "PRIVMSG" { if e.Command != "PRIVMSG" || !IsValidNick(e.Params[0]) {
return false return false
} }
return IsValidUser(e.Params[1]) return true
} }
// StripAction strips the action encoding from a PRIVMSG ACTION (/me). // StripAction strips the action encoding from a PRIVMSG ACTION (/me).