From 33a16ac39553e53ed67d7e8b15771323ff0f162d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= <kaeza@users.sf.net>
Date: Sat, 19 Jan 2013 04:59:38 -0200
Subject: [PATCH] Reconnect with a different nickname if the original is
 already in use

---
 doc/TODO.txt     |  1 +
 etc/quickinst.sh |  7 ++++++-
 src/callback.lua | 23 ++++++++++++++++++++---
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/doc/TODO.txt b/doc/TODO.txt
index 72c0f85..1634d8f 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -4,6 +4,7 @@ TODO List
 
   - Check for availability of nickname on join, and select a different one
      until one is available.
+  - Implement more callbacks for `mt_irc.register_callback'.
 
 Not TODO List
 -------------
diff --git a/etc/quickinst.sh b/etc/quickinst.sh
index fb6984f..a561d82 100755
--- a/etc/quickinst.sh
+++ b/etc/quickinst.sh
@@ -1,2 +1,7 @@
 #! /bin/sh
-(cd Build && cmake . && make && make pack_mod && rm -fr ~/.minetest/games/testing/mods/irc && cp -fr irc ~/.minetest/games/testing/mods/ )
+cd Build \
+    && cmake .. \
+    && make \
+    && make pack_mod \
+    && rm -fr ~/.minetest/games/testing/mods/irc \
+    && cp -fr irc ~/.minetest/games/testing/mods/
diff --git a/src/callback.lua b/src/callback.lua
index c13ba5c..bf69a33 100644
--- a/src/callback.lua
+++ b/src/callback.lua
@@ -183,12 +183,29 @@ minetest.register_on_shutdown(function ( )
     end
 end);
 
-irc.handlers.on_error = function (from, respond_to)
+irc.handlers.on_error = function (...) --( from, respond_to )
     for k, v in pairs(mt_irc.connected_players) do
-        if (v) then minetest.chat_send_player(k, text); end
+        if (v) then minetest.chat_send_player(k, "IRC: Bot had a network error. Reconnecting in 5 seconds..."); end
+    end
+    for _, v in ipairs({...}) do
+        minetest.chat_send_all(dump(v));
+    end
+    irc.quit("Network error");
+    for n = 1, 5 do
+        irc.poll();
     end
     mt_irc.got_motd = false;
     mt_irc.connect_ok = false;
-    irc.quit("Ping timeout");
     minetest.after(5, mt_irc.connect);
 end
+
+irc.handlers.on_err_nicknameinuse = function ( from, respond_to )
+    irc.quit("Nick in use");
+    for n = 1, 5 do
+        irc.poll();
+    end
+    mt_irc.got_motd = false;
+    mt_irc.connect_ok = false;
+    mt_irc.server_nick = mt_irc.server_nick:sub(1, -2)..math.floor(math.random(10));
+    mt_irc.connect();
+end