X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=037200295044413d048a6c3a7d2c79e21c8e3e36;hb=189fded888582341014f2e34ed6c173926ad5417;hp=5d92ac12ef0cffaf8b97cd62ea9d1675a728efd3;hpb=5f39f3e7c91ad135ad86c8cf964d2bef235719b7;p=electrum-server.git diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py index 5d92ac1..0372002 100644 --- a/backends/irc/__init__.py +++ b/backends/irc/__init__.py @@ -5,7 +5,7 @@ def random_string(N): return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N)) from processor import Processor - +from version import VERSION class IrcThread(threading.Thread): @@ -19,13 +19,17 @@ class IrcThread(threading.Thread): self.host = config.get('server','host') self.nick = config.get('server', 'irc_nick') if not self.nick: self.nick = random_string(10) + self.prepend = 'E_' + if config.get('server', 'coin') == 'litecoin': + self.prepend = 'EL_' + self.nick = self.prepend + self.nick def get_peers(self): return self.peers.values() def getname(self): - s = '' + s = 'v' + VERSION + ' ' if self.stratum_tcp_port: s += 't' + self.stratum_tcp_port + ' ' if self.stratum_http_port: @@ -41,7 +45,7 @@ class IrcThread(threading.Thread): s = socket.socket() s.connect(('irc.freenode.net', 6667)) s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n') - s.send('NICK E_' + self.nick + '\n') + s.send('NICK ' + self.nick + '\n') s.send('JOIN #electrum\n') sf = s.makefile('r', 0) t = 0 @@ -55,7 +59,7 @@ class IrcThread(threading.Thread): elif '353' in line: # answer to /names k = line.index('353') for item in line[k+1:]: - if item[0:2] == 'E_': + if item.startswith(self.prepend): s.send('WHO %s\n'%item) elif '352' in line: # answer to /who # warning: this is a horrible hack which apparently works @@ -130,7 +134,7 @@ class ServerProcessor(Processor): result = self.get_peers() elif method == 'server.version': - result = 'ok' + result = VERSION elif method == 'server.stop': self.shared.stop()