diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c index 6311731d5..27cb3922f 100644 --- a/extensions/ip_cloaking.c +++ b/extensions/ip_cloaking.c @@ -59,9 +59,6 @@ distribute_hostchange(struct Client *client) sendto_server(NULL, NULL, CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s", use_id(&me), use_id(client), client->host); - sendto_server(NULL, NULL, - NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s", - me.name, client->name, client->host); if (irccmp(client->host, client->orighost)) SetDynSpoof(client); else diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c index ea2c6bc2f..16406536e 100644 --- a/extensions/ip_cloaking_old.c +++ b/extensions/ip_cloaking_old.c @@ -59,9 +59,6 @@ distribute_hostchange(struct Client *client) sendto_server(NULL, NULL, CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s", use_id(&me), use_id(client), client->host); - sendto_server(NULL, NULL, - NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s", - me.name, client->name, client->host); if (irccmp(client->host, client->orighost)) SetDynSpoof(client); else diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c index 96efcad95..66e12deec 100644 --- a/extensions/m_ojoin.c +++ b/extensions/m_ojoin.c @@ -105,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); @@ -121,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); @@ -136,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); diff --git a/extensions/m_okick.c b/extensions/m_okick.c index add1648c1..e5367c3e5 100644 --- a/extensions/m_okick.c +++ b/extensions/m_okick.c @@ -136,8 +136,6 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char me.name, chptr->chname, who->name, comment); sendto_server(&me, chptr, CAP_TS6, NOCAPS, ":%s KICK %s %s :%s", me.id, chptr->chname, who->id, comment); - sendto_server(&me, chptr, NOCAPS, CAP_TS6, - ":%s KICK %s %s :%s", me.name, chptr->chname, who->name, comment); remove_user_from_channel(msptr); return 0; } diff --git a/extensions/m_omode.c b/extensions/m_omode.c index f1407ffd1..c00974e03 100644 --- a/extensions/m_omode.c +++ b/extensions/m_omode.c @@ -140,9 +140,6 @@ mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char ":%s TMODE %ld %s +o %s", me.id, (long) chptr->channelts, parv[1], source_p->id); - sendto_server(NULL, chptr, NOCAPS, CAP_TS6, - ":%s MODE %s +o %s", - me.name, parv[1], source_p->name); msptr->flags |= CHFL_CHANOP; } else diff --git a/extensions/m_opme.c b/extensions/m_opme.c index e23d6c760..bd74eba3e 100644 --- a/extensions/m_opme.c +++ b/extensions/m_opme.c @@ -104,13 +104,9 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char * ":%s WALLOPS :OPME called for [%s] by %s!%s@%s", me.name, parv[1], source_p->name, source_p->username, source_p->host); sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]); - sendto_server(NULL, chptr, NOCAPS, CAP_TS6, ":%s PART %s", source_p->name, parv[1]); sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s SJOIN %ld %s + :@%s", me.id, (long) chptr->channelts, parv[1], source_p->id); - sendto_server(NULL, chptr, NOCAPS, CAP_TS6, - ":%s SJOIN %ld %s + :@%s", - me.name, (long) chptr->channelts, parv[1], source_p->name); } sendto_channel_local(ALL_MEMBERS, chptr,