make Message object part of Bot
parent
8e88b21516
commit
6731e3c4cb
|
@ -11,6 +11,19 @@ import irc.bot
|
||||||
irc.client.ServerConnection.buffer_class.errors = 'replace'
|
irc.client.ServerConnection.buffer_class.errors = 'replace'
|
||||||
|
|
||||||
|
|
||||||
|
class Bot(irc.bot.SingleServerIRCBot):
|
||||||
|
def __init__(self, channels, nickname, server, **kwargs):
|
||||||
|
self.set_kwargs(**kwargs)
|
||||||
|
if self.ssl_required:
|
||||||
|
factory = irc.connection.Factory(wrapper=ssl.wrap_socket)
|
||||||
|
irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port, self.server_pass)], nickname, nickname, connect_factory=factory)
|
||||||
|
else:
|
||||||
|
irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port, self.server_pass)], nickname, nickname)
|
||||||
|
self.chanlist = channels
|
||||||
|
self.bot_nick = nickname
|
||||||
|
self.start_logging(self.log_level)
|
||||||
|
self.load_plugins()
|
||||||
|
|
||||||
class Message:
|
class Message:
|
||||||
def __init__(self, channel, nick, botnick, ops, logger, cmd=None, arg=None, text=None, nick_list=None):
|
def __init__(self, channel, nick, botnick, ops, logger, cmd=None, arg=None, text=None, nick_list=None):
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
|
@ -27,20 +40,6 @@ class Message:
|
||||||
if not (cmd or text):
|
if not (cmd or text):
|
||||||
raise TypeError('missing cmd or text parameter')
|
raise TypeError('missing cmd or text parameter')
|
||||||
|
|
||||||
|
|
||||||
class Bot(irc.bot.SingleServerIRCBot):
|
|
||||||
def __init__(self, channels, nickname, server, **kwargs):
|
|
||||||
self.set_kwargs(**kwargs)
|
|
||||||
if self.ssl_required:
|
|
||||||
factory = irc.connection.Factory(wrapper=ssl.wrap_socket)
|
|
||||||
irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port, self.server_pass)], nickname, nickname, connect_factory=factory)
|
|
||||||
else:
|
|
||||||
irc.bot.SingleServerIRCBot.__init__(self, [(server, self.port, self.server_pass)], nickname, nickname)
|
|
||||||
self.chanlist = channels
|
|
||||||
self.bot_nick = nickname
|
|
||||||
self.start_logging(self.log_level)
|
|
||||||
self.load_plugins()
|
|
||||||
|
|
||||||
def set_kwargs(self, **kwargs):
|
def set_kwargs(self, **kwargs):
|
||||||
kwarguments = {
|
kwarguments = {
|
||||||
'port': 6667,
|
'port': 6667,
|
||||||
|
@ -168,7 +167,7 @@ class Bot(irc.bot.SingleServerIRCBot):
|
||||||
c.privmsg(chan, 'Plugins reloaded')
|
c.privmsg(chan, 'Plugins reloaded')
|
||||||
elif cmd in self.cmds:
|
elif cmd in self.cmds:
|
||||||
try:
|
try:
|
||||||
output = self.cmds[cmd](Message(
|
output = self.cmds[cmd](self.Message(
|
||||||
channel=chan,
|
channel=chan,
|
||||||
cmd=cmd,
|
cmd=cmd,
|
||||||
nick_list=list(self.channels[chan].users()),
|
nick_list=list(self.channels[chan].users()),
|
||||||
|
@ -185,7 +184,7 @@ class Bot(irc.bot.SingleServerIRCBot):
|
||||||
else:
|
else:
|
||||||
for lstnr in self.lstnrs:
|
for lstnr in self.lstnrs:
|
||||||
try:
|
try:
|
||||||
output = self.lstnrs[lstnr](Message(
|
output = self.lstnrs[lstnr](self.Message(
|
||||||
channel=chan,
|
channel=chan,
|
||||||
text=text,
|
text=text,
|
||||||
nick_list=list(self.channels[chan].users()),
|
nick_list=list(self.channels[chan].users()),
|
||||||
|
|
Loading…
Reference in New Issue