Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Allow ids to have # in front of them.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-10-23 20:32:29 +00:00
parent 0d2b710aa2
commit e3bdd34f3f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands.py
View File

@ -206,9 +206,14 @@ def getIndex(irc, msg, args, state):
def getId(irc, msg, args, state, kind=None): def getId(irc, msg, args, state, kind=None):
type = 'id' type = 'id'
if kind is not None: if kind is not None and not kind.endswith('id'):
type = kind + ' id' type = kind + ' id'
getInt(irc, msg, args, state, type=type) try:
original = args[0]
args[0] = args[0].lstrip('#')
getInt(irc, msg, args, state, type=type)
except Exception, e:
args[0] = original
def getExpiry(irc, msg, args, state): def getExpiry(irc, msg, args, state):
now = int(time.time()) now = int(time.time())
@ -243,7 +248,6 @@ def getHaveOp(irc, msg, args, state, action='do that'):
def validChannel(irc, msg, args, state): def validChannel(irc, msg, args, state):
if irc.isChannel(args[0]): if irc.isChannel(args[0]):
# XXX Check maxlength in irc.state.supported.
state.args.append(args.pop(0)) state.args.append(args.pop(0))
else: else:
irc.errorInvalid('channel', args[0]) irc.errorInvalid('channel', args[0])

4
test/test_commands.py
View File

@ -99,6 +99,10 @@ class CommandsTestCase(SupyTestCase):
spec = ['channel', 'text'] spec = ['channel', 'text']
self.assertState(spec, ['#foo', '+s'], ['#foo', '+s']) self.assertState(spec, ['#foo', '+s'], ['#foo', '+s'])
self.assertState(spec, ['+s'], ['#foo', '+s'], target='#foo') self.assertState(spec, ['+s'], ['#foo', '+s'], target='#foo')
def testGetId(self):
spec = ['id']
self.assertState(spec, ['#12'], [12])
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: