nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

IRC server: differentiate nick and username

Browse Source
This commit is contained in:
nemunaire 2014-11-02 18:31:53 +01:00
parent 745d2b0487
commit 8dfd0f07cc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prompt/builtins.py
View File

@ -78,7 +78,7 @@ def load_file(filename, context):
} }
# Optional keyword arguments # Optional keyword arguments
for optional_opt in [ "port", "realname", "password", "encoding", "caps" ]: for optional_opt in [ "port", "username", "realname", "password", "encoding", "caps" ]:
if server.hasAttribute(optional_opt): if server.hasAttribute(optional_opt):
opts[optional_opt] = server[optional_opt] opts[optional_opt] = server[optional_opt]
elif optional_opt in config: elif optional_opt in config:

14
server/IRC.py
View File

@ -31,7 +31,7 @@ import tools
class IRC(SocketServer): class IRC(SocketServer):
def __init__(self, owner, nick="nemubot", host="localhost", port=6667, def __init__(self, owner, nick="nemubot", host="localhost", port=6667,
ssl=False, password=None, realname="Nemubot", ssl=False, username=None, password=None, realname="Nemubot",
encoding="utf-8", caps=None, channels=list(), encoding="utf-8", caps=None, channels=list(),
on_connect=None): on_connect=None):
"""Prepare a connection with an IRC server """Prepare a connection with an IRC server
@ -42,6 +42,7 @@ class IRC(SocketServer):
host -- host to join host -- host to join
port -- port on the host to reach port -- port on the host to reach
ssl -- is this server using a TLS socket ssl -- is this server using a TLS socket
username -- the username as sent to server
password -- if a password is required to connect to the server password -- if a password is required to connect to the server
realname -- the bot's realname realname -- the bot's realname
encoding -- the encoding used on the whole server encoding -- the encoding used on the whole server
@ -50,15 +51,16 @@ class IRC(SocketServer):
on_connect -- generator to call when connection is done on_connect -- generator to call when connection is done
""" """
self.id = nick + "@" + host + ":" + port self.username = username if username is not None else nick
self.printer = IRCPrinter
SocketServer.__init__(self, host=host, port=port, ssl=ssl)
self.password = password self.password = password
self.nick = nick self.nick = nick
self.owner = owner self.owner = owner
self.realname = realname self.realname = realname
self.id = self.username + "@" + host + ":" + port
self.printer = IRCPrinter
SocketServer.__init__(self, host=host, port=port, ssl=ssl)
self.encoding = encoding self.encoding = encoding
# Keep a list of joined channels # Keep a list of joined channels
@ -227,7 +229,7 @@ class IRC(SocketServer):
if self.capabilities is not None: if self.capabilities is not None:
self.write("CAP LS") self.write("CAP LS")
self.write("NICK :" + self.nick) self.write("NICK :" + self.nick)
self.write("USER %s %s bla :%s" % (self.nick, self.host, self.realname)) self.write("USER %s %s bla :%s" % (self.username, self.host, self.realname))
return True return True
return False return False