GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-26 05:49:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1051 from ajaspers/services

Browse Source 
Ignore non-privmsg commands to services.
This commit is contained in:
Shivaram Lingamneni 2020-05-25 08:07:00 -07:00 committed by GitHub
commit 29165ded62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
irc/handlers.go
View File

@ -1906,18 +1906,25 @@ func dispatchMessageToTarget(client *Client, tags map[string]string, histType hi
} }
channel.SendSplitMessage(command, lowestPrefix, tags, client, message, rb) channel.SendSplitMessage(command, lowestPrefix, tags, client, message, rb)
} else { } else {
// NOTICE and TAGMSG to services are ignored
if histType == history.Privmsg {
lowercaseTarget := strings.ToLower(target) lowercaseTarget := strings.ToLower(target)
if service, isService := OragonoServices[lowercaseTarget]; isService { service, isService := OragonoServices[lowercaseTarget]
_, isZNC := zncHandlers[lowercaseTarget]
if histType == history.Privmsg {
if isService {
servicePrivmsgHandler(service, server, client, message.Message, rb) servicePrivmsgHandler(service, server, client, message.Message, rb)
return return
} else if _, isZNC := zncHandlers[lowercaseTarget]; isZNC { } else if isZNC {
zncPrivmsgHandler(client, lowercaseTarget, message.Message, rb) zncPrivmsgHandler(client, lowercaseTarget, message.Message, rb)
return return
} }
} }
// NOTICE and TAGMSG to services are ignored
if isService || isZNC {
return
}
user := server.clients.Get(target) user := server.clients.Get(target)
if user == nil { if user == nil {
if histType != history.Notice { if histType != history.Notice {