Skip to content

Commit 58a5b0e

Browse files
author
bspkrs
committed
make a few commands a little smarter about how they accept input mistakes
1 parent 232ea74 commit 58a5b0e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

MCPBot.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ def getParam(self, bot, sender, dest, cmd, args):
401401

402402
def getMember(self, bot, sender, dest, cmd, args):
403403
member_type = 'field'
404-
if cmd['command'] == 'gm': member_type = 'method'
404+
if cmd['command'] == 'gm' or args[0].startswith('func_'): member_type = 'method'
405+
if args[0].startswith('field_'): member_type = 'field'
405406
val, status = self.db.getMember(member_type, args)
406407
self.sendMemberResults(sender, dest, val, status, limit=self.getOutputLimit(sender, dest))
407408

@@ -413,8 +414,9 @@ def getClass(self, bot, sender, dest, cmd, args):
413414

414415
def getHistory(self, bot, sender, dest, cmd, args):
415416
member_type = 'field'
416-
if cmd['command'] == 'mh': member_type = 'method'
417-
if cmd['command'] == 'ph': member_type = 'method_param'
417+
if cmd['command'] == 'mh' or args[0].startswith('func_'): member_type = 'method'
418+
if cmd['command'] == 'ph' or args[0].startswith('p_'): member_type = 'method_param'
419+
if args[0].startswith('field_'): member_type = 'field'
418420
if isSrgName(args[0]) or is_integer(args[0]) or member_type == 'method_param':
419421
val, status = self.db.getHistory(member_type, args)
420422
self.sendHistoryResults(member_type, sender, dest, val, status, limit=self.getOutputLimit(sender, dest))
@@ -430,9 +432,9 @@ def findKey(self, bot, sender, dest, cmd, args):
430432

431433
def findAllKey(self, bot, sender, dest, cmd, args):
432434
showAll = cmd['command'][-1] in ('d', 'l')
433-
showFields = cmd['command'][-1] == 'f'
434-
showMethods = cmd['command'][-1] == 'm'
435-
showParams = cmd['command'][-1] == 'p'
435+
showFields = cmd['command'][-1] == 'f' or args[0].find('field_') > -1
436+
showMethods = cmd['command'][-1] == 'm' or args[0].find('func_') > -1
437+
showParams = cmd['command'][-1] == 'p' or args[0].find('p_') > -1
436438
showClasses = cmd['command'][-1] == 'c'
437439
if showAll:
438440
limit = self.getOutputLimit(sender, dest) / 2

0 commit comments

Comments
 (0)