nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Remove 0x01 of CTCP messages only one time, even if parse_content is called multiple time

Browse Source
This commit is contained in:
nemunaire 2014-08-25 12:06:21 +02:00
parent 82156543aa
commit 2100afed66
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
message.py
View File

@ -60,6 +60,9 @@ class Message:
# Check for CTCP request # Check for CTCP request
self.ctcp = len(words[3]) > 1 and (words[3][0] == 0x01 or words[3][1] == 0x01) self.ctcp = len(words[3]) > 1 and (words[3][0] == 0x01 or words[3][1] == 0x01)
self.content = self.pickWords(words[3:]) self.content = self.pickWords(words[3:])
# If CTCP, remove 0x01
if self.ctcp:
self.content = self.content[1:len(self.content)-1]
elif self.cmd == '353' and len(words) > 3: elif self.cmd == '353' and len(words) > 3:
for i in range(2, len(words)): for i in range(2, len(words)):
if words[i][0] == 58: if words[i][0] == 58:
@ -88,10 +91,6 @@ class Message:
def parse_content(self): def parse_content(self):
"""Parse or reparse the message content""" """Parse or reparse the message content"""
# If CTCP, remove 0x01
if self.ctcp:
self.content = self.content[1:len(self.content)-1]
# Split content by words # Split content by words
try: try:
self.cmds = shlex.split(self.content) self.cmds = shlex.split(self.content)