X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/20517d4824ea646f507b84b235973db4502b7f77..537128ea365c31c2a11778c476d51a6f4402df78:/src/chanserv.c diff --git a/src/chanserv.c b/src/chanserv.c index 29748f3..a7bd7bf 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -218,6 +218,7 @@ static const struct message_entry msgtab[] = { { "CSMSG_NO_SELF_CLVL", "You cannot change your own access." }, { "CSMSG_NO_BUMP_ACCESS", "You cannot give users access greater than or equal to your own." }, { "CSMSG_MULTIPLE_OWNERS", "There is more than one owner in %s; please use $bCLVL$b, $bDELOWNER$b and/or $bADDOWNER$b instead." }, + { "CSMSG_NO_OWNER", "There is no owner for %s; please use $bCLVL$b and/or $bADDOWNER$b instead." }, { "CSMSG_TRANSFER_WAIT", "You must wait %s before you can give ownership of $b%s$b to someone else." }, { "CSMSG_NO_TRANSFER_SELF", "You cannot give ownership to your own account." }, { "CSMSG_OWNERSHIP_GIVEN", "Ownership of $b%s$b has been transferred to account $b%s$b." }, @@ -296,6 +297,7 @@ static const struct message_entry msgtab[] = { { "CSMSG_USET_AUTOOP", "$bAutoOp $b %s" }, { "CSMSG_USET_AUTOVOICE", "$bAutoVoice $b %s" }, { "CSMSG_USET_AUTOINVITE", "$bAutoInvite $b %s" }, + { "CSMSG_USET_AUTOJOIN", "$bAutoJoin $b %s" }, { "CSMSG_USET_INFO", "$bInfo $b %s" }, { "CSMSG_USER_PROTECTED", "Sorry, $b%s$b is protected." }, @@ -316,6 +318,7 @@ static const struct message_entry msgtab[] = { { "CSMSG_AUTOMODE_HOP", "#1 plus give halfops to everyone." }, { "CSMSG_AUTOMODE_OP", "#1 plus give ops to everyone (not advised)" }, { "CSMSG_AUTOMODE_MUTE", "Give half-op to halfops, and op to ops only." }, + { "CSMSG_AUTOMODE_ONLYVOICE", "Just voice everyone with access." }, { "CSMSG_PROTECT_ALL", "Non-users and users will be protected from those of equal or lower access." }, { "CSMSG_PROTECT_EQUAL", "Users will be protected from those of equal or lower access." }, @@ -513,6 +516,8 @@ static const struct message_entry msgtab[] = { /* Other things */ { "CSMSG_EVENT_SEARCH_RESULTS", "$bChannel Events for %s$b" }, { "CSMSG_LAST_INVALID", "Invalid argument. must be 1-200" }, + { "CSMSG_DEFCON_NO_NEW_CHANNELS", "You cannot register new channels at this time, please try again soon." }, + { "CSMSG_DEFCON_NO_MODE_CHANGE", "You cannot change the MODE at this time, please try again soon." }, { NULL, NULL } }; @@ -684,7 +689,8 @@ struct charOptionValues { { 'v', "CSMSG_AUTOMODE_VOICE" }, { 'h', "CSMSG_AUTOMODE_HOP" }, { 'o', "CSMSG_AUTOMODE_OP" }, - { 'm', "CSMSG_AUTOMODE_MUTE" } + { 'm', "CSMSG_AUTOMODE_MUTE" }, + { 'l', "CSMSG_AUTOMODE_ONLYVOICE" } }, protectValues[] = { { 'a', "CSMSG_PROTECT_ALL" }, { 'e', "CSMSG_PROTECT_EQUAL" }, @@ -1632,25 +1638,43 @@ expire_channels(UNUSED_ARG(void *data)) } static int -protect_user(const struct userNode *victim, const struct userNode *aggressor, struct chanData *channel) +protect_user(const struct userNode *victim, const struct userNode *aggressor, struct chanData *channel, int protect_invitables) { char protect = channel->chOpts[chProtect]; struct userData *cs_victim, *cs_aggressor; - /* Don't protect if no one is to be protected, someone is attacking - himself, or if the aggressor is an IRC Operator. */ - if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/ || IsOper(aggressor) */) - return 0; + /* If victim access level is greater than set invitelevel, don't let + * us kick them, but don't consider it punishment if someone else does + */ + + if(victim == aggressor) + return 0; /* Don't protect if the victim isn't authenticated (because they can't be a channel user), unless we are to protect non-users also. */ + cs_victim = GetChannelAccess(channel, victim->handle_info); + + /* If they have enough access to invite themselvs through a ban, + * and its us kicking them, don't. -Rubin */ + if(protect_invitables==true && cs_victim && (cs_victim->access >= channel->lvlOpts[lvlInviteMe])) + return 1; + + if(protect == 'n') + return 0; + if(protect != 'a' && !cs_victim) return 0; /* Protect if the aggressor isn't a user because at this point, the aggressor can only be less than or equal to the victim. */ + + /* Not protected from chanserv except above */ + /* XXX: need to generic-ize chanserv to "one of x3's services" somehow.. */ + if(aggressor == chanserv) + return 0; + cs_aggressor = GetChannelAccess(channel, aggressor->handle_info); if(!cs_aggressor) return 1; @@ -1722,7 +1746,7 @@ validate_deop(struct svccmd *cmd, struct userNode *user, struct chanNode *channe return 0; } - if(protect_user(victim, user, channel->channel_info)) + if(protect_user(victim, user, channel->channel_info, false)) { reply("CSMSG_USER_PROTECTED", victim->nick); return 0; @@ -1740,7 +1764,7 @@ validate_dehop(struct svccmd *cmd, struct userNode *user, struct chanNode *chann return 0; } - if(protect_user(victim, user, channel->channel_info)) + if(protect_user(victim, user, channel->channel_info, false)) { reply("CSMSG_USER_PROTECTED", victim->nick); return 0; @@ -1963,6 +1987,10 @@ static CHANSERV_FUNC(cmd_register) struct do_not_register *dnr; unsigned int n; + if (checkDefCon(DEFCON_NO_NEW_CHANNELS) && !IsOper(user)) { + reply("CSMSG_DEFCON_NO_NEW_CHANNELS"); + return 0; + } if(channel) { @@ -2099,10 +2127,10 @@ static CHANSERV_FUNC(cmd_register) if(handle != user->handle_info) reply("CSMSG_PROXY_SUCCESS", handle->handle, channel->name); else - reply("CSMSG_REG_SUCCESS", channel->name); sprintf(reason, "%s registered to %s by %s.", channel->name, handle->handle, user->handle_info->handle); - global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason); + global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_REGISTERED_TO", channel->name, + handle->handle, user->handle_info->handle); return 1; } @@ -2208,7 +2236,6 @@ static CHANSERV_FUNC(cmd_move) struct chanNode *target; struct modeNode *mn; struct userData *uData; - char reason[MAXLEN]; struct do_not_register *dnr; int chanserv_join = 0, spamserv_join; @@ -2291,16 +2318,18 @@ static CHANSERV_FUNC(cmd_move) if (chanserv_join) ss_cs_join_channel(target, spamserv_join); - sprintf(reason, "%s moved to %s by %s.", channel->name, target->name, user->handle_info->handle); if(!IsSuspended(target->channel_info)) { char reason2[MAXLEN]; - sprintf(reason2, "Channel moved to %s by %s.", target->name, user->handle_info->handle); - DelChannelUser(chanserv, channel, reason2, 0); + sprintf(reason2, "Channel moved to %s by %s.", target->name, user->handle_info->handle); + DelChannelUser(chanserv, channel, reason2, 0); } + UnlockChannel(channel); LockChannel(target); - global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason); + global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_CHANNEL_MOVED", + channel->name, target->name, user->handle_info->handle); + reply("CSMSG_MOVE_SUCCESS", target->name); return 1; } @@ -2772,30 +2801,96 @@ static CHANSERV_FUNC(cmd_mdelowner) static CHANSERV_FUNC(cmd_mdelcoowner) { - return cmd_mdel_user(user, channel, UL_COOWNER, UL_COOWNER, argv[1], cmd); + return cmd_mdel_user(user, channel, UL_COOWNER, UL_OWNER-1, argv[1], cmd); } static CHANSERV_FUNC(cmd_mdelmanager) { - return cmd_mdel_user(user, channel, UL_MANAGER, UL_MANAGER, argv[1], cmd); + return cmd_mdel_user(user, channel, UL_MANAGER, UL_COOWNER-1, argv[1], cmd); } static CHANSERV_FUNC(cmd_mdelop) { - return cmd_mdel_user(user, channel, UL_OP, UL_OP, argv[1], cmd); + return cmd_mdel_user(user, channel, UL_OP, UL_MANAGER-1, argv[1], cmd); } -static CHANSERV_FUNC(cmd_mdelpeon) +static CHANSERV_FUNC(cmd_mdelhalfop) { - return cmd_mdel_user(user, channel, UL_PEON, UL_PEON, argv[1], cmd); + return cmd_mdel_user(user, channel, UL_HALFOP, UL_OP-1, argv[1], cmd); } -static CHANSERV_FUNC(cmd_mdelhalfop) +static CHANSERV_FUNC(cmd_mdelpeon) { - return cmd_mdel_user(user, channel, UL_HALFOP, UL_HALFOP, argv[1], cmd); + return cmd_mdel_user(user, channel, UL_PEON, UL_HALFOP-1, argv[1], cmd); } +static CHANSERV_FUNC(cmd_levels) +{ + struct helpfile_table tbl; + int ii = 0; + + tbl.length = 6 + 1; // 6 levels + tbl.width = 4; + tbl.flags = 0; + tbl.contents = calloc(tbl.length,sizeof(tbl.contents[0])); + tbl.contents[0] = calloc(tbl.width,sizeof(tbl.contents[0][0])); + tbl.contents[0][0] = "Level"; + tbl.contents[0][1] = "From"; + tbl.contents[0][2] = "-"; + tbl.contents[0][3] = "To"; + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_OWNER)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_OWNER); + tbl.contents[ii][2] = msnprintf(2, " "); + tbl.contents[ii][3] = msnprintf(1, ""); + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_COOWNER)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_COOWNER); + tbl.contents[ii][2] = msnprintf(2, "-"); + tbl.contents[ii][3] = msnprintf(4, "%d", UL_OWNER-1); + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_MANAGER)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_MANAGER); + tbl.contents[ii][2] = msnprintf(2, "-"); + tbl.contents[ii][3] = msnprintf(4, "%d", UL_COOWNER-1); + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_OP)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_OP); + tbl.contents[ii][2] = msnprintf(2, "-"); + tbl.contents[ii][3] = msnprintf(4, "%d", UL_MANAGER-1); + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_HALFOP)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_HALFOP); + tbl.contents[ii][2] = msnprintf(2, "-"); + tbl.contents[ii][3] = msnprintf(4, "%d", UL_OP-1); + + tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0])); + tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_PEON)); + tbl.contents[ii][1] = msnprintf(4, "%d", UL_PEON); + tbl.contents[ii][2] = msnprintf(2, "-"); + tbl.contents[ii][3] = msnprintf(4, "%d", UL_HALFOP-1); + + table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); + return 0; + +/* + reply("CSMSG_LEVELS_HEADER"); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_OWNER), UL_OWNER, UL_OWNER); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_COOWNER), UL_COOWNER, UL_OWNER-1); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_MANAGER), UL_MANAGER, UL_COOWNER-1); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_OP), UL_OP, UL_MANAGER-1); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_HALFOP), UL_HALFOP, UL_OP-1); + reply("CSMSG_LEVELS", user_level_name_from_level(UL_PEON), UL_PEON, UL_HALFOP-1); + reply("CSMSG_BAR"); + */ +} + /* trim_lamers.. */ static int cmd_trim_bans(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, unsigned long duration) @@ -3109,7 +3204,7 @@ bad_channel_ban(struct chanNode *channel, struct userNode *user, const char *ban if(!user_matches_glob(mn->user, ban, MATCH_USENICK | MATCH_VISIBLE)) continue; - if(protect_user(mn->user, user, channel->channel_info)) + if(protect_user(mn->user, user, channel->channel_info, false)) return 1; if(victims) @@ -3166,7 +3261,7 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c return 0; } - if(protect_user(victim, user, channel->channel_info)) + if(protect_user(victim, user, channel->channel_info, false)) { // This translates to send_message(user, cmd->parent->bot, ...) // if user is x3 (ctcp action) cmd is null and segfault. @@ -3398,13 +3493,25 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c } } - if(action & ACTION_KICK) + if(action & ACTION_ADD_LAMER) + { + char kick_reason[MAXLEN]; + sprintf(kick_reason, "(%s) %s", user->nick, reason); + + for(n = 0; n < victimCount; n++) { + if(!protect_user(victims[n]->user, user, channel->channel_info, true)) { + KickChannelUser(victims[n]->user, channel, chanserv, kick_reason); + } + } + } + else if(action & ACTION_KICK) { char kick_reason[MAXLEN]; sprintf(kick_reason, "(%s) %s", user->nick, reason); - for(n = 0; n < victimCount; n++) + for(n = 0; n < victimCount; n++) { KickChannelUser(victims[n]->user, channel, chanserv, kick_reason); + } } if(!cmd) @@ -3705,14 +3812,13 @@ static CHANSERV_FUNC(cmd_myaccess) if(argc < 2) target_handle = user->handle_info; - else if(!IsHelping(user)) + else if(!(target_handle = modcmd_get_handle_info(user, argv[1]))) + return 0; + else if(!IsHelping(user) && target_handle != user->handle_info) { reply("CSMSG_MYACCESS_SELF_ONLY", argv[0]); return 0; } - else if(!(target_handle = modcmd_get_handle_info(user, argv[1]))) - return 0; - if(!target_handle->channels) { reply("CSMSG_SQUAT_ACCESS", target_handle->handle); @@ -3747,6 +3853,8 @@ static CHANSERV_FUNC(cmd_myaccess) } if(IsUserAutoInvite(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe])) string_buffer_append(&sbuf, 'i'); + if(IsUserAutoJoin(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe])) + string_buffer_append(&sbuf, 'j'); if(uData->info) string_buffer_append_printf(&sbuf, ")] %s", uData->info); else @@ -4257,7 +4365,7 @@ static CHANSERV_FUNC(cmd_lamers) if(!matches) { table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); - reply("MSG_NONE"); +/* reply("MSG_NONE"); */ free(tbl.contents[0]); free(tbl.contents); return 0; @@ -4447,6 +4555,11 @@ static CHANSERV_FUNC(cmd_mode) if(argc < 2) { + if (checkDefCon(DEFCON_NO_MODE_CHANGE) && !IsOper(user)) { + reply("CSMSG_DEFCON_NO_MODE_CHANGE"); + return 0; + } + change = &channel->channel_info->modes; if(change->modes_set || change->modes_clear) { modcmd_chanmode_announce(change); @@ -5390,8 +5503,9 @@ static CHANSERV_FUNC(cmd_csuspend) suspended->previous->revoked = now; if(suspended->previous->expires) timeq_del(suspended->previous->expires, chanserv_expire_suspension, suspended->previous, 0); - sprintf(reason, "%s suspension modified by %s.", channel->name, suspended->suspender); - global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason); + + global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_SUSPENSION_MODIFIED", + channel->name, suspended->suspender); } else { @@ -5410,8 +5524,8 @@ static CHANSERV_FUNC(cmd_csuspend) spamserv_cs_suspend(channel, expiry, 1, suspended->reason); DelChannelUser(chanserv, channel, suspended->reason, 0); reply("CSMSG_SUSPENDED", channel->name); - sprintf(reason, "%s suspended by %s.", channel->name, suspended->suspender); - global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason); + global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_SUSPENDED_BY", + channel->name, suspended->suspender); } return 1; } @@ -5419,7 +5533,6 @@ static CHANSERV_FUNC(cmd_csuspend) static CHANSERV_FUNC(cmd_cunsuspend) { struct suspended *suspended; - char message[MAXLEN]; if(!IsSuspended(channel->channel_info)) { @@ -5433,8 +5546,8 @@ static CHANSERV_FUNC(cmd_cunsuspend) timeq_del(suspended->expires, chanserv_expire_suspension, suspended, 0); chanserv_expire_suspension(suspended); reply("CSMSG_UNSUSPENDED", channel->name); - sprintf(message, "%s unsuspended by %s.", channel->name, user->handle_info->handle); - global_message(MESSAGE_RECIPIENT_OPERS|MESSAGE_RECIPIENT_HELPERS, message); + global_message_args(MESSAGE_RECIPIENT_OPERS|MESSAGE_RECIPIENT_HELPERS, "CSMSG_UNSUSPENDED_BY", + channel->name, user->handle_info->handle); return 1; } @@ -5750,6 +5863,11 @@ static MODCMD_FUNC(chan_opt_modes) if(argc > 1) { + if (checkDefCon(DEFCON_NO_MODE_CHANGE) && !IsOper(user)) { + reply("CSMSG_DEFCON_NO_MODE_CHANGE"); + return 0; + } + if(!check_user_level(channel, user, lvlEnfModes, 1, 0)) { reply("CSMSG_NO_ACCESS"); @@ -6212,11 +6330,10 @@ static MODCMD_FUNC(user_opt_autoop) reply("CSMSG_NOT_USER", channel->name); return 0; } - if(uData->access < UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/) + if(uData->access < UL_HALFOP /*channel->channel_info->lvlOpts[lvlGiveOps]*/) return user_binary_option("CSMSG_USET_AUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS); else return user_binary_option("CSMSG_USET_AUTOOP", USER_AUTO_OP, CSFUNC_ARGS); - /* TODO: add halfops error message? or is the op one generic enough? */ } static MODCMD_FUNC(user_opt_autoinvite) @@ -6224,6 +6341,11 @@ static MODCMD_FUNC(user_opt_autoinvite) return user_binary_option("CSMSG_USET_AUTOINVITE", USER_AUTO_INVITE, CSFUNC_ARGS); } +static MODCMD_FUNC(user_opt_autojoin) +{ + return user_binary_option("CSMSG_USET_AUTOJOIN", USER_AUTO_JOIN, CSFUNC_ARGS); +} + static MODCMD_FUNC(user_opt_info) { struct userData *uData; @@ -6282,7 +6404,7 @@ static CHANSERV_FUNC(cmd_uset) { char *options[] = { - "AutoOp", "AutoInvite", "Info" + "AutoOp", "AutoInvite", "AutoJoin", "Info" }; if(!uset_shows_list.size) @@ -6333,7 +6455,7 @@ static CHANSERV_FUNC(cmd_giveownership) struct giveownership *giveownership; unsigned int force, override; unsigned short co_access, new_owner_old_access; - char reason[MAXLEN], transfer_reason[MAXLEN]; + char transfer_reason[MAXLEN]; REQUIRE_PARAMS(2); curr_user = GetChannelAccess(cData, user->handle_info); @@ -6371,6 +6493,10 @@ static CHANSERV_FUNC(cmd_giveownership) reply("CSMSG_TRANSFER_WAIT", delay, channel->name); return 0; } + if (!curr_user) { + reply("CSMSG_NO_OWNER", channel->name); + return 0; + } if(!(new_owner_hi = modcmd_get_handle_info(user, argv[1]))) return 0; if(new_owner_hi == user->handle_info) @@ -6433,8 +6559,8 @@ static CHANSERV_FUNC(cmd_giveownership) channel->channel_info->giveownership = giveownership; reply("CSMSG_OWNERSHIP_GIVEN", channel->name, new_owner_hi->handle); - sprintf(reason, "%s ownership transferred to %s by %s.", channel->name, new_owner_hi->handle, user->handle_info->handle); - global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason); + global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_OWNERSHIP_TRANSFERRED", + channel->name, new_owner_hi->handle, user->handle_info->handle); return 1; } @@ -6917,6 +7043,19 @@ static CHANSERV_FUNC(cmd_calc) return 1; } +static CHANSERV_FUNC(cmd_reply) +{ + + REQUIRE_PARAMS(2); + unsplit_string(argv + 1, argc - 1, NULL); + + if(channel) + send_channel_message(channel, cmd->parent->bot, "$b%s$b: %s", user->nick, unsplit_string(argv + 1, argc - 1, NULL)); + else + send_message_type(4, user, cmd->parent->bot, "%s", unsplit_string(argv + 1, argc - 1, NULL)); + return 1; +} + static void chanserv_adjust_limit(void *data) { @@ -6959,6 +7098,64 @@ handle_new_channel(struct chanNode *channel) SetChannelTopic(channel, chanserv, chanserv, channel->channel_info->topic, 1); } +int +check_bans(struct userNode *user, const char *channel) +{ + struct chanNode *chan; + struct mod_chanmode change; + struct chanData *cData; + struct banData *bData; + + if (!(chan = GetChannel(channel))) + return 0; + + if(!(cData = chan->channel_info)) + return 0; + + mod_chanmode_init(&change); + change.argc = 1; + + if(chan->banlist.used < MAXBANS) + { + /* Not joining through a ban. */ + for(bData = cData->bans; + bData && !user_matches_glob(user, bData->mask, MATCH_USENICK); + bData = bData->next); + + if(bData) + { + char kick_reason[MAXLEN]; + sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason); + + bData->triggered = now; + if(bData != cData->bans) + { + /* Shuffle the ban to the head of the list. */ + if(bData->next) + bData->next->prev = bData->prev; + if(bData->prev) + bData->prev->next = bData->next; + + bData->prev = NULL; + bData->next = cData->bans; + + if(cData->bans) + cData->bans->prev = bData; + + cData->bans = bData; + } + + change.args[0].mode = MODE_BAN; + change.args[0].u.hostmask = bData->mask; + mod_chanmode_announce(chanserv, chan, &change); + KickChannelUser(user, chan, chanserv, kick_reason); + return 1; + } + } + return 0; +} + + /* Welcome to my worst nightmare. Warning: Read (or modify) the code below at your own risk. */ static int @@ -7007,42 +7204,58 @@ handle_join(struct modeNode *mNode) } #endif + if(user->handle_info) + { + handle = user->handle_info; + if(handle) + { + uData = GetTrueChannelAccess(cData, handle); + } + } + + mod_chanmode_init(&change); change.argc = 1; - if(channel->banlist.used < MAXBANS) - { - /* Not joining through a ban. */ - for(bData = cData->bans; - bData && !user_matches_glob(user, bData->mask, MATCH_USENICK); - bData = bData->next); - if(bData) + /* TODO: maybe only people above inviteme level? -Rubin */ + /* We don't kick people with access */ + if(!uData) + { + if(channel->banlist.used < MAXBANS) { - char kick_reason[MAXLEN]; - sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason); + /* Not joining through a ban. */ + for(bData = cData->bans; + bData && !user_matches_glob(user, bData->mask, MATCH_USENICK); + bData = bData->next); - bData->triggered = now; - if(bData != cData->bans) + if(bData) { - /* Shuffle the ban to the head of the list. */ - if(bData->next) - bData->next->prev = bData->prev; - if(bData->prev) - bData->prev->next = bData->next; + char kick_reason[MAXLEN]; + sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason); - bData->prev = NULL; - bData->next = cData->bans; + bData->triggered = now; + if(bData != cData->bans) + { + /* Shuffle the ban to the head of the list. */ + if(bData->next) + bData->next->prev = bData->prev; + if(bData->prev) + bData->prev->next = bData->next; + + bData->prev = NULL; + bData->next = cData->bans; + + if(cData->bans) + cData->bans->prev = bData; + cData->bans = bData; + } - if(cData->bans) - cData->bans->prev = bData; - cData->bans = bData; + change.args[0].mode = MODE_BAN; + change.args[0].u.hostmask = bData->mask; + mod_chanmode_announce(chanserv, channel, &change); + KickChannelUser(user, channel, chanserv, kick_reason); + return 1; } - - change.args[0].mode = MODE_BAN; - change.args[0].u.hostmask = bData->mask; - mod_chanmode_announce(chanserv, channel, &change); - KickChannelUser(user, channel, chanserv, kick_reason); - return 1; } } @@ -7077,7 +7290,7 @@ handle_join(struct modeNode *mNode) greeting = cData->greeting; if(user->handle_info) { - handle = user->handle_info; +/* handle = user->handle_info; */ if(IsHelper(user) && !IsHelping(user)) { @@ -7092,13 +7305,17 @@ handle_join(struct modeNode *mNode) } } - uData = GetTrueChannelAccess(cData, handle); +/* uData = GetTrueChannelAccess(cData, handle); */ if(uData && !IsUserSuspended(uData)) { /* non users getting automodes are handled above. */ if(IsUserAutoOp(uData) && cData->chOpts[chAutomode] != 'n') { - if(uData->access >= UL_OP ) + /* just op everyone with access */ + if(uData->access >= UL_PEON && cData->chOpts[chAutomode] == 'l') + modes |= MODE_VOICE; + /* or do their access level */ + else if(uData->access >= UL_OP ) modes |= MODE_CHANOP; else if(uData->access >= UL_HALFOP ) modes |= MODE_HALFOP; @@ -7144,6 +7361,34 @@ handle_join(struct modeNode *mNode) return 0; } +static void +chanserv_autojoin_channels(struct userNode *user) +{ + struct userData *channel; + + for(channel = user->handle_info->channels; channel; channel = channel->u_next) + { + struct chanNode *cn; + struct modeNode *mn; + + if(IsUserSuspended(channel) + || IsSuspended(channel->channel) + || !(cn = channel->channel->channel)) + continue; + + mn = GetUserMode(cn, user); + if(!mn) + { + if(!IsUserSuspended(channel) + && IsUserAutoJoin(channel) + && (channel->access >= channel->channel->lvlOpts[lvlInviteMe]) + && !self->burst + && !user->uplink->burst) + irc_svsjoin(chanserv, user, cn); + } + } +} + static void handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) { @@ -7159,12 +7404,14 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) for(channel = user->handle_info->channels; channel; channel = channel->u_next) { struct chanNode *cn; + struct chanData *cData; struct modeNode *mn; if(IsUserSuspended(channel) || IsSuspended(channel->channel) || !(cn = channel->channel->channel)) continue; + cData = cn->channel_info; mn = GetUserMode(cn, user); if(!mn) { @@ -7180,7 +7427,7 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) if(channel->access >= UL_PRESENT) channel->channel->visited = now; - if(IsUserAutoOp(channel)) + if(IsUserAutoOp(channel) && cData->chOpts[chAutomode] != 'n') { if(channel->access >= UL_OP ) change.args[0].mode = MODE_CHANOP; @@ -7208,6 +7455,8 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) || !channel->channel_info || IsSuspended(channel->channel_info)) continue; + if(protect_user(user, chanserv, channel->channel_info, true)) + continue; for(jj = 0; jj < channel->banlist.used; ++jj) if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK)) break; @@ -7248,6 +7497,11 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) if (user->handle_info->epithet) irc_swhois(chanserv, user, user->handle_info->epithet); + + /* process autojoin channels 5 seconds later as this sometimes + happens before autohide */ +// timeq_add(now + 5, chanserv_autojoin_channels, user); + chanserv_autojoin_channels(user); } static void @@ -7303,7 +7557,7 @@ handle_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *c || (kicker->handle_info && kicker->handle_info == victim->handle_info)) return; - if(protect_user(victim, kicker, channel->channel_info)) + if(protect_user(victim, kicker, channel->channel_info, false)) { const char *reason = user_find_message(kicker, "CSMSG_USER_PROTECTED_KICK"); KickChannelUser(kicker, channel, chanserv, reason); @@ -7379,7 +7633,7 @@ handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_ch if((change->args[ii].mode & (MODE_REMOVE|MODE_CHANOP)) == (MODE_REMOVE|MODE_CHANOP)) { const struct userNode *victim = change->args[ii].u.member->user; - if(!protect_user(victim, user, channel->channel_info)) + if(!protect_user(victim, user, channel->channel_info, false)) continue; if(!bounce) bounce = mod_chanmode_alloc(change->argc + 1 - ii); @@ -7449,7 +7703,7 @@ handle_nick_change(struct userNode *user, UNUSED_ARG(const char *old_nick)) /* Need not check for bans if they're opped or voiced. */ /* TODO: does this make sense in automode v, h, and o? * * lets still enforce on voice people anyway, and see how that goes -Rubin */ - if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP /*|MODE_VOICE */)) + if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE )) continue; /* Need not check for bans unless channel registration is active. */ if(!channel->channel_info || IsSuspended(channel->channel_info)) @@ -7461,6 +7715,9 @@ handle_nick_change(struct userNode *user, UNUSED_ARG(const char *old_nick)) /* Need not act if we found one. */ if(jj < channel->banlist.used) continue; + /* don't kick someone on the userlist */ + if(protect_user(user, chanserv, channel->channel_info, true)) + continue; /* Look for a matching ban in this channel. */ for(bData = channel->channel_info->bans; bData; bData = bData->next) { @@ -8479,6 +8736,8 @@ init_chanserv(const char *nick) DEFINE_COMMAND(mdelpeon, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL); DEFINE_COMMAND(mdelhalfop, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL); + DEFINE_COMMAND(levels, 1, 0, NULL); + DEFINE_COMMAND(trim, 3, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL); DEFINE_COMMAND(opchan, 1, MODCMD_REQUIRE_REGCHAN|MODCMD_NEVER_CSUSPEND, "access", "1", NULL); DEFINE_COMMAND(clvl, 3, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL); @@ -8558,6 +8817,7 @@ init_chanserv(const char *nick) DEFINE_COMMAND(d, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL); DEFINE_COMMAND(huggle, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL); DEFINE_COMMAND(calc, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL); + DEFINE_COMMAND(reply, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL); /* Channel options */ DEFINE_CHANNEL_OPTION(defaulttopic); @@ -8592,6 +8852,7 @@ init_chanserv(const char *nick) /* User options */ DEFINE_USER_OPTION(autoinvite); + DEFINE_USER_OPTION(autojoin); DEFINE_USER_OPTION(info); DEFINE_USER_OPTION(autoop);