GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

xline: Add snomasks for setting/removing xlines

This commit is contained in:
Daniel Oaks 2017-06-11 10:17:55 -06:00
parent 5c725bb622
commit 5b3cea8b98
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
irc/dline.go
View File

@ -319,11 +319,15 @@ func dlineHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
server.dlines.AddNetwork(*hostNet, banTime, reason, operReason) server.dlines.AddNetwork(*hostNet, banTime, reason, operReason)
} }
var snoDescription string
if durationIsUsed { if durationIsUsed {
client.Notice(fmt.Sprintf("Added temporary (%s) D-Line for %s", duration.String(), hostString)) client.Notice(fmt.Sprintf("Added temporary (%s) D-Line for %s", duration.String(), hostString))
snoDescription = fmt.Sprintf(ircfmt.Unescape("%s$r added temporary (%s) D-Line for %s"), client.nick, duration.String(), hostString)
} else { } else {
client.Notice(fmt.Sprintf("Added D-Line for %s", hostString)) client.Notice(fmt.Sprintf("Added D-Line for %s", hostString))
snoDescription = fmt.Sprintf(ircfmt.Unescape("%s$r added D-Line for %s"), client.nick, hostString)
} }
server.snomasks.Send(sno.LocalXline, snoDescription)
var killClient bool var killClient bool
if andKill { if andKill {
@ -423,6 +427,7 @@ func unDLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool
} }
client.Notice(fmt.Sprintf("Removed D-Line for %s", hostString)) client.Notice(fmt.Sprintf("Removed D-Line for %s", hostString))
server.snomasks.Send(sno.LocalXline, fmt.Sprintf(ircfmt.Unescape("%s$r removed D-Line for %s"), client.nick, hostString))
return false return false
} }

5
irc/kline.go
View File

@ -230,11 +230,15 @@ func klineHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
server.klines.AddMask(mask, banTime, reason, operReason) server.klines.AddMask(mask, banTime, reason, operReason)
var snoDescription string
if durationIsUsed { if durationIsUsed {
client.Notice(fmt.Sprintf("Added temporary (%s) K-Line for %s", duration.String(), mask)) client.Notice(fmt.Sprintf("Added temporary (%s) K-Line for %s", duration.String(), mask))
snoDescription = fmt.Sprintf(ircfmt.Unescape("%s$r added temporary (%s) K-Line for %s"), client.nick, duration.String(), mask)
} else { } else {
client.Notice(fmt.Sprintf("Added K-Line for %s", mask)) client.Notice(fmt.Sprintf("Added K-Line for %s", mask))
snoDescription = fmt.Sprintf(ircfmt.Unescape("%s$r added K-Line for %s"), client.nick, mask)
} }
server.snomasks.Send(sno.LocalXline, snoDescription)
var killClient bool var killClient bool
if andKill { if andKill {
@ -311,6 +315,7 @@ func unKLineHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool
server.klines.RemoveMask(mask) server.klines.RemoveMask(mask)
client.Notice(fmt.Sprintf("Removed K-Line for %s", mask)) client.Notice(fmt.Sprintf("Removed K-Line for %s", mask))
server.snomasks.Send(sno.LocalXline, fmt.Sprintf(ircfmt.Unescape("%s$r removed K-Line for %s"), client.nick, mask))
return false return false
} }