pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-01 00:06:39 +02:00
Code Activity

Another delayjoin fix (chanmode +D). Duplicate JOIN for remote user (SJOIN).

Browse Source
This commit is contained in:
Bram Matthys
2017-01-09 20:11:37 +01:00
parent 90508c74ae
commit 8af0172300
1 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/m_sjoin.c
+6 -25
View File
@@ -138,7 +138,7 @@ CMD_FUNC(m_sjoin)
char *s = NULL;
aChannel *chptr; /**< Channel */
aParv *ap;
int pcount, i, invisible;
int pcount, i;
Hook *h;
time_t ts, oldts;
unsigned short b=0, c;
@@ -475,37 +475,18 @@ getnick:
modeflags = 0;
}
/* Run hooks to decide if we should show this JOIN to all users in
* the channel (invisible=0) or only to chanops (invisible=1).
*/
invisible = 0;
for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
{
invisible = (*(h->func.intfunc))(sptr,chptr);
if (invisible != 0)
break;
}
if (!IsMember(acptr, chptr))
{
add_user_to_channel(chptr, acptr, modeflags);
RunHook4(HOOKTYPE_REMOTE_JOIN, cptr, acptr, chptr, NULL);
if (invisible == 0)
if (invisible_user_in_channel(acptr, chptr))
{
sendto_channel_butserv(chptr, acptr, ":%s JOIN :%s", acptr->name, chptr->chname);
/* Show JOIN to chanops only */
sendto_chanops_butone(NULL, chptr, ":%s!%s@%s JOIN :%s",
acptr->name, acptr->user->username, GetHost(acptr), chptr->chname);
} else
{
/* A module requested to make the join invisible. Only do this if the
* joining user is non-vhoaq. Also, the join is always visible to chanops.
*/
if (modeflags & (CHFL_CHANOP|CHFL_CHANPROT|CHFL_CHANOWNER|CHFL_HALFOP|CHFL_VOICE))
{
sendto_channel_butserv(chptr, acptr, ":%s JOIN :%s", acptr->name, chptr->chname);
} else
{
sendto_chanops_butone(NULL, chptr, ":%s!%s@%s JOIN :%s",
acptr->name, acptr->user->username, GetHost(acptr), chptr->chname);
}
sendto_channel_butserv(chptr, acptr, ":%s JOIN :%s", acptr->name, chptr->chname);
}
}