Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

ban-format-account is no longer relevant

Browse source
This commit is contained in:
jesopo 2020-03-04 12:03:47 +00:00
parent f469a4e347
commit 262e3e512d
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/channel_op.py
View file

@ -33,10 +33,6 @@ BAN_FORMATTING = "${n} = nick, ${u} = username, ${h} = hostname, ${a} = account"
@utils.export("channelset", utils.Setting("ban-format", @utils.export("channelset", utils.Setting("ban-format",
"Set ban format (%s)" % BAN_FORMATTING, example="*!${u}@${h}")) "Set ban format (%s)" % BAN_FORMATTING, example="*!${u}@${h}"))
@utils.export("channelset", utils.Setting("ban-format-account",
"Set ban format for users with accounts (%s)" % BAN_FORMATTING,
example="~a:${a}"))
@utils.export("serverset", utils.OptionsSetting( @utils.export("serverset", utils.OptionsSetting(
list(QUIET_METHODS.keys()), "quiet-method", list(QUIET_METHODS.keys()), "quiet-method",
"Set this server's method of muting users")) "Set this server's method of muting users"))
@ -83,11 +79,6 @@ class Module(ModuleManager.BaseModule):
vars["a"] = vars["account"] = user.account or "" vars["a"] = vars["account"] = user.account or ""
return utils.parse.format_token_replace(s, vars) return utils.parse.format_token_replace(s, vars)
def _get_hostmask(self, channel, user): def _get_hostmask(self, channel, user):
if not user.account == None:
account_format = channel.get_setting("ban-format-account", None)
if not account_format == None:
return self._format_hostmask(user, account_format)
format = channel.get_setting("ban-format", "*!${u}@${h}") format = channel.get_setting("ban-format", "*!${u}@${h}")
return self._format_hostmask(user, format) return self._format_hostmask(user, format)