From abb83d4863ae107d05e9ee8ec104f698961da6e8 Mon Sep 17 00:00:00 2001 From: James Vega Date: Mon, 19 Jan 2009 21:12:55 +0000 Subject: [PATCH] Make getBanmask use protocols.irc.banmask.makeBanmask --- src/commands.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/commands.py b/src/commands.py index 272bf99f9..b22068f1a 100644 --- a/src/commands.py +++ b/src/commands.py @@ -1,5 +1,6 @@ ### # Copyright (c) 2002-2005, Jeremiah Fincher +# Copyright (c) 2009, James Vega # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -275,8 +276,10 @@ def getHostmask(irc, msg, args, state): def getBanmask(irc, msg, args, state): getHostmask(irc, msg, args, state) - # XXX Channel-specific stuff. - state.args[-1] = ircutils.banmask(state.args[-1]) + if not state.channel: + getChannel(irc, msg, args, state) + banmaskstyle = conf.supybot.protocols.irc.banmask + state.args[-1] = banmaskstyle.makeBanmask(state.args[-1]) def getUser(irc, msg, args, state): try: