*mbuf++ = 'M';
if (chptr->mode.mode & MODE_QUARANTINE)
*mbuf++ = 'Q';
+ if (chptr->mode.mode & MODE_AUDITORIUM)
+ *mbuf++ = 'u';
if (chptr->mode.limit) {
*mbuf++ = 'l';
ircd_snprintf(0, pbuf, buflen, "%u", chptr->mode.limit);
MODE_NOAMSGS, 'M',
MODE_NONOTICE, 'N',
MODE_QUARANTINE, 'Q',
+ MODE_AUDITORIUM, 'u',
0x0, 0x0
};
static ulong64 local_flags[] = {
mode &= (MODE_ADD | MODE_DEL | MODE_PRIVATE | MODE_SECRET | MODE_MODERATED |
MODE_TOPICLIMIT | MODE_INVITEONLY | MODE_NOPRIVMSGS | MODE_REGONLY |
MODE_DELJOINS | MODE_WASDELJOINS | MODE_REGISTERED | MODE_PERSIST |
- MODE_NOCOLOUR | MODE_NOCTCP | MODE_NOAMSGS | MODE_NONOTICE | MODE_QUARANTINE);
+ MODE_NOCOLOUR | MODE_NOCTCP | MODE_NOAMSGS | MODE_NONOTICE |
+ MODE_QUARANTINE | MODE_AUDITORIUM);
if (!(mode & ~(MODE_ADD | MODE_DEL))) /* don't add empty modes... */
return;
MODE_QUARANTINE, 'Q',
MODE_ALTCHAN, 'F',
MODE_ACCESS, 'a',
+ MODE_AUDITORIUM, 'u',
0x0, 0x0
};
ulong64 add;
struct Membership *member;
int parc;
char **parv;
- unsigned int flags;
- unsigned int dir;
- unsigned int done;
- unsigned int add;
- unsigned int del;
+ ulong64 flags;
+ ulong64 dir;
+ ulong64 done;
+ ulong64 add;
+ ulong64 del;
int args_used;
int max_args;
int numbans;
struct Ban banlist[MAXPARA];
struct {
- unsigned int flag;
+ ulong64 flag;
unsigned short oplevel;
struct Client *client;
} cli_change[MAXPARA];
}
}
+/* Handle MODE_AUDITORIUM changes
+ * set Delayed for all hidden users on MODE_DEL
+ * part all nonoped users on MODE_ADD
+ */
+static void audit_chan_users(struct ParseState *state, ulong64 *flag_p) {
+ struct Membership *member;
+ if (state->dir == MODE_ADD) {
+ for(member = state->chptr->members; member; member = member->next_member) {
+ if(!IsChanOp(member) && !HasVoice(member)) {
+ sendcmdto_channel_butserv_butone(member->user, CMD_PART, member->channel, member->user, SKIP_OPS, "%H :%s", member->channel, "mode +u set.");
+ }
+ }
+ } else {
+ for(member = state->chptr->members; member; member = member->next_member) {
+ if(!IsChanOp(member) && !HasVoice(member)) {
+ sendcmdto_channel_butserv_butone(member->user, CMD_JOIN, member->channel, member->user, SKIP_OPS, ":%H", member->channel);
+ }
+ }
+ }
+}
+
+
/*
* Helper function to convert bans
*/
else
SetOpLevel(member, OpLevel(state->member) + 1);
}
-
+
+ int user_visible = (member->status & CHFL_VOICED_OR_OPPED);
+
/* actually effect the change */
if (state->flags & MODE_PARSE_SET) {
if (state->cli_change[i].flag & MODE_ADD) {
modebuf_mode_client(state->mbuf, state->cli_change[i].flag,
state->cli_change[i].client,
state->cli_change[i].oplevel);
+
+ if((member->channel->mode.mode & MODE_AUDITORIUM)) {
+ //join or part the user
+ if((member->status & CHFL_VOICED_OR_OPPED) && !user_visible) {
+ sendcmdto_channel_butserv_butone(member->user, CMD_JOIN, member->channel, member->user, SKIP_OPS, ":%H", member->channel);
+ } else if(!(member->status & CHFL_VOICED_OR_OPPED) && user_visible) {
+ sendcmdto_channel_butserv_butone(member->user, CMD_PART, member->channel, member->user, SKIP_OPS, "%H :%s", member->channel, "user deoped/devoiced on a +u channel.");
+ }
+ if(MyUser(member->user) && (state->cli_change[i].flag & MODE_CHANOP)) {
+ //do_names(member->user, member->channel, NAMES_ALL|NAMES_EON|((member->status & MODE_CHANOP) ? 0 : NAMES_OPS));
+ //this is not working for all users :( so we have to send join/part events
+ struct Membership *member2;
+ if (state->cli_change[i].flag & MODE_ADD) {
+ //JOIN events
+ for(member2 = state->chptr->members; member2; member2 = member2->next_member) {
+ if(!IsChanOp(member2) && !HasVoice(member2)) {
+ sendcmdto_one(member2->user, CMD_JOIN, member->user, ":%H", member->channel);
+ }
+ }
+ } else {
+ //PART events
+ for(member2 = state->chptr->members; member2; member2 = member2->next_member) {
+ if(!IsChanOp(member2) && !HasVoice(member2) && member != member2) {
+ sendcmdto_one(member2->user, CMD_PART, member->user, "%H :%s", member->channel, "invisible user on +u channel.");
+ }
+ }
+ }
+ }
+ }
} /* for (i = 0; state->cli_change[i].flags; i++) */
}
/* Local users are not permitted to change registration status */
if (flag_p[0] == MODE_REGISTERED && !(state->flags & MODE_PARSE_FORCE) && MyUser(state->sptr))
return;
+
+ if(flag_p[0] == MODE_AUDITORIUM)
+ audit_chan_users(state, flag_p);
if (state->dir == MODE_ADD) {
state->add |= flag_p[0];
MODE_QUARANTINE, 'Q',
MODE_ALTCHAN, 'F',
MODE_ACCESS, 'a',
+ MODE_AUDITORIUM, 'u',
MODE_ADD, '+',
MODE_DEL, '-',
0x0, 0x0
SetUserParting(member);
/* Send notification to channel */
- if (!(flags & (CHFL_ZOMBIE | CHFL_DELAYED)))
+ if((chan->mode.mode & MODE_AUDITORIUM) && !(member->status & CHFL_VOICED_OR_OPPED)) {
+ //send part to ops only
+ sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, SKIP_NONOPS, "%H :%s", chan, jbuf->jb_comment);
+ if(MyUser(jbuf->jb_source))
+ sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source, "%H :%s", chan, jbuf->jb_comment);
+ } else if (!(flags & (CHFL_ZOMBIE | CHFL_DELAYED)))
sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, 0,
(flags & CHFL_BANNED || !jbuf->jb_comment) ?
":%H" : "%H :%s", chan, jbuf->jb_comment);
"%H %Tu %i", chan, chan->creationtime, 0);
}
}
-
- if (!((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED)) && !((flags & CHFL_INVISIBLE) && !(flags & CHFL_VOICED_OR_OPPED))) {
+
+ if((chan->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_VOICED_OR_OPPED)) {
+ //we have to send this JOIN event to ops only...
+ sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_JOIN, chan, NULL, SKIP_NONOPS, "%H", chan);
+ if(MyUser(jbuf->jb_source))
+ sendcmdto_one(jbuf->jb_source, CMD_JOIN, jbuf->jb_source, ":%H", chan);
+ }
+ else if (!((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED)) && !((flags & CHFL_INVISIBLE) && !(flags & CHFL_VOICED_OR_OPPED))) {
/* Send the notification to the channel */
sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_JOIN, chan, NULL, 0, "%H", chan);
}
}
+void CheckEnableDelayedJoins(struct Channel *chan) {
+ if (!(chan->mode.mode & MODE_WASDELJOINS) && find_delayed_joins(chan)) {
+ chan->mode.mode |= MODE_WASDELJOINS;
+ sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan, NULL, 0,
+ "%H +d", chan);
+ sendcmdto_channel_servers_butone(&me, CMD_MODE, chan, NULL, 0,
+ "%H +d", chan);
+ }
+}
+
/* checks whether a channel is nonpersistent with no users and deletes it
* returns 1 if deleted, otherwise 0
*/