nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Better messages decoding

Browse Source
This commit is contained in:
Némunaire 2012-07-17 00:56:27 +02:00
parent ef608c19e8
commit 9d4cdc4931
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
message.py
View File

@ -54,10 +54,12 @@ class Message:
if self.cmd == b'PRIVMSG': if self.cmd == b'PRIVMSG':
#Check for CTCP request #Check for CTCP request
self.ctcp = (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 = words[3].decode() self.content = words[3]
self.decode()
if self.content[0] == ':': if self.content[0] == ':':
self.content = ' '.join(words[3:])[1:] self.content = (b' '.join(words[3:])[1:])
self.decode()
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] == ":": if words[i][0] == ":":
@ -86,6 +88,12 @@ class Message:
if self.content[0] == ':': if self.content[0] == ':':
self.content = ' '.join(words[3:])[1:] self.content = ' '.join(words[3:])[1:]
def decode(self):
try:
self.content = self.content.decode()
except UnicodeDecodeError:
self.content = self.content.decode('utf-8', 'replace')
@property @property
def is_owner(self): def is_owner(self):
return self.sender == self.srv.owner return self.sender == self.srv.owner
@ -166,8 +174,8 @@ class Message:
self.srv.send_ctcp(self.sender, "USERINFO %s" % (self.srv.realname)) self.srv.send_ctcp(self.sender, "USERINFO %s" % (self.srv.realname))
elif self.content == '\x01VERSION\x01': elif self.content == '\x01VERSION\x01':
self.srv.send_ctcp(self.sender, "VERSION nemubot v3") self.srv.send_ctcp(self.sender, "VERSION nemubot v3")
else: elif self.content[:7] != '\x01ACTION':
print (self.content) print (self.content[:7])
self.srv.send_ctcp(self.sender, "ERRMSG Unknown or unimplemented CTCP request") self.srv.send_ctcp(self.sender, "ERRMSG Unknown or unimplemented CTCP request")
def reparsemsg(self): def reparsemsg(self):
@ -232,7 +240,7 @@ class Message:
print (CREDITS[c].to_string()) print (CREDITS[c].to_string())
#Messages stating with ! #Messages stating with !
elif self.content[0] == '!': elif self.content[0] == '!' and len(self.content[0]) > 1:
self.mods = mods self.mods = mods
try: try:
self.cmd = shlex.split(self.content[1:]) self.cmd = shlex.split(self.content[1:])