d0s3t3ch/tippero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/tippero.git synced 2024-08-15 00:33:14 +00:00
Code Issues Projects Releases Wiki Activity

Be conservative about which ! are really commands

Browse source 
This should fix pastes triggering commands
This commit is contained in:
moneromooo 2015-01-18 22:45:04 +00:00
parent 5ce0d1da50
commit 62c2adbaf6
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tipbot/ircutils.py
View file

@ -199,6 +199,15 @@ def GetActiveNicks(chan,seconds):
def GetUsersTable(): def GetUsersTable():
return userstable return userstable
def IsAcceptableCommandPrefix(s):
s=s.strip()
log_log('checking whether %s is an acceptable command prefix' % s)
if s=="":
return True
if re.match("%s[\t ]*[:,]?$"%config.tipbot_name, s):
return True
return False
#def Op(to_op, chan): #def Op(to_op, chan):
# SendIRC( 'MODE ' + chan + ' +o: ' + to_op) # SendIRC( 'MODE ' + chan + ' +o: ' + to_op)
# #
@ -430,8 +439,9 @@ def IRCLoop(on_idle,on_identified,on_command):
UpdateLastActiveTime(chan,GetNick(who)) UpdateLastActiveTime(chan,GetNick(who))
# resplit to avoid splitting text that contains ':' # resplit to avoid splitting text that contains ':'
text = data.split(':',2)[2] text = data.split(':',2)[2]
text=text.strip()
exidx = text.find('!') exidx = text.find('!')
if exidx != -1 and len(text)>exidx+1 and text[exidx+1] in string.ascii_letters: if exidx != -1 and len(text)>exidx+1 and text[exidx+1] in string.ascii_letters and IsAcceptableCommandPrefix(text[:exidx]):
cmd = text.split('!')[1] cmd = text.split('!')[1]
cmd = cmd.split(' ') cmd = cmd.split(' ')
cmd[0] = cmd[0].strip(' \t\n\r') cmd[0] = cmd[0].strip(' \t\n\r')