Use send_channel_join().

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 239cd447ca5ccd5836a22502f3029054a3292baa..402caa7c303ee83faa2e3cf4311b99fecbf4b21a 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -104,9 +104,7 @@ 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_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
+               send_channel_join(chptr, source_p);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +o %s",
                                     me.name, chptr->chname, source_p->name);
 
@@ -117,9 +115,7 @@ 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_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
+               send_channel_join(chptr, source_p);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +v %s",
                                     me.name, chptr->chname, source_p->name);
        }
@@ -129,9 +125,7 @@ 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_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
+               send_channel_join(chptr, source_p);
        }
 
        /* send the topic... */

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index c360db03b3eea8368095a1f9677ac3f158e63cd1..14e69a3f258afcfc201c4b21019320bb7f165d59 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -322,9 +322,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
                /* we send the user their join here, because we could have to
                 * send a mode out next.
                 */
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                    source_p->name,
-                                    source_p->username, source_p->host, chptr->chname);
+               send_channel_join(chptr, source_p);
 
                /* its a new channel, set +nt and burst. */
                if(flags & CHFL_CHANOP)
@@ -494,9 +492,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
                        chptr->join_delta = rb_current_time();
                }
                chptr->join_count++;
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                    source_p->name, source_p->username,
-                                    source_p->host, chptr->chname);
+               send_channel_join(chptr, source_p);
        }
 
        sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
@@ -839,9 +835,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                if(!IsMember(target_p, chptr))
                {
                        add_user_to_channel(chptr, target_p, fl);
-                       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                            target_p->name,
-                                            target_p->username, target_p->host, parv[2]);
+                       send_channel_join(chptr, target_p);
                        joins++;
                }