rewrote IRC cache parser to be (hopefully) more stable

[NeonServV5.git] / src / modules / NeonSpam.mod / event_neonspam_join.c

diff --git a/src/modules/NeonSpam.mod/event_neonspam_join.c b/src/modules/NeonSpam.mod/event_neonspam_join.c
index 5a169f207487c0c702e3752363704a14da9750d4..497cc2f0fa5036507da224de38577e71c9909a46 100644 (file)
--- a/src/modules/NeonSpam.mod/event_neonspam_join.c
+++ b/src/modules/NeonSpam.mod/event_neonspam_join.c
@@ -1,4 +1,4 @@
-/* event_neonspam_join.c - NeonServ v5.3
+/* event_neonspam_join.c - NeonServ v5.4
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@ struct neonspam_event_join_cache {
 };
 
 static void neonspam_event_join(struct ChanUser *chanuser) {
-    if(chanuser->user->flags & USERFLAG_WAS_REGISTRING) return;
     struct ClientSocket *client = getChannelBot(chanuser->chan, BOTID);
     if(!client) return; //we can't "see" this event
     if(chanuser->user == client->user) {
@@ -54,7 +53,7 @@ static void neonspam_event_join(struct ChanUser *chanuser) {
             cache->chanuser = chanuser;
             cache->settings = settings;
             cache->action = result;
-            get_userauth(chanuser->user, neonspam_event_join_nick_lookup, cache);
+            get_userauth(chanuser->user, module_id, neonspam_event_join_nick_lookup, cache);
         }
     }
 }
@@ -102,7 +101,7 @@ static void neonspam_event_join_punish(struct ClientSocket *client, struct ChanU
                     char banidBuf[20];
                     sprintf(nameBuf, "ban_%d", banid);
                     sprintf(banidBuf, "%d", banid);
-                    timeq_add_name(nameBuf, duration, channel_ban_timeout, strdup(banidBuf));
+                    timeq_add_name(nameBuf, duration, module_id, channel_ban_timeout, strdup(banidBuf));
                 }
             case 1: //KICKBAN
                 if(!banmask)