pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-10 14:43:13 +02:00
Code Activity

Fix channel mode +P (Permanent) not working if you have set::modes-on-join, reported by blank (#4426).

Browse Source
This commit is contained in:
Bram Matthys
2015-10-17 11:11:55 +02:00
parent 7637517da2
commit f1426e02ee
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/m_join.c
+10 -1
View File
@@ -272,6 +272,7 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
}
#endif
}
if (chptr->topic)
{
sendto_one(sptr, rpl_str(RPL_TOPIC),
@@ -281,7 +282,13 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
sptr->name, chptr->chname, chptr->topic_nick,
chptr->topic_time);
}
if (chptr->users == 1 && (MODES_ON_JOIN || iConf.modes_on_join.extmodes))
/* Set default channel modes (set::modes-on-join).
* Set only if it's the 1st user and only if no other modes have been set
* already (eg: +P, permanent).
*/
if ((chptr->users == 1) && !chptr->mode.mode && !chptr->mode.extmode &&
(MODES_ON_JOIN || iConf.modes_on_join.extmodes))
{
int i;
chptr->mode.extmode = iConf.modes_on_join.extmodes;
@@ -303,9 +310,11 @@ DLLFUNC void _join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int fl
me.name, chptr->chname, modebuf, parabuf, chptr->creationtime);
sendto_one(sptr, ":%s MODE %s %s %s", me.name, chptr->chname, modebuf, parabuf);
}
parv[0] = sptr->name;
parv[1] = chptr->chname;
(void)do_cmd(cptr, sptr, "NAMES", 2, parv);
RunHook4(HOOKTYPE_LOCAL_JOIN, cptr, sptr,chptr,parv);
} else {
RunHook4(HOOKTYPE_REMOTE_JOIN, cptr, sptr, chptr, parv); /* (rarely used) */