Merge chanserv-live into default.

[irc/quakenet/newserv.git] / lua / luabot.c

diff --git a/lua/luabot.c b/lua/luabot.c
index a4d5fc6735ebc4f72e9bfbfd94074b987151b70b..d99ccd1f52177487cc757f9784806c08dc9872b4 100644 (file)
--- a/lua/luabot.c
+++ b/lua/luabot.c
@@ -27,6 +27,7 @@ void lua_onauth(int hooknum, void *arg);
 void lua_ondisconnect(int hooknum, void *arg);
 void lua_onmode(int hooknum, void *arg);
 void lua_onop(int hooknum, void *arg);
+void lua_onprequit(int hooknum, void *arg);
 void lua_onquit(int hooknum, void *arg);
 void lua_onrename(int hooknum, void *arg);
 void lua_onconnect(int hooknum, void *arg);
@@ -45,6 +46,7 @@ void lua_registerevents(void) {
   registerhook(HOOK_CHANNEL_KICK, &lua_onkick);
   registerhook(HOOK_CHANNEL_OPPED, &lua_onop);
   registerhook(HOOK_CHANNEL_DEOPPED, &lua_onop);
+  registerhook(HOOK_NICK_PRE_LOSTNICK, &lua_onprequit);
   registerhook(HOOK_NICK_LOSTNICK, &lua_onquit);
   registerhook(HOOK_NICK_RENAME, &lua_onrename);
   registerhook(HOOK_IRC_CONNECTED, &lua_onconnect);
@@ -62,6 +64,7 @@ void lua_deregisterevents(void) {
   deregisterhook(HOOK_IRC_CONNECTED, &lua_onconnect);
   deregisterhook(HOOK_NICK_RENAME, &lua_onrename);
   deregisterhook(HOOK_NICK_LOSTNICK, &lua_onquit);
+  deregisterhook(HOOK_NICK_PRE_LOSTNICK, &lua_onprequit);
   deregisterhook(HOOK_CHANNEL_DEOPPED, &lua_onop);
   deregisterhook(HOOK_CHANNEL_OPPED, &lua_onop);
   deregisterhook(HOOK_CHANNEL_KICK, &lua_onkick);
@@ -295,18 +298,11 @@ void lua_onkick(int hooknum, void *arg) {
   nick *kicked = arglist[1];
   nick *kicker = arglist[2];
   char *message = (char *)arglist[3];
-  int mode = 1;
 
-  if(!kicker || IsOper(kicker) || IsService(kicker) || IsXOper(kicker)) /* bloody Cruicky */
-    mode = 0;
-
-  if(mode) {
+  if(kicker)
     lua_avpcall("irc_onkick", "Slls", ci->name, kicked->numeric, kicker->numeric, message);
-  } else if(kicker) {
-    lua_avpcall("irc_onkickall", "Slls", ci->name, kicked->numeric, kicker->numeric, message);
-  } else {
-    lua_avpcall("irc_onkickall", "Sl0s", ci->name, kicked->numeric, message);
-  }
+  else
+    lua_avpcall("irc_onkick", "Sl0s", ci->name, kicked->numeric, message);
 }
 
 void lua_ontopic(int hooknum, void *arg) {
@@ -314,12 +310,13 @@ void lua_ontopic(int hooknum, void *arg) {
   channel *cp=(channel*)arglist[0];
   nick *np = (nick *)arglist[1];
 
-  if(!np || IsOper(np) || IsService(np) || IsXOper(np))
-    return;
   if(!cp || !cp->topic) 
     return;
 
-  lua_avpcall("irc_ontopic", "SlS", cp->index->name, np->numeric, cp->topic);
+  if(np)
+    lua_avpcall("irc_ontopic", "SlS", cp->index->name, np->numeric, cp->topic);
+  else
+    lua_avpcall("irc_ontopic", "S0S", cp->index->name, cp->topic);
 }
 
 void lua_onop(int hooknum, void *arg) {
@@ -381,6 +378,15 @@ void lua_onquit(int hooknum, void *arg) {
   lua_avpcall("irc_onquit", "l", np->numeric);
 }
 
+void lua_onprequit(int hooknum, void *arg) {
+  nick *np = (nick *)arg;
+
+  if(!np)
+    return;
+
+  lua_avpcall("irc_onprequit", "l", np->numeric);
+}
+
 void lua_onauth(int hooknum, void *arg) {
   nick *np = (nick *)arg;