Fix some more numerics with incorrect arguments in U5: WATCH and failed

to JOIN reasons, such as when banned.
This commit is contained in:
Bram Matthys 2019-09-17 18:53:07 +02:00
parent 66345246ef
commit 41f2b5f884
No known key found for this signature in database
GPG key ID: BF8116B163EAAE98
3 changed files with 9 additions and 9 deletions

View file

@ -685,8 +685,8 @@ int hash_check_watch(Client *cptr, int reply)
{
if (!awaynotify)
{
sendnumeric(lp->value.cptr, reply, me.name,
lp->value.cptr->name, cptr->name,
sendnumeric(lp->value.cptr, reply,
cptr->name,
(IsUser(cptr) ? cptr->user->username : "<N/A>"),
(IsUser(cptr) ?
(IsHidden(cptr) ? cptr->user->virthost : cptr->
@ -699,15 +699,15 @@ int hash_check_watch(Client *cptr, int reply)
continue; /* skip away/unaway notification for users not interested in them */
if (reply == RPL_NOTAWAY)
sendnumeric(lp->value.cptr, reply, me.name,
lp->value.cptr->name, cptr->name,
sendnumeric(lp->value.cptr, reply,
cptr->name,
(IsUser(cptr) ? cptr->user->username : "<N/A>"),
(IsUser(cptr) ?
(IsHidden(cptr) ? cptr->user->virthost : cptr->
user->realhost) : "<N/A>"), cptr->user->lastaway);
else /* RPL_GONEAWAY / RPL_REAWAY */
sendnumeric(lp->value.cptr, reply, me.name,
lp->value.cptr->name, cptr->name,
sendnumeric(lp->value.cptr, reply,
cptr->name,
(IsUser(cptr) ? cptr->user->username : "<N/A>"),
(IsUser(cptr) ?
(IsHidden(cptr) ? cptr->user->virthost : cptr->

View file

@ -590,7 +590,7 @@ int _do_join(Client *cptr, Client *sptr, int parc, char *parv[])
{
if (i != -1)
{
sendnumeric(sptr, i, me.name, sptr->name, name);
sendnumeric(sptr, i, name);
}
continue;
}

View file

@ -74,14 +74,14 @@ static void show_watch(Client *cptr, char *name, int rpl1, int rpl2, int awaynot
return;
}
sendnumeric(cptr, rpl1, me.name, cptr->name,
sendnumeric(cptr, rpl1,
acptr->name, acptr->user->username,
IsHidden(acptr) ? acptr->user->virthost : acptr->user->
realhost, acptr->lastnick);
}
else
{
sendnumeric(cptr, rpl2, me.name, cptr->name,
sendnumeric(cptr, rpl2,
name, "*", "*", 0L);
}
}