support $a (account) in ban-mask setting

This commit is contained in:
jesopo 2019-09-24 15:25:33 +01:00
parent 9297ffbadc
commit 5b82193f3b

View file

@ -11,7 +11,7 @@ KICK_REASON_SETTING = utils.Setting("default-kick-reason",
"Set the default kick reason", example="have a nice trip") "Set the default kick reason", example="have a nice trip")
@utils.export("channelset", utils.Setting("ban-format", @utils.export("channelset", utils.Setting("ban-format",
"Set ban format ($n = nick, $u = username, $h = hostname)", "Set ban format ($n = nick, $u = username, $h = hostname, $a = account)",
example="*!$u@$h")) example="*!$u@$h"))
@utils.export("serverset", utils.OptionsSetting( @utils.export("serverset", utils.OptionsSetting(
["qmode", "insp", "unreal", "none"], "mute-method", ["qmode", "insp", "unreal", "none"], "mute-method",
@ -56,8 +56,10 @@ class Module(ModuleManager.BaseModule):
event["args_split"][1:]) event["args_split"][1:])
def _format_hostmask(self, user, s): def _format_hostmask(self, user, s):
return s.replace("$n", user.nickname).replace("$u", user.username return (s.replace("$n", user.nickname)
).replace("$h", user.hostname) .replace("$u", user.username)
.replace("$h", user.hostname)
.replace("$a", user.get_identified_account()))
def _get_hostmask(self, channel, user): def _get_hostmask(self, channel, user):
format = channel.get_setting("ban-format", "*!$u@$h") format = channel.get_setting("ban-format", "*!$u@$h")
hostmask_split = [ hostmask_split = [