Split messages class into multiple files
This commit is contained in:
parent
57bbca4e7a
commit
c8d495d508
15 changed files with 280 additions and 198 deletions
|
|
@ -10,7 +10,7 @@ import shlex
|
|||
from nemubot import context
|
||||
from nemubot.exception import IRCException
|
||||
from nemubot.hooks import hook
|
||||
from nemubot.message import TextMessage, Command
|
||||
from nemubot.message import Command
|
||||
from nemubot.tools.xmlparser.node import ModuleState
|
||||
|
||||
nemubotversion = 3.4
|
||||
|
|
|
|||
|
|
@ -142,9 +142,9 @@ def send(toks, **kwargs):
|
|||
% (toks[1], srv.id))
|
||||
return 3
|
||||
|
||||
from nemubot.message import TextMessage
|
||||
srv.send_response(TextMessage(" ".join(toks[2:]), server=None,
|
||||
to=[toks[1]]))
|
||||
from nemubot.message import Text
|
||||
srv.send_response(Text(" ".join(toks[2:]), server=None,
|
||||
to=[toks[1]]))
|
||||
return 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
import logging
|
||||
|
||||
from nemubot.message import TextMessage, DirectAsk
|
||||
from nemubot.message import Text, DirectAsk
|
||||
from nemubot.hooks import hook
|
||||
|
||||
nemubotversion = 3.4
|
||||
|
|
@ -120,8 +120,8 @@ class Response:
|
|||
self.get_message(maxlen - len(self.nick) - 2),
|
||||
server=None, to=self.receivers)
|
||||
else:
|
||||
return TextMessage(self.get_message(maxlen),
|
||||
server=None, to=self.receivers)
|
||||
return Text(self.get_message(maxlen),
|
||||
server=None, to=self.receivers)
|
||||
|
||||
def get_message(self, maxlen):
|
||||
if self.alone and len(self.messages) > 1:
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import subprocess
|
|||
from threading import Thread
|
||||
|
||||
from nemubot.hooks import hook
|
||||
from nemubot.message import TextMessage
|
||||
from nemubot.message import Text
|
||||
from nemubot.message.visitor import AbstractVisitor
|
||||
|
||||
nemubotversion = 3.4
|
||||
|
|
@ -51,7 +51,7 @@ class SpeakerVisitor(AbstractVisitor):
|
|||
self.last = last
|
||||
|
||||
|
||||
def visit_TextMessage(self, msg):
|
||||
def visit_Text(self, msg):
|
||||
force = (self.last is None)
|
||||
|
||||
if force or msg.date - self.last.date > timedelta(0, 500):
|
||||
|
|
@ -86,27 +86,27 @@ class SpeakerVisitor(AbstractVisitor):
|
|||
|
||||
|
||||
def visit_DirectAsk(self, msg):
|
||||
res = TextMessage("%s: %s" % (msg.designated, msg.message),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res = Text("%s: %s" % (msg.designated, msg.message),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res.accept(self)
|
||||
|
||||
|
||||
def visit_Command(self, msg):
|
||||
res = TextMessage("Bang %s%s%s" % (msg.cmd,
|
||||
" " if len(msg.args) else "",
|
||||
" ".join(msg.args)),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res = Text("Bang %s%s%s" % (msg.cmd,
|
||||
" " if len(msg.args) else "",
|
||||
" ".join(msg.args)),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res.accept(self)
|
||||
|
||||
|
||||
def visit_OwnerCommand(self, msg):
|
||||
res = TextMessage("Owner Bang %s%s%s" % (msg.cmd,
|
||||
" " if len(msg.args) else "",
|
||||
" ".join(msg.args)),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res = Text("Owner Bang %s%s%s" % (msg.cmd,
|
||||
" " if len(msg.args) else "",
|
||||
" ".join(msg.args)),
|
||||
server=msg.server, date=msg.date,
|
||||
to=msg.to, frm=msg.frm)
|
||||
res.accept(self)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from urllib.parse import quote
|
|||
|
||||
from nemubot.exception import IRCException
|
||||
from nemubot.hooks import hook
|
||||
from nemubot.message import TextMessage
|
||||
from nemubot.message import Text
|
||||
from nemubot.tools import web
|
||||
|
||||
nemubotversion = 3.4
|
||||
|
|
@ -37,8 +37,8 @@ def gen_response(res, msg, srv):
|
|||
if res is None:
|
||||
raise IRCException("mauvaise URL : %s" % srv)
|
||||
else:
|
||||
return TextMessage("URL pour %s : %s" % (srv, res), server=None,
|
||||
to=msg.to_response)
|
||||
return Text("URL pour %s : %s" % (srv, res), server=None,
|
||||
to=msg.to_response)
|
||||
|
||||
|
||||
@hook("cmd_hook", "ycc")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue