Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-04 18:38:39 +02:00
Code Issues Projects Releases Wiki Activity

Added RFE #1031748, optional password for Network.connect.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-12-17 19:51:09 +00:00
parent b8f2e97237
commit 20924ed87e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Network.py
View File

@ -62,12 +62,13 @@ class Network(callbacks.Privmsg):
raise callbacks.Error, \ raise callbacks.Error, \
'I\'m not currently connected to %s.' % network 'I\'m not currently connected to %s.' % network
def connect(self, irc, msg, args, network, server): def connect(self, irc, msg, args, network, server, password):
"""<network> [<host[:port]>] """<network> [<host[:port]>] [<password>]
Connects to another network (which will be represented by the name Connects to another network (which will be represented by the name
provided in <network>) at <host:port>. If port is not provided, it provided in <network>) at <host:port>. If port is not provided, it
defaults to 6667, the default port for IRC. defaults to 6667, the default port for IRC. If password is
provided, it will be sent to the server in a PASS command.
""" """
try: try:
otherIrc = self._getIrc(network) otherIrc = self._getIrc(network)
@ -93,7 +94,8 @@ class Network(callbacks.Privmsg):
conf.supybot.networks().add(network) conf.supybot.networks().add(network)
assert newIrc.callbacks is irc.callbacks, 'callbacks list is different' assert newIrc.callbacks is irc.callbacks, 'callbacks list is different'
irc.replySuccess('Connection to %s initiated.' % network) irc.replySuccess('Connection to %s initiated.' % network)
connect = wrap(connect, ['owner', 'something', additional('something')]) connect = wrap(connect, ['owner', 'something', additional('something'),
additional('something', '')])
def disconnect(self, irc, msg, args, otherIrc, quitMsg): def disconnect(self, irc, msg, args, otherIrc, quitMsg):
"""[<network>] [<quit message>] """[<network>] [<quit message>]

4
src/Owner.py
View File

@ -286,7 +286,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
callbacks.Privmsg._mores.clear() callbacks.Privmsg._mores.clear()
self.__parent.reset() self.__parent.reset()
def _connect(self, network, serverPort=None): def _connect(self, network, serverPort=None, password=''):
try: try:
group = conf.supybot.networks.get(network) group = conf.supybot.networks.get(network)
(server, port) = group.servers()[0] (server, port) = group.servers()[0]
@ -294,7 +294,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
if serverPort is None: if serverPort is None:
raise ValueError, 'connect requires a (server, port) ' \ raise ValueError, 'connect requires a (server, port) ' \
'if the network is not registered.' 'if the network is not registered.'
conf.registerNetwork(network) conf.registerNetwork(network, password)
serverS = '%s:%s' % serverPort serverS = '%s:%s' % serverPort
conf.supybot.networks.get(network).servers.append(serverS) conf.supybot.networks.get(network).servers.append(serverS)
assert conf.supybot.networks.get(network).servers() assert conf.supybot.networks.get(network).servers()