diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2012-12-23 14:05:16 +0000 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2012-12-23 14:05:16 +0000 |
| commit | da609fc4454a8e57cbdd9d0415bb7fed1f7d1ce1 (patch) | |
| tree | 9c99a32ed669e5b59bb32b37dca641f0cb6be58b /tests/compile/tircbot.nim | |
| parent | 3cbac135465d63a320ff5fcdb5d3ba4ba89da4c8 (diff) | |
| download | Nim-da609fc4454a8e57cbdd9d0415bb7fed1f7d1ce1.tar.gz | |
Fixed many deprecation warnings. asyncio.recvLine now throws an
exception when an error occurs. Added sockets.SocketError.
Diffstat (limited to 'tests/compile/tircbot.nim')
| -rw-r--r-- | tests/compile/tircbot.nim | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/compile/tircbot.nim b/tests/compile/tircbot.nim index 10482c3f6..d16c99b69 100644 --- a/tests/compile/tircbot.nim +++ b/tests/compile/tircbot.nim @@ -272,7 +272,7 @@ proc handleWebMessage(state: PState, line: string) = message.add(limitCommitMsg(commit["message"].str)) # Send message to #nimrod. - state.ircClient[].privmsg(joinChans[0], message) + state.ircClient.privmsg(joinChans[0], message) elif json.existsKey("redisinfo"): assert json["redisinfo"].existsKey("port") #let redisPort = json["redisinfo"]["port"].num @@ -336,10 +336,11 @@ proc hubConnect(state: PState) = state.dispatcher.register(state.sock) -proc handleIrc(irc: var TAsyncIRC, event: TIRCEvent, state: PState) = +proc handleIrc(irc: PAsyncIRC, event: TIRCEvent, state: PState) = case event.typ + of EvConnected: nil of EvDisconnected: - while not state.ircClient[].isConnected: + while not state.ircClient.isConnected: try: state.ircClient.connect() except: @@ -355,12 +356,12 @@ proc handleIrc(irc: var TAsyncIRC, event: TIRCEvent, state: PState) = let msg = event.params[event.params.len-1] let words = msg.split(' ') template pm(msg: string): stmt = - state.ircClient[].privmsg(event.origin, msg) + state.ircClient.privmsg(event.origin, msg) case words[0] of "!ping": pm("pong") of "!lag": - if state.ircClient[].getLag != -1.0: - var lag = state.ircClient[].getLag + if state.ircClient.getLag != -1.0: + var lag = state.ircClient.getLag lag = lag * 1000.0 pm($int(lag) & "ms between me and the server.") else: @@ -433,7 +434,7 @@ proc open(port: TPort = TPort(5123)): PState = res.hubPort = port res.hubConnect() let hirc = - proc (a: var TAsyncIRC, ev: TIRCEvent) = + proc (a: PAsyncIRC, ev: TIRCEvent) = handleIrc(a, ev, res) # Connect to the irc server. res.ircClient = AsyncIrc(ircServer, nick = botNickname, user = botNickname, |