Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Fix the order of some connection params, add alias as a seperate argument to

Browse source 
IRCServer.Server
This commit is contained in:
jesopo 2018-11-05 18:30:14 +00:00
parent 6b8593a09b
commit d63115440d
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/perform.py
View file

@ -8,6 +8,6 @@ class Module(ModuleManager.BaseModule):
command = command.split("%%") command = command.split("%%")
for j, part in enumerate(command[:]): for j, part in enumerate(command[:]):
command[j] = part.replace("%nick%", event["server" command[j] = part.replace("%nick%", event["server"
].original_nickname) ].nickname)
command = "%".join(command) command = "%".join(command)
event["server"].send(command) event["server"].send(command)

2
src/IRCBot.py
View file

@ -44,7 +44,7 @@ class Bot(object):
*self.database.servers.get(server_id)) *self.database.servers.get(server_id))
new_server = IRCServer.Server(self, self._events, new_server = IRCServer.Server(self, self._events,
connection_params.id, connection_params) connection_params.id, connection_params.alias, connection_params)
self._events.on("new.server").call(server=new_server) self._events.on("new.server").call(server=new_server)
if not connect or not new_server.get_setting("connect", True): if not connect or not new_server.get_setting("connect", True):

6
src/IRCServer.py
View file

@ -11,11 +11,13 @@ class Server(IRCObject.Object):
bot: "IRCBot.Bot", bot: "IRCBot.Bot",
events: EventManager.EventHook, events: EventManager.EventHook,
id: int, id: int,
alias: typing.Optional[str],
connection_params: utils.irc.IRCConnectionParameters): connection_params: utils.irc.IRCConnectionParameters):
self.connected = False self.connected = False
self.bot = bot self.bot = bot
self.events = events self.events = events
self.id = id self.id = id
self.alias = alias
self.connection_params = connection_params self.connection_params = connection_params
self.name = None # type: typing.Optional[str] self.name = None # type: typing.Optional[str]
@ -87,7 +89,7 @@ class Server(IRCObject.Object):
self.socket.settimeout(5.0) self.socket.settimeout(5.0)
if self.connection_params.bindhost: if self.connection_params.bindhost:
self.socket.bind((self.bindhost, 0)) self.socket.bind((self.connection_params.bindhost, 0))
if self.connection_params.tls: if self.connection_params.tls:
self.tls_wrap() self.tls_wrap()
@ -95,7 +97,7 @@ class Server(IRCObject.Object):
self.connection_params.port)) self.connection_params.port))
self.send_capibility_ls() self.send_capibility_ls()
if self.password: if self.connection_params.password:
self.send_pass(self.connection_params.password) self.send_pass(self.connection_params.password)
self.send_user(self.connection_params.username, self.send_user(self.connection_params.username,

2
src/utils/irc.py
View file

@ -145,7 +145,7 @@ def strip_font(s: str) -> str:
OPT_STR = typing.Optional[str] OPT_STR = typing.Optional[str]
class IRCConnectionParameters(object): class IRCConnectionParameters(object):
def __init__(self, id: int, alias: OPT_STR, hostname: str, port: int, def __init__(self, id: int, alias: OPT_STR, hostname: str, port: int,
tls: bool, ipv4: bool, password: OPT_STR, bindhost: OPT_STR, password: OPT_STR, tls: bool, ipv4: bool, bindhost: OPT_STR,
nickname: str, username: OPT_STR, realname: OPT_STR): nickname: str, username: OPT_STR, realname: OPT_STR):
self.id = id self.id = id
self.alias = alias self.alias = alias