notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #173 from laneatomic/simple-ident-track

Browse Source 
update simple, notice to track ident@host for users sharing hosts
This commit is contained in:
Ryan Schmidt 2015-10-14 18:59:53 -07:00
commit 1aff6f4e6a
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/wolfgame.py
View File

@ -661,6 +661,10 @@ def mark_simple_notify(cli, nick, chan, rest):
if host in var.SIMPLE_NOTIFY: if host in var.SIMPLE_NOTIFY:
var.SIMPLE_NOTIFY.remove(host) var.SIMPLE_NOTIFY.remove(host)
var.remove_simple_rolemsg(host) var.remove_simple_rolemsg(host)
fullmask = ident + "@" + host
if fullmask in var.SIMPLE_NOTIFY:
var.SIMPLE_NOTIFY.remove(fullmask)
var.remove_simple_rolemsg(fullmask)
cli.notice(nick, "You now no longer receive simple role instructions.") cli.notice(nick, "You now no longer receive simple role instructions.")
return return
@ -671,16 +675,24 @@ def mark_simple_notify(cli, nick, chan, rest):
cli.notice(nick, "You are not logged in to NickServ.") cli.notice(nick, "You are not logged in to NickServ.")
return return
else: # Not logged in, fall back to hostmask else: # Not logged in, fall back to ident@hostmask
if host in var.SIMPLE_NOTIFY: if host in var.SIMPLE_NOTIFY:
var.SIMPLE_NOTIFY.remove(host) var.SIMPLE_NOTIFY.remove(host)
var.remove_simple_rolemsg(host) var.remove_simple_rolemsg(host)
cli.notice(nick, "You now no longer receive simple role instructions.")
return
fullmask = ident + "@" + host
if fullmask in var.SIMPLE_NOTIFY:
var.SIMPLE_NOTIFY.remove(fullmask)
var.remove_simple_rolemsg(fullmask)
cli.notice(nick, "You now no longer receive simple role instructions.") cli.notice(nick, "You now no longer receive simple role instructions.")
return return
var.SIMPLE_NOTIFY.add(host) var.SIMPLE_NOTIFY.add(fullmask)
var.add_simple_rolemsg(host) var.add_simple_rolemsg(fullmask)
cli.notice(nick, "You now receive simple role instructions.") cli.notice(nick, "You now receive simple role instructions.")
@ -722,6 +734,10 @@ def mark_prefer_notice(cli, nick, chan, rest):
if host in var.PREFER_NOTICE: if host in var.PREFER_NOTICE:
var.PREFER_NOTICE.remove(host) var.PREFER_NOTICE.remove(host)
var.remove_prefer_notice(host) var.remove_prefer_notice(host)
fullmask = ident + "@" + host
if fullmask in var.PREFER_NOTICE:
var.PREFER_NOTICE.remove(fullmask)
var.remove_prefer_notice(fullmask)
cli.notice(nick, "Gameplay interactions will now use PRIVMSG for you.") cli.notice(nick, "Gameplay interactions will now use PRIVMSG for you.")
return return
@ -739,9 +755,16 @@ def mark_prefer_notice(cli, nick, chan, rest):
cli.notice(nick, "Gameplay interactions will now use PRIVMSG for you.") cli.notice(nick, "Gameplay interactions will now use PRIVMSG for you.")
return return
fullmask = ident + "@" + host
if fullmask in var.PREFER_NOTICE:
var.PREFER_NOTICE.remove(fullmask)
var.remove_prefer_notice(fullmask)
var.PREFER_NOTICE.add(host) cli.notice(nick, "Gameplay interactions will now use PRIVMSG for you.")
var.add_prefer_notice(host) return
var.PREFER_NOTICE.add(fullmask)
var.add_prefer_notice(fullmask)
cli.notice(nick, "The bot will now always NOTICE you.") cli.notice(nick, "The bot will now always NOTICE you.")