nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

(wip) reworking of the Message class; backported from v4

Browse Source
This commit is contained in:
nemunaire 2014-08-29 16:33:45 +02:00
parent 0e26450d8f
commit 0a16321259
15 changed files with 186 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bot.py
View File

@ -116,7 +116,7 @@ class Bot:
logger.error("DCC: unable to connect to %s:%d", ip, port) logger.error("DCC: unable to connect to %s:%d", ip, port)
return _ctcp_response(msg.sender, "ERRMSG unable to connect to %s:%d" % (ip, port)) return _ctcp_response(msg.sender, "ERRMSG unable to connect to %s:%d" % (ip, port))
self.ctcp_capabilities["ACTION"] = lambda srv, msg: print ("ACTION receive: %s" % msg.content) self.ctcp_capabilities["ACTION"] = lambda srv, msg: print ("ACTION receive: %s" % msg.text)
self.ctcp_capabilities["CLIENTINFO"] = _ctcp_clientinfo self.ctcp_capabilities["CLIENTINFO"] = _ctcp_clientinfo
self.ctcp_capabilities["DCC"] = _ctcp_dcc self.ctcp_capabilities["DCC"] = _ctcp_dcc
self.ctcp_capabilities["FINGER"] = lambda srv, msg: _ctcp_response( self.ctcp_capabilities["FINGER"] = lambda srv, msg: _ctcp_response(
@ -298,8 +298,8 @@ class Bot:
def add_modules_path(self, path): def add_modules_path(self, path):
"""Add a path to the modules_path array, used by module loader""" """Add a path to the modules_path array, used by module loader"""
# The path must end by / char # The path must end by / char
if path[len(path)-1] != "/": if path[-1] != "/":
path = path + "/" path += "/"
if path not in self.modules_paths: if path not in self.modules_paths:
self.modules_paths.append(path) self.modules_paths.append(path)
@ -444,9 +444,9 @@ class Bot:
def treat_pre(self, msg, srv): def treat_pre(self, msg, srv):
"""Treat a message before all other treatment""" """Treat a message before all other treatment"""
# Treat all messages starting with 'nemubot:' as distinct commands # Treat all messages starting with 'nemubot:' as distinct commands
if msg.cmd == "PRIVMSG" and msg.content.find("%s:"%srv.nick) == 0: if msg.cmd == "PRIVMSG" and msg.text.find("%s:"%srv.nick) == 0:
# Remove the bot name # Remove the bot name
msg.content = msg.content[len(srv.nick)+1:].strip() msg.text = msg.text[len(srv.nick)+1:].strip()
msg.parse_content() msg.parse_content()
msg.private = True msg.private = True
@ -487,30 +487,28 @@ class Bot:
def treat_prvmsg_ask(self, msg, srv): def treat_prvmsg_ask(self, msg, srv):
# Treat ping # Treat ping
if re.match("^ *(m[' ]?entends?[ -]+tu|h?ear me|do you copy|ping)", if re.match("^ *(m[' ]?entends?[ -]+tu|h?ear me|do you copy|ping)",
msg.content, re.I) is not None: msg.text, re.I) is not None:
return response.Response(msg.sender, message="pong", return response.Response(msg.sender, message="pong",
channel=msg.channel, nick=msg.nick) channel=msg.receivers, nick=msg.nick)
# Ask hooks # Ask hooks
else: else:
return self.treat_ask(msg, srv) return self.treat_ask(msg, srv)
def treat_prvmsg(self, msg, srv): def treat_prvmsg(self, msg, srv):
msg.is_owner = msg.nick == srv.owner
# First, treat CTCP # First, treat CTCP
if msg.ctcp: if msg.is_ctcp:
if msg.cmds[0] in self.ctcp_capabilities: if msg.cmds[0] in self.ctcp_capabilities:
return self.ctcp_capabilities[msg.cmds[0]](srv, msg) return self.ctcp_capabilities[msg.cmds[0]](srv, msg)
else: else:
return _ctcp_response(msg.sender, "ERRMSG Unknown or unimplemented CTCP request") return _ctcp_response(msg.sender, "ERRMSG Unknown or unimplemented CTCP request")
# Owner commands # Owner commands
if len(msg.content) > 1 and msg.content[0] == '`' and msg.nick == srv.owner: if len(msg.text) > 1 and msg.text[0] == '`' and msg.nick == srv.owner:
#TODO: owner commands #TODO: owner commands
pass pass
elif len(msg.content) > 1 and msg.content[0] == '!': elif len(msg.text) > 1 and msg.text[0] == '!':
# Remove the ! # Remove the !
msg.cmds[0] = msg.cmds[0][1:] msg.cmds[0] = msg.cmds[0][1:]
@ -518,21 +516,21 @@ class Bot:
return _help_msg(msg.sender, self.modules, msg.cmds) return _help_msg(msg.sender, self.modules, msg.cmds)
elif msg.cmds[0] == "more": elif msg.cmds[0] == "more":
if msg.channel == srv.nick: if msg.receivers == srv.nick:
if msg.sender in srv.moremessages: if msg.sender in srv.moremessages:
return srv.moremessages[msg.sender] return srv.moremessages[msg.sender]
else: else:
if msg.channel in srv.moremessages: if msg.receivers in srv.moremessages:
return srv.moremessages[msg.channel] return srv.moremessages[msg.receivers]
elif msg.cmds[0] == "next": elif msg.cmds[0] == "next":
ret = None ret = None
if msg.channel == srv.nick: if msg.receivers == srv.nick:
if msg.sender in srv.moremessages: if msg.sender in srv.moremessages:
ret = srv.moremessages[msg.sender] ret = srv.moremessages[msg.sender]
else: else:
if msg.channel in srv.moremessages: if msg.receivers in srv.moremessages:
ret = srv.moremessages[msg.channel] ret = srv.moremessages[msg.receivers]
if ret is not None: if ret is not None:
ret.pop() ret.pop()
return ret return ret
@ -569,7 +567,7 @@ class Bot:
if msg.cmds[0] in cmd_hook: if msg.cmds[0] in cmd_hook:
(hks, lvl, store, bot) = cmd_hook[msg.cmds[0]] (hks, lvl, store, bot) = cmd_hook[msg.cmds[0]]
for h in hks: for h in hks:
if h.is_matching(msg.cmds[0], channel=msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if h.is_matching(msg.cmds[0], channel=msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = h.run(msg, strcmp=msg.cmds[0]) res = h.run(msg, strcmp=msg.cmds[0])
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
@ -578,7 +576,7 @@ class Bot:
# Then, treat regexp based hook # Then, treat regexp based hook
cmd_rgxp = self.create_cache("cmd_rgxp") cmd_rgxp = self.create_cache("cmd_rgxp")
for hook, lvl, store, bot in cmd_rgxp: for hook, lvl, store, bot in cmd_rgxp:
if hook.is_matching(msg.cmds[0], msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if hook.is_matching(msg.cmds[0], msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = hook.run(msg) res = hook.run(msg)
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
@ -602,11 +600,11 @@ class Bot:
# First, treat simple hook # First, treat simple hook
ask_hook = self.create_cache("ask_hook") ask_hook = self.create_cache("ask_hook")
if msg.content in ask_hook: if msg.text in ask_hook:
hks, lvl, store, bot = ask_hook[msg.content] hks, lvl, store, bot = ask_hook[msg.text]
for h in hks: for h in hks:
if h.is_matching(msg.content, channel=msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if h.is_matching(msg.text, channel=msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = h.run(msg, strcmp=msg.content) res = h.run(msg, strcmp=msg.text)
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
self.check_rest_times(store, h) self.check_rest_times(store, h)
@ -614,8 +612,8 @@ class Bot:
# Then, treat regexp based hook # Then, treat regexp based hook
ask_rgxp = self.create_cache("ask_rgxp") ask_rgxp = self.create_cache("ask_rgxp")
for hook, lvl, store, bot in ask_rgxp: for hook, lvl, store, bot in ask_rgxp:
if hook.is_matching(msg.content, channel=msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if hook.is_matching(msg.text, channel=msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = hook.run(msg, strcmp=msg.content) res = hook.run(msg, strcmp=msg.text)
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
self.check_rest_times(store, hook) self.check_rest_times(store, hook)
@ -638,11 +636,11 @@ class Bot:
# First, treat simple hook # First, treat simple hook
msg_hook = self.create_cache("msg_hook") msg_hook = self.create_cache("msg_hook")
if msg.content in msg_hook: if msg.text in msg_hook:
hks, lvl, store, bot = msg_hook[msg.content] hks, lvl, store, bot = msg_hook[msg.text]
for h in hks: for h in hks:
if h.is_matching(msg.content, channel=msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if h.is_matching(msg.text, channel=msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = h.run(msg, strcmp=msg.content) res = h.run(msg, strcmp=msg.text)
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
self.check_rest_times(store, h) self.check_rest_times(store, h)
@ -650,8 +648,8 @@ class Bot:
# Then, treat regexp based hook # Then, treat regexp based hook
msg_rgxp = self.create_cache("msg_rgxp") msg_rgxp = self.create_cache("msg_rgxp")
for hook, lvl, store, bot in msg_rgxp: for hook, lvl, store, bot in msg_rgxp:
if hook.is_matching(msg.content, channel=msg.channel, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.channel].people): if hook.is_matching(msg.text, channel=msg.receivers, server=srv) and (msg.private or lvl == 0 or bot.nick not in srv.channels[msg.receivers].people):
res = hook.run(msg, strcmp=msg.content) res = hook.run(msg, strcmp=msg.text)
if res is not None and res != False: if res is not None and res != False:
treated.append(res) treated.append(res)
self.check_rest_times(store, hook) self.check_rest_times(store, hook)

30
channel.py
View File

@ -36,11 +36,11 @@ class Channel:
elif cmd == "JOIN": elif cmd == "JOIN":
self.join(msg.nick) self.join(msg.nick)
elif cmd == "NICK": elif cmd == "NICK":
self.nick(msg.nick, msg.content) self.nick(msg.nick, msg.text)
elif cmd == "PART" or cmd == "QUIT": elif cmd == "PART" or cmd == "QUIT":
self.part(msg.nick) self.part(msg.nick)
elif cmd == "TOPIC": elif cmd == "TOPIC":
self.topic = self.content self.topic = self.text
def join(self, nick, level = 0): def join(self, nick, level = 0):
"""Someone join the channel""" """Someone join the channel"""
@ -67,31 +67,31 @@ class Channel:
del self.people[nick] del self.people[nick]
def mode(self, msg): def mode(self, msg):
if msg.content[0] == "-k": if msg.text[0] == "-k":
self.password = "" self.password = ""
elif msg.content[0] == "+k": elif msg.text[0] == "+k":
if len(msg.content) > 1: if len(msg.text) > 1:
self.password = ' '.join(msg.content[1:])[1:] self.password = ' '.join(msg.text[1:])[1:]
else: else:
self.password = msg.content[1] self.password = msg.text[1]
elif msg.content[0] == "+o": elif msg.text[0] == "+o":
self.people[msg.nick] |= 4 self.people[msg.nick] |= 4
elif msg.content[0] == "-o": elif msg.text[0] == "-o":
self.people[msg.nick] &= ~4 self.people[msg.nick] &= ~4
elif msg.content[0] == "+h": elif msg.text[0] == "+h":
self.people[msg.nick] |= 2 self.people[msg.nick] |= 2
elif msg.content[0] == "-h": elif msg.text[0] == "-h":
self.people[msg.nick] &= ~2 self.people[msg.nick] &= ~2
elif msg.content[0] == "+v": elif msg.text[0] == "+v":
self.people[msg.nick] |= 1 self.people[msg.nick] |= 1
elif msg.content[0] == "-v": elif msg.text[0] == "-v":
self.people[msg.nick] &= ~1 self.people[msg.nick] &= ~1
def parse332(self, msg): def parse332(self, msg):
self.topic = msg.content self.topic = msg.text
def parse353(self, msg): def parse353(self, msg):
for p in msg.content: for p in msg.text:
p = p.decode() p = p.decode()
if p[0] == "@": if p[0] == "@":
level = 4 level = 4

12
consumer.py
View File

@ -32,7 +32,9 @@ import server
logger = logging.getLogger("nemubot.consumer") logger = logging.getLogger("nemubot.consumer")
class MessageConsumer: class MessageConsumer:
"""Store a message before treating""" """Store a message before treating"""
def __init__(self, srv, raw, time, prvt, data): def __init__(self, srv, raw, time, prvt, data):
self.srv = srv self.srv = srv
self.raw = raw self.raw = raw
@ -44,10 +46,10 @@ class MessageConsumer:
def treat_in(self, context, msg): def treat_in(self, context, msg):
"""Treat the input message""" """Treat the input message"""
if msg.cmd == "PING": if msg.cmd == "PING":
self.srv.send_pong(msg.content) self.srv.send_pong(msg.params[0])
else: elif hasattr(msg, "receivers"):
# TODO: Manage credits msg.receivers = [ receiver for receiver in msg.receivers if self.srv.accepted_channel(receiver) ]
if msg.channel is None or self.srv.accepted_channel(msg.channel): if msg.receivers:
# All messages # All messages
context.treat_pre(msg, self.srv) context.treat_pre(msg, self.srv)
@ -86,7 +88,7 @@ class MessageConsumer:
msg.server = self.srv.id msg.server = self.srv.id
if msg.cmd == "PRIVMSG": if msg.cmd == "PRIVMSG":
msg.is_owner = (msg.nick == self.srv.owner) msg.is_owner = (msg.nick == self.srv.owner)
msg.private = msg.private or msg.channel == self.srv.nick msg.private = msg.private or (len(msg.receivers) == 1 and msg.receivers[0] == self.srv.nick)
res = self.treat_in(context, msg) res = self.treat_in(context, msg)
except: except:
logger.exception("Error occurred during the processing of the message: %s", self.raw) logger.exception("Error occurred during the processing of the message: %s", self.raw)

2
exception.py
View File

@ -26,4 +26,4 @@ class IRCException(Exception):
self.personnal = personnal self.personnal = personnal
def fill_response(self, msg): def fill_response(self, msg):
return Response(msg.sender, self.message, channel=msg.channel, nick=(msg.nick if self.personnal else None)) return Response(msg.sender, self.message, channel=msg.receivers, nick=(msg.nick if self.personnal else None))

162
message.py
View File

@ -22,99 +22,107 @@ import shlex
import time import time
from response import Response from response import Response
import xmlparser
filename = "" mgx = re.compile(b'''^(?:@(?P<tags>[^ ]+)\ )?
(?::(?P<prefix>
(?P<nick>[a-zA-Z][^!@ ]*)
(?: !(?P<user>[^@ ]+))?
(?:@(?P<host>[^ ]+))?
)\ )?
(?P<command>(?:[a-zA-Z]+|[0-9]{3}))
(?P<params>(?:\ [^:][^ ]*)*)(?:\ :(?P<trailing>.*))?
$''', re.X)
class Message: class Message:
def __init__ (self, line, timestamp, private=False): def __init__ (self, raw_line, timestamp, private=False):
self.raw = line self.raw = raw_line
self.time = timestamp
self.channel = None
self.content = b''
self.ctcp = False
line = line.rstrip() #remove trailing 'rn'
words = line.split(b' ')
if words[0][0] == 58: #58 is : in ASCII table
self.sender = words[0][1:].decode()
self.cmd = words[1].decode()
else:
self.cmd = words[0].decode()
self.sender = None
if self.cmd == 'PING':
self.content = words[1]
elif self.sender is not None:
self.nick = (self.sender.split('!'))[0]
if self.nick != self.sender:
self.realname = (self.sender.split('!'))[1]
else:
self.realname = self.nick
self.sender = self.nick + "!" + self.realname
if len(words) > 2:
self.channel = self.pickWords(words[2:]).decode()
if self.cmd == 'PRIVMSG':
# Check for CTCP request
self.ctcp = len(words[3]) > 1 and (words[3][0] == 0x01 or words[3][1] == 0x01)
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:
for i in range(2, len(words)):
if words[i][0] == 58:
self.content = words[i:]
#Remove the first :
self.content[0] = self.content[0][1:]
self.channel = words[i-1].decode()
break
elif self.cmd == 'NICK':
self.content = self.pickWords(words[2:])
elif self.cmd == 'MODE':
self.content = words[3:]
elif self.cmd == '332':
self.channel = words[3]
self.content = self.pickWords(words[4:])
else:
self.content = self.pickWords(words[3:])
else:
if self.cmd == 'PRIVMSG':
self.channel = words[2].decode()
self.content = b' '.join(words[3:])
self.decode()
if self.cmd == 'PRIVMSG':
self.parse_content()
self.private = private self.private = private
self.tags = { 'time': timestamp }
self.params = list()
p = mgx.match(raw_line.rstrip())
# Parse tags if exists: @aaa=bbb;ccc;example.com/ddd=eee
if p.group("tags"):
for tgs in self.decode(p.group("tags")).split(';'):
tag = tgs.split('=')
if len(tag) > 1:
self.add_tag(tag[0], tag[1])
else:
self.add_tag(tag[0])
# Parse prefix if exists: :nick!user@host.com
self.prefix = self.decode(p.group("prefix"))
self.nick = self.decode(p.group("nick"))
self.user = self.decode(p.group("user"))
self.host = self.decode(p.group("host"))
# Parse command
self.cmd = self.decode(p.group("command"))
# Parse params
if p.group("params"):
for param in p.group("params").strip().split(b' '):
self.params.append(param)
if p.group("trailing"):
self.params.append(p.group("trailing"))
# Special commands
if self.cmd == 'PRIVMSG':
self.receivers = self.decode(self.params[0]).split(',')
# If CTCP, remove 0x01
if len(self.params[1]) > 1 and (self.params[1][0] == 0x01 or self.params[1][1] == 0x01):
self.is_ctcp = True
self.text = self.decode(self.params[1][1:len(self.params[1])-1])
else:
self.is_ctcp = False
self.text = self.decode(self.params[1])
# Split content by words
self.parse_content()
elif self.cmd == '353': # RPL_NAMREPLY
self.receivers = [ self.decode(self.params[0]) ]
self.nicks = self.decode(self.params[1]).split(" ")
elif self.cmd == '332':
self.receivers = [ self.decode(self.params[0]) ]
self.topic = self.decode(self.params[1]).split(" ")
else:
for i in range(0, len(self.params)-1):
self.params[i] = self.decode(self.params[i])
# TODO: here for legacy content
@property
def sender(self):
return self.prefix
@property
def channel(self):
return self.receivers[0]
def parse_content(self): def parse_content(self):
"""Parse or reparse the message content""" """Parse or reparse the message content"""
# Split content by words # Split content by words
try: try:
self.cmds = shlex.split(self.content) self.cmds = shlex.split(self.text)
except ValueError: except ValueError:
self.cmds = self.content.split(' ') self.cmds = self.text.split(' ')
def pickWords(self, words):
"""Parse last argument of a line: can be a single word or a sentence starting with :"""
if len(words) > 0 and len(words[0]) > 0:
if words[0][0] == 58:
return b' '.join(words[0:])[1:]
else:
return words[0]
else:
return b''
def decode(self): def decode(self, s):
"""Decode the content string usign a specific encoding""" """Decode the content string usign a specific encoding"""
if isinstance(self.content, bytes): if isinstance(s, bytes):
try: try:
self.content = self.content.decode() s = s.decode()
except UnicodeDecodeError: except UnicodeDecodeError:
#TODO: use encoding from config file #TODO: use encoding from config file
self.content = self.content.decode('utf-8', 'replace') s = s.decode('utf-8', 'replace')
return s
############################## ##############################
# # # #

8
modules/alias.py
View File

@ -157,7 +157,7 @@ def treat_alias(msg, hooks_cache):
and msg.cmds[0][0] == "!" and msg.cmds[0][0] == "!"
and msg.cmds[0][1:] in DATAS.getNode("aliases").index and msg.cmds[0][1:] in DATAS.getNode("aliases").index
and msg.cmds[0][1:] not in hooks_cache("cmd_hook")): and msg.cmds[0][1:] not in hooks_cache("cmd_hook")):
msg.content = msg.content.replace(msg.cmds[0], msg.text = msg.text.replace(msg.cmds[0],
DATAS.getNode("aliases").index[msg.cmds[0][1:]]["origin"], 1) DATAS.getNode("aliases").index[msg.cmds[0][1:]]["origin"], 1)
msg.parse_content() msg.parse_content()
@ -166,7 +166,7 @@ def treat_alias(msg, hooks_cache):
return True return True
else: else:
msg.content = replace_variables(msg.content, msg) msg.text = replace_variables(msg.text, msg)
msg.parse_content() msg.parse_content()
return False return False
return False return False
@ -174,8 +174,8 @@ def treat_alias(msg, hooks_cache):
@hook("ask_default") @hook("ask_default")
def parseask(msg): def parseask(msg):
global ALIAS global ALIAS
if re.match(".*(set|cr[ée]{2}|nouvel(le)?) alias.*", msg.content) is not None: if re.match(".*(set|cr[ée]{2}|nouvel(le)?) alias.*", msg.text) is not None:
result = re.match(".*alias !?([^ ]+) (pour|=|:) (.+)$", msg.content) result = re.match(".*alias !?([^ ]+) (pour|=|:) (.+)$", msg.text)
if result.group(1) in DATAS.getNode("aliases").index or result.group(3).find("alias") >= 0: if result.group(1) in DATAS.getNode("aliases").index or result.group(3).find("alias") >= 0:
return Response(msg.sender, "Cet alias est déjà défini.") return Response(msg.sender, "Cet alias est déjà défini.")
else: else:

2
modules/birthday.py
View File

@ -84,7 +84,7 @@ def cmd_age(msg):
@hook("ask_default") @hook("ask_default")
def parseask(msg): def parseask(msg):
res = re.match(r"^(\S+)\s*('s|suis|est|is|was|were)?\s+(birthday|geburtstag|née? |nee? le|born on).*$", msg.content, re.I) res = re.match(r"^(\S+)\s*('s|suis|est|is|was|were)?\s+(birthday|geburtstag|née? |nee? le|born on).*$", msg.text, re.I)
if res is not None: if res is not None:
try: try:
extDate = msg.extractDate() extDate = msg.extractDate()

6
modules/events.py
View File

@ -188,14 +188,14 @@ RGXP_ask = re.compile(r"^.*((create|new)\s+(a|an|a\s*new|an\s*other)?\s*(events?
@hook("ask_default") @hook("ask_default")
def parseask(msg): def parseask(msg):
if RGXP_ask.match(msg.content) is not None: if RGXP_ask.match(msg.text) is not None:
name = re.match("^.*!([^ \"'@!]+).*$", msg.content) name = re.match("^.*!([^ \"'@!]+).*$", msg.text)
if name is None: if name is None:
raise IRCException("il faut que tu attribues une commande à l'événement.") raise IRCException("il faut que tu attribues une commande à l'événement.")
if name.group(1) in DATAS.index: if name.group(1) in DATAS.index:
raise IRCException("un événement portant ce nom existe déjà.") raise IRCException("un événement portant ce nom existe déjà.")
texts = re.match("^[^\"]*(avant|après|apres|before|after)?[^\"]*\"([^\"]+)\"[^\"]*((avant|après|apres|before|after)?.*\"([^\"]+)\".*)?$", msg.content, re.I) texts = re.match("^[^\"]*(avant|après|apres|before|after)?[^\"]*\"([^\"]+)\"[^\"]*((avant|après|apres|before|after)?.*\"([^\"]+)\".*)?$", msg.text, re.I)
if texts is not None and texts.group(3) is not None: if texts is not None and texts.group(3) is not None:
extDate = msg.extractDate() extDate = msg.extractDate()
if extDate is None or extDate == "": if extDate is None or extDate == "":

2
modules/reddit.py
View File

@ -59,7 +59,7 @@ def parselisten(msg):
global LAST_SUBS global LAST_SUBS
try: try:
urls = re.findall("www.reddit.com(/\w/\w+/?)", msg.content) urls = re.findall("www.reddit.com(/\w/\w+/?)", msg.text)
for url in urls: for url in urls:
if msg.channel not in LAST_SUBS: if msg.channel not in LAST_SUBS:
LAST_SUBS[msg.channel] = list() LAST_SUBS[msg.channel] = list()

10
modules/sms.py
View File

@ -78,11 +78,11 @@ apikey_ask = re.compile(r"(clef|key|password|mot de passe?)\s+(?:est|is)?\s+(?P<
@hook("ask_default") @hook("ask_default")
def parseask(msg): def parseask(msg):
if msg.content.find("Free") >= 0 and ( if msg.text.find("Free") >= 0 and (
msg.content.find("API") >= 0 or msg.content.find("api") >= 0) and ( msg.text.find("API") >= 0 or msg.text.find("api") >= 0) and (
msg.content.find("SMS") >= 0 or msg.content.find("sms") >= 0): msg.text.find("SMS") >= 0 or msg.text.find("sms") >= 0):
resuser = apiuser_ask.search(msg.content) resuser = apiuser_ask.search(msg.text)
reskey = apikey_ask.search(msg.content) reskey = apikey_ask.search(msg.text)
if resuser is not None and reskey is not None: if resuser is not None and reskey is not None:
apiuser = resuser.group("user") apiuser = resuser.group("user")
apikey = reskey.group("key") apikey = reskey.group("key")

2
modules/weather.py
View File

@ -212,7 +212,7 @@ gps_ask = re.compile(r"^\s*(?P<city>.*\w)\s*(?:(?:se|est)\s+(?:trouve|situ[ée]*
@hook("ask_default") @hook("ask_default")
def parseask(msg): def parseask(msg):
res = gps_ask.match(msg.content) res = gps_ask.match(msg.text)
if res is not None: if res is not None:
city_name = res.group("city").lower() city_name = res.group("city").lower()
gps_lat = res.group("lat").replace(",", ".") gps_lat = res.group("lat").replace(",", ".")

2
modules/ycc.py
View File

@ -55,7 +55,7 @@ def cmd_ycc(msg):
def parselisten(msg): def parselisten(msg):
global LAST_URLS global LAST_URLS
try: try:
urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ ]+)", msg.content) urls = re.findall("([a-zA-Z0-9+.-]+:(?://)?[^ ]+)", msg.text)
for url in urls: for url in urls:
o = urlparse(url) o = urlparse(url)
if o.scheme != "": if o.scheme != "":

24
response.py
View File

@ -32,7 +32,7 @@ class Response:
self.server = server self.server = server
self.messages = list() self.messages = list()
self.alone = True self.alone = True
self.ctcp = ctcp self.is_ctcp = ctcp
if message is not None: if message is not None:
self.append_message(message, shown_first_count=shown_first_count) self.append_message(message, shown_first_count=shown_first_count)
self.elt = 0 # Next element to display self.elt = 0 # Next element to display
@ -106,12 +106,18 @@ class Response:
if len(self.rawtitle) <= 0: if len(self.rawtitle) <= 0:
self.rawtitle = None self.rawtitle = None
def treat_ctcp(self, content):
if self.is_ctcp:
return "\x01" + content + "\x01"
else:
return content
def get_message(self): def get_message(self):
if self.alone and len(self.messages) > 1: if self.alone and len(self.messages) > 1:
self.alone = False self.alone = False
if self.empty: if self.empty:
return self.nomore return self.treat_ctcp(self.nomore)
msg = "" msg = ""
if self.channel is not None and self.nick is not None: if self.channel is not None and self.nick is not None:
@ -132,35 +138,35 @@ class Response:
if len(msg) + len(e) > 430: if len(msg) + len(e) > 430:
msg += "[…]" msg += "[…]"
self.alone = False self.alone = False
return msg return self.treat_ctcp(msg)
else: else:
msg += e + ", " msg += e + ", "
self.elt += 1 self.elt += 1
self.pop() self.pop()
return msg[:len(msg)-2] return self.treat_ctcp(msg[:len(msg)-2])
else: else:
if len(elts) <= 432: if len(elts) <= 432:
self.pop() self.pop()
if self.count is not None: if self.count is not None:
return msg + elts + (self.count % len(self.messages)) return self.treat_ctcp(msg + elts + (self.count % len(self.messages)))
else: else:
return msg + elts return self.treat_ctcp(msg + elts)
else: else:
words = elts.split(' ') words = elts.split(' ')
if len(words[0]) > 432 - len(msg): if len(words[0]) > 432 - len(msg):
self.elt += 432 - len(msg) self.elt += 432 - len(msg)
return msg + elts[:self.elt] + "[…]" return self.treat_ctcp(msg + elts[:self.elt] + "[…]")
for w in words: for w in words:
if len(msg) + len(w) > 431: if len(msg) + len(w) > 431:
msg += "[…]" msg += "[…]"
self.alone = False self.alone = False
return msg return self.treat_ctcp(msg)
else: else:
msg += w + " " msg += w + " "
self.elt += len(w) + 1 self.elt += len(w) + 1
self.pop() self.pop()
return msg return self.treat_ctcp(msg)

21
server/IRC.py
View File

@ -120,21 +120,16 @@ class IRCServer(server.Server):
self.channels[chan].treat(msg.cmd, msg) self.channels[chan].treat(msg.cmd, msg)
def evt_channel(self, msg, srv): def evt_channel(self, msg, srv):
if msg.channel is not None: if msg.receivers is not None:
if msg.channel in self.channels: for receiver in msg.receivers:
self.channels[msg.channel].treat(msg.cmd, msg) if receiver in self.channels:
self.channels[receiver].treat(msg.cmd, msg)
def accepted_channel(self, chan, sender=None): def accepted_channel(self, chan, sender=None):
"""Return True if the channel (or the user) is authorized""" """Return True if the channel (or the user) is authorized"""
if self.allow_all: return (self.allow_all or
return True (chan in self.channels and (sender is None or sender in self.channels[chan].people)) or
elif self.listen_nick: (self.listen_nick and chan == self.nick))
return (chan in self.channels and (sender is None or sender in
self.channels[chan].people)
) or chan == self.nick
else:
return chan in self.channels and (sender is None or sender
in self.channels[chan].people)
def join(self, chan, password=None, force=False): def join(self, chan, password=None, force=False):
"""Join a channel""" """Join a channel"""
@ -255,7 +250,7 @@ class IRCServer(server.Server):
"""Send a message without checks or format""" """Send a message without checks or format"""
#TODO: add something for post message treatment here #TODO: add something for post message treatment here
if channel == self.nick: if channel == self.nick:
self.logger.warn("Nemubot talks to himself: %s", msg, stack_info=True) self.logger.warn("Nemubot talks to himself: %s", line, stack_info=True)
if line is not None and channel is not None: if line is not None and channel is not None:
if self.s is None: if self.s is None:
self.logger.warn("Attempt to send message on a non connected server: %s: %s", self.id, line, stack_info=True) self.logger.warn("Attempt to send message on a non connected server: %s: %s", self.id, line, stack_info=True)

20
server/__init__.py
View File

@ -73,22 +73,20 @@ class Server(threading.Thread):
def send_response(self, res, origin): def send_response(self, res, origin):
"""Analyse a Response and send it""" """Analyse a Response and send it"""
# TODO: how to send a CTCP message to a different person if type(res.channel) != list:
if res.ctcp: res.channel = [ res.channel ]
self.send_ctcp(res.sender, res.get_message())
elif res.channel is not None and res.channel != self.nick: for channel in res.channel:
self.send_msg(res.channel, res.get_message()) if channel != self.nick:
self.send_msg(channel, res.get_message())
else:
channel = res.sender
self.send_msg_usr(channel, res.get_message(), "NOTICE" if res.is_ctcp else "PRIVMSG")
if not res.alone: if not res.alone:
if hasattr(self, "send_bot"): if hasattr(self, "send_bot"):
self.send_bot("NOMORE %s" % res.channel) self.send_bot("NOMORE %s" % res.channel)
self.moremessages[res.channel] = res self.moremessages[channel] = res
elif res.sender is not None:
self.send_msg_usr(res.sender, res.get_message())
if not res.alone:
self.moremessages[res.sender] = res
def send_ctcp(self, to, msg, cmd="NOTICE", endl="\r\n"): def send_ctcp(self, to, msg, cmd="NOTICE", endl="\r\n"):
"""Send a message as CTCP response""" """Send a message as CTCP response"""