cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

channel: refactor fe3c1c828e and fix surrounding indentation

This commit is contained in:
Kyle Jonhson 2013-11-15 05:00:40 +00:00
parent 502490b13a
commit 27b08207de
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/channel.c
View File

@ -2004,30 +2004,27 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
* send a mode out next. * send a mode out next.
*/ */
sendto_channel_local_with_capability(ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN %s", sendto_channel_local_with_capability(ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN %s",
source_p->name, source_p->username, source_p->host, chptr->chname); source_p->name, source_p->username, source_p->host, chptr->chname);
sendto_channel_local_with_capability(ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr, ":%s!%s@%s JOIN %s %s %ld :%s", sendto_channel_local_with_capability(ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr, ":%s!%s@%s JOIN %s %s %ld :%s",
source_p->name, source_p->username, source_p->host, chptr->chname, source_p->name, source_p->username, source_p->host, chptr->chname,
EmptyString(source_p->user->suser) ? "*" : source_p->user->suser, EmptyString(source_p->user->suser) ? "*" : source_p->user->suser,
source_p->tsinfo, source_p->info); source_p->tsinfo, source_p->info);
/* Send away message to away-notify enabled clients. */ /* Send away message to away-notify enabled clients. */
/* /*
* The following test fixes autojoin_opers in an auth block joining * The following test fixes autojoin_opers in an auth block joining
* clients to channels from segfaulting the irc daemon. * clients to channels from segfaulting the irc daemon.
* - Niichan * - Niichan
*/ */
if (client_p->user != NULL) if (client_p->user && client_p->user->away)
{ {
if (client_p->user->away) sendto_channel_local_with_capability_butone(client_p, ALL_MEMBERS, CLICAP_AWAY_NOTIFY, NOCAPS, chptr,
{ ":%s!%s@%s AWAY :%s", client_p->name, client_p->username,
sendto_channel_local_with_capability_butone(client_p, ALL_MEMBERS, CLICAP_AWAY_NOTIFY, NOCAPS, chptr, client_p->host, client_p->user->away);
":%s!%s@%s AWAY :%s", client_p->name, client_p->username, }
client_p->host, client_p->user->away);
}
}
/* its a new channel, set +nt and burst. */ /* its a new channel, set +nt and burst. */
if(flags & CHFL_CHANOP) if(flags & CHFL_CHANOP)