BOPM/TCM do not need the ability to global kill, so remove it from server_bot

[irc/rqf/shadowircd.git] / extensions / m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index e3a6fa55815382fa63b4966e50da5a9a289406d8..66e12deec06d1ff5bda2c1a9e20cf74d765cbd1f 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -20,25 +20,22 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.h"
-#include "client.h"
+#include "client.h" 
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
-#include "s_newconf.h"
+#include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
-#include "hash.h"
+#include "match.h"
+#include "hash.h" 
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 
-
 static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 
@@ -108,9 +105,6 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :@%s",
                              me.id, (long) chptr->channelts, chptr->chname, source_p->id);
-               sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                             ":%s SJOIN %ld %s + :@%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -124,9 +118,6 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :+%s",
                              me.id, (long) chptr->channelts, chptr->chname, source_p->id);
-               sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                             ":%s SJOIN %ld %s + :+%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -139,9 +130,6 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s JOIN %ld %s +",
                              source_p->id, (long) chptr->channelts, chptr->chname);
-               sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-                             ":%s SJOIN %ld %s + :%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -156,7 +144,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                           source_p->name, chptr->chname, chptr->topic_info, chptr->topic_time);
        }
 
-       source_p->localClient->last_join_time = CurrentTime;
+       source_p->localClient->last_join_time = rb_current_time();
        channel_member_names(chptr, source_p, 1);
 
        return 0;