#define KEY_FLAGS "flags"
#define KEY_OPTIONS "options"
#define KEY_USERS "users"
-#define KEY_BANS "bans"
+#define KEY_BANS "bans" /* for lamers */
#define KEY_MAX "max"
#define KEY_NOTES "notes"
#define KEY_TOPIC_MASK "topic_mask"
{ "CSMSG_REG_SUCCESS", "You now have ownership of $b%s$b." },
{ "CSMSG_PROXY_SUCCESS", "%s now has ownership of $b%s$b." },
{ "CSMSG_ALREADY_REGGED", "$b%s$b is registered to someone else." },
- { "CSMSG_MUST_BE_OPPED", "You must be a channel operator in $b%s$b to register it." },
+ { "CSMSG_MUST_BE_OPPED", "You must be a channel operator (+o) in $b%s$b to register it." },
{ "CSMSG_PROXY_FORBIDDEN", "You may not register a channel for someone else." },
- { "CSMSG_OWN_TOO_MANY", "%s already owns enough channels (at least %d); use FORCE to override." },
+ { "CSMSG_OWN_TOO_MANY", "%s already owns more than the limit of %d channels. Use FORCE to override." },
+ { "CSMSG_YOU_OWN_TOO_MANY", "You already own more than the limit of %d channels. Ask a staff member for help." },
+ { "CSMSG_ANOTHER_SERVICE", "Another service bot is in that channel already. Ask a staff member for help." },
/* Do-not-register channels */
{ "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." },
{ "CSMSG_NO_CHAN_USER", "%s lacks access to $b%s$b." },
{ "CSMSG_NO_ACCESS", "You lack sufficient access to use this command." },
{ "CSMSG_NOT_REGISTERED", "$b%s$b has not been registered with $b$C$b." },
- { "CSMSG_MAXIMUM_BANS", "This channel has reached the ban count limit of $b%d$b." },
+ { "CSMSG_MAXIMUM_LAMERS", "This channel has reached the lamer count limit of $b%d$b." },
{ "CSMSG_MAXIMUM_USERS", "This channel has reached the user count limit of $b%d$b." },
{ "CSMSG_ILLEGAL_CHANNEL", "$b%s$b is an illegal channel, and cannot be registered." },
{ "CSMSG_GODMODE_UP", "You may not use $b%s$b to op yourself unless you are on the user list. Use the $bop$b command instead." },
{ "CSMSG_TRIMMED_USERS", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s." },
{ "CSMSG_INCORRECT_ACCESS", "%s has access $b%s$b, not %s." },
{ "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with %s access)." },
- { "CSMSG_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, i will finish adding them automatically." },
+ { "CSMSG_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, I will finish adding them automatically." },
{ "CSMSG_ADDUSER_PENDING_ALREADY", "He or she is already pending addition to %s once he/she auths with $b$N$b." },
- { "CSMSG_ADDUSER_PENDING_LIST", "Channel %s user %s" }, /* Remove after testing */
+ { "CSMSG_ADDUSER_PENDING_HEADER", "Users to add to channels pending logins:" }, /* Remove after testing? */
+ { "CSMSG_ADDUSER_PENDING_LIST", "Channel %s user %s" }, /* Remove after testing? */
+ { "CSMSG_ADDUSER_PENDING_FOOTER", "--------- End of pending list ----------" }, /* Remove after testing? */
/*{ "CSMSG_ADDUSER_PENDING_NOTINCHAN", "That user is not in %s, and is not auth'd." }, */
- { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here, %s would like to add you to my userlist in channel %s, but you are not auth'd to $b$N$b. Please auth now, and you will be added. If you do not have an accont, type /msg $N help register" },
+ { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here: %s would like to add you to my userlist in channel %s, but you are not authenticated to $b$N$b. Please authenticate now and you will be added. If you do not have an account, type /msg $N help register" },
{ "CSMSG_CANNOT_TRIM", "You must include a minimum inactivity duration of at least 60 seconds to trim." },
{ "CSMSG_NO_SELF_CLVL", "You cannot change your own access." },
{ "CSMSG_OWNERSHIP_GIVEN", "Ownership of $b%s$b has been transferred to account $b%s$b." },
/* Ban management */
- { "CSMSG_BAN_ADDED", "Permanently banned $b%s$b from %s." },
- { "CSMSG_TIMED_BAN_ADDED", "Banned $b%s$b from %s for %s." },
+ { "CSMSG_LAMER_ADDED", "Added $b%s$b to %s LAMERs." },
+ { "CSMSG_TIMED_LAMER_ADDED", "LAMERed $b%s$b on %s for %s." },
{ "CSMSG_KICK_BAN_DONE", "Kickbanned $b%s$b from %s." },
{ "CSMSG_BAN_DONE", "Banned $b%s$b from %s." },
- { "CSMSG_REASON_CHANGE", "Reason for ban $b%s$b changed." },
- { "CSMSG_BAN_EXTENDED", "Extended ban for $b%s$b expires in %s." },
- { "CSMSG_BAN_REMOVED", "Matching ban(s) for $b%s$b removed." },
- { "CSMSG_TRIMMED_BANS", "Trimmed $b%d bans$b from the %s ban list that were inactive for at least %s." },
+ { "CSMSG_REASON_CHANGE", "Reason for LAMER $b%s$b changed." },
+ { "CSMSG_LAMER_EXTENDED", "Extended LAMER for $b%s$b, now expires in %s." },
+ { "CSMSG_BAN_REMOVED", "Matching ban(s) and LAMER(s) in $b%s$b were removed." },
+ { "CSMSG_TRIMMED_LAMERS", "Trimmed $b%d LAMERs$b from the %s LAMER list that were inactive for at least %s." },
{ "CSMSG_REDUNDANT_BAN", "$b%s$b is already banned in %s." },
+ { "CSMSG_REDUNDANT_LAMER", "$b%s$b is already LAMER'd in %s." },
{ "CSMSG_DURATION_TOO_LOW", "Timed bans must last for at least 15 seconds." },
{ "CSMSG_DURATION_TOO_HIGH", "Timed bans must last for less than 2 years." },
{ "CSMSG_LAME_MASK", "$b%s$b is a little too general. Try making it more specific." },
{ "CSMSG_MASK_PROTECTED", "Sorry, ban for $b%s$b conflicts with a protected user's hostmask." },
{ "CSMSG_NO_MATCHING_USERS", "No one in $b%s$b has a hostmask matching $b%s$b." },
- { "CSMSG_BAN_NOT_FOUND", "Sorry, no ban found for $b%s$b." },
+ { "CSMSG_BAN_NOT_FOUND", "Sorry, no ban or LAMER found: $b%s$b." },
{ "CSMSG_BANLIST_FULL", "The $b%s$b channel ban list is $bfull$b." },
{ "CSMSG_INVALID_TRIM", "$b%s$b isn't a valid trim target." },
{ "CSMSG_BAD_INFOLINE", "You may not use the character \\%03o in your infoline." },
{ "CSMSG_KICK_DONE", "Kicked $b%s$b from %s." },
- { "CSMSG_NO_BANS", "No channel bans found on $b%s$b." },
+ { "CSMSG_NO_BANS", "No bans found on $b%s$b." },
{ "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." },
/* Channel userlist */
{ "CSMSG_ACCESS_SEARCH_HEADER", "$b%s Users From Level %s To %s Matching %s$b" },
{ "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." },
{ "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b (%u) in %s." },
- { "CSMSG_BANS_HEADER", "$bBans in %s$b" },
+ { "CSMSG_LAMERS_HEADER", "$bLamers in %s$b" },
/* Channel note list */
{ "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" },
{ "CSMSG_CHANNEL_MODES", "$bMode Lock: $b%s" },
{ "CSMSG_CHANNEL_NOTE", "$b%s:%*s$b%s" },
{ "CSMSG_CHANNEL_MAX", "$bRecord Visitors: $b%i" },
- { "CSMSG_CHANNEL_OWNER", "$bOwner: $b%s" },
- { "CSMSG_CHANNEL_BANS", "$bBan Count: $b%i" },
+ { "CSMSG_CHANNEL_OWNER", "$bOwner: $b%s" },
+ { "CSMSG_CHANNEL_LAMERS", "$bLamer Count: $b%i" },
{ "CSMSG_CHANNEL_USERS", "$bTotal User Count: $b%i" },
{ "CSMSG_CHANNEL_REGISTRAR", "$bRegistrar: $b%s" },
{ "CSMSG_CHANNEL_SUSPENDED", "$b%s$b is suspended:" },
{ "CSMSG_NETWORK_INFO", "Network Information:" },
{ "CSMSG_NETWORK_SERVERS", "$bServers: $b%i" },
{ "CSMSG_NETWORK_USERS", "$bTotal Users: $b%i" },
- { "CSMSG_NETWORK_BANS", "$bTotal Ban Count: $b%i" },
+ { "CSMSG_NETWORK_LAMERS", "$bTotal Lamer Count: $b%i" },
{ "CSMSG_NETWORK_CHANUSERS", "$bTotal User Count: $b%i" },
{ "CSMSG_NETWORK_OPERS", "$bIRC Operators: $b%i" },
{ "CSMSG_NETWORK_CHANNELS","$bRegistered Channels: $b%i" },
/* eject_user and unban_user flags */
#define ACTION_KICK 0x0001
#define ACTION_BAN 0x0002
-#define ACTION_ADD_BAN 0x0004
-#define ACTION_ADD_TIMED_BAN 0x0008
+#define ACTION_ADD_LAMER 0x0004
+#define ACTION_ADD_TIMED_LAMER 0x0008
#define ACTION_UNBAN 0x0010
-#define ACTION_DEL_BAN 0x0020
+#define ACTION_DEL_LAMER 0x0020
/* The 40 allows for [+-ntlksimprD] and lots of fudge factor. */
#define MODELEN 40 + KEYLEN
unsigned int max_owned;
unsigned int max_chan_users;
- unsigned int max_chan_bans;
+ unsigned int max_chan_bans; /* lamers */
unsigned int max_userinfo_length;
struct string_list *set_shows;
eflags |= ACTION_BAN;
break;
case 't':
- eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
+ eflags |= ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER;
argv[argc++] = (char*)chanserv_conf.ctcp_short_ban_duration;
break;
case 'T':
- eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
+ eflags |= ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER;
argv[argc++] = (char*)chanserv_conf.ctcp_long_ban_duration;
break;
}
process_adduser_pending(struct userNode *user)
{
struct adduserPending *ap;
+ if(!user->handle_info)
+ return; /* not associated with an account */
while((ap = find_adduser_pending(NULL, user)))
{
struct userData *actee;
- actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
- scan_user_presence(actee, NULL);
+ if(GetTrueChannelAccess(ap->channel->channel_info, ap->user->handle_info))
+ {
+ /* Already on the userlist. do nothing*/
+ }
+ else
+ {
+ actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
+ scan_user_presence(actee, NULL);
+ }
del_adduser_pending(ap);
}
}
timeq_add(expires, expire_ban, bd);
bd->prev = NULL;
- bd->next = channel->bans;
+ bd->next = channel->bans; /* lamers */
if(channel->bans)
channel->bans->prev = bd;
channel->bans = bd;
}
static void
-expire_ban(void *data)
+expire_ban(void *data) /* lamer.. */
{
struct banData *bd = data;
if(!IsSuspended(bd->channel))
up:
- Channel information.
- Channel users.
- - Channel bans.
+ - Channel bans. (lamers)
- Channel suspension data.
- adduser_pending data.
- Timeq entries. (Except timed bans, which are handled elsewhere.)
char *chan_name;
unsigned int new_channel, force=0;
struct do_not_register *dnr;
+ unsigned int n;
+
if(channel)
{
return 0;
}
- if(!IsHelping(user)
- && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP)))
+ if(!IsHelping(user) && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP)))
{
reply("CSMSG_MUST_BE_OPPED", channel->name);
return 0;
return 0;
force = (argc > (new_channel+2)) && !irccasecmp(argv[new_channel+2], "force");
dnr = chanserv_is_dnr(chan_name, handle);
+
+ /* Check if they are over the limit.. */
+ if((chanserv_get_owned_count(handle) >= chanserv_conf.max_owned) && !force)
+ {
+ reply("CSMSG_OWN_TOO_MANY", handle->handle, chanserv_conf.max_owned);
+ return 0;
+ }
+
}
else
{
- handle = user->handle_info;
+ handle = user->handle_info;
dnr = chanserv_is_dnr(chan_name, handle);
+ /* Check if they are over the limit.. */
+ if((chanserv_get_owned_count(handle) >= chanserv_conf.max_owned) && !force)
+ {
+ reply("CSMSG_YOU_OWN_TOO_MANY", chanserv_conf.max_owned);
+ return 0;
+ }
+ /* Check if another service is in the channel */
+ if(channel)
+ for(n = 0; n < channel->members.used; n++)
+ {
+ mn = channel->members.list[n];
+ if((mn && mn->user && (mn->user->modes & FLAGS_SERVICE)) || IsLocal(mn->user))
+ {
+ reply("CSMSG_ANOTHER_SERVICE");
+ return 0;
+ }
+ }
}
if(dnr && !force)
{
return 0;
}
+ /* now handled above for message specilization *
if((chanserv_get_owned_count(handle) >= chanserv_conf.max_owned) && !force)
{
reply("CSMSG_OWN_TOO_MANY", handle->handle, chanserv_conf.max_owned);
return 0;
}
+ */
if(new_channel)
channel = AddChannel(argv[1], now, NULL, NULL, NULL);
}
+/* trim_lamers.. */
static int
cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long duration)
{
}
intervalString(interval, duration, user->handle_info);
- send_message(user, chanserv, "CSMSG_TRIMMED_BANS", count, channel->name, interval);
+ send_message(user, chanserv, "CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
return 1;
}
return 0;
}
- if(!irccasecmp(argv[1], "bans"))
+ if(!irccasecmp(argv[1], "lamers"))
{
- cmd_trim_bans(user, channel, duration);
+ cmd_trim_bans(user, channel, duration); /* trim_lamers.. */
return 1;
}
else if(!irccasecmp(argv[1], "users"))
char *reason = "Bye.", *ban, *name;
char interval[INTERVALLEN];
- offset = (action & ACTION_ADD_TIMED_BAN) ? 3 : 2;
+ offset = (action & ACTION_ADD_TIMED_LAMER) ? 3 : 2;
REQUIRE_PARAMS(offset);
if(argc > offset)
{
that 'ban' is a valid ban mask before sanitizing it. */
sanitize_ircmask(ban);
- if(action & ACTION_ADD_BAN)
+ if(action & ACTION_ADD_LAMER)
{
struct banData *bData, *next;
- if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans)
+ if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans) /* ..lamers.. */
{
- reply("CSMSG_MAXIMUM_BANS", chanserv_conf.max_chan_bans);
+ reply("CSMSG_MAXIMUM_LAMERS", chanserv_conf.max_chan_bans); /* ..lamers.. */
free(ban);
return 0;
}
- if(action & ACTION_ADD_TIMED_BAN)
+ if(action & ACTION_ADD_TIMED_LAMER)
{
duration = ParseInterval(argv[2]);
}
}
+ /* lamers... */
for(bData = channel->channel_info->bans; bData; bData = next)
{
if(match_ircglobs(bData->mask, ban))
/* automated kickban */
}
else if(duration)
- reply("CSMSG_BAN_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
+ reply("CSMSG_LAMER_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
else
- reply("CSMSG_BAN_ADDED", name, channel->name);
+ reply("CSMSG_LAMER_ADDED", name, channel->name);
goto post_add_ban;
}
}
if(cmd)
- reply("CSMSG_REDUNDANT_BAN", name, channel->name);
+ reply("CSMSG_REDUNDANT_LAMER", name, channel->name);
free(ban);
return 0;
{
/* No response, since it was automated. */
}
- else if(action & ACTION_ADD_BAN)
+ else if(action & ACTION_ADD_LAMER)
{
if(duration)
- reply("CSMSG_TIMED_BAN_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
+ reply("CSMSG_TIMED_LAMER_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
else
- reply("CSMSG_BAN_ADDED", name, channel->name);
+ reply("CSMSG_LAMER_ADDED", name, channel->name);
}
else if((action & (ACTION_BAN | ACTION_KICK)) == (ACTION_BAN | ACTION_KICK))
reply("CSMSG_KICK_BAN_DONE", name, channel->name);
return eject_user(CSFUNC_ARGS, ACTION_BAN);
}
-static CHANSERV_FUNC(cmd_addban)
+static CHANSERV_FUNC(cmd_addlamer)
{
- return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_BAN);
+ return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_LAMER);
}
-static CHANSERV_FUNC(cmd_addtimedban)
+static CHANSERV_FUNC(cmd_addtimedlamer)
{
- return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN);
+ return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER);
}
static struct mod_chanmode *
}
}
- if(action & ACTION_DEL_BAN)
+ if(action & ACTION_DEL_LAMER)
{
struct banData *ban, *next;
- ban = channel->channel_info->bans;
+ ban = channel->channel_info->bans; /* lamers */
while(ban)
{
if(actee)
return unban_user(CSFUNC_ARGS, ACTION_UNBAN);
}
-static CHANSERV_FUNC(cmd_delban)
+static CHANSERV_FUNC(cmd_dellamer)
{
/* it doesn't necessarily have to remove the channel ban - may want
to make that an option. */
- return unban_user(CSFUNC_ARGS, ACTION_UNBAN | ACTION_DEL_BAN);
+ return unban_user(CSFUNC_ARGS, ACTION_UNBAN | ACTION_DEL_LAMER);
}
static CHANSERV_FUNC(cmd_unbanme)
/* remove permanent bans if the user has the proper access. */
if(uData->access >= UL_MANAGER)
- flags |= ACTION_DEL_BAN;
+ flags |= ACTION_DEL_LAMER;
argv[1] = user->nick;
return unban_user(user, channel, 2, argv, cmd, flags);
return 1;
}
+/* Remove this now that debugging is over? or improve it for
+ * users? Would it be better tied into USERS somehow? -Rubin */
static CHANSERV_FUNC(cmd_pending)
{
struct adduserPending *ap;
+ reply("CSMSG_ADDUSER_PENDING_HEADER");
+ reply("CSMSG_BAR");
for(ap = adduser_pendings;ap;ap = ap->next)
reply("CSMSG_ADDUSER_PENDING_LIST", ap->channel->name, ap->user->nick);
+ reply("CSMSG_ADDUSER_PENDING_FOOTER");
return 1;
}
return cmd_list_users(CSFUNC_ARGS, 1, UL_HALFOP-1);
}
-static CHANSERV_FUNC(cmd_bans)
+static CHANSERV_FUNC(cmd_lamers)
{
struct helpfile_table tbl;
unsigned int matches = 0, timed = 0, ii;
char t_buffer[INTERVALLEN], e_buffer[INTERVALLEN], *search;
const char *msg_never, *triggered, *expires;
- struct banData *ban, **bans;
+ struct banData *ban, **bans; /* lamers */
if(argc > 1)
search = argv[1];
else
search = NULL;
- reply("CSMSG_BANS_HEADER", channel->name);
- bans = alloca(channel->channel_info->banCount * sizeof(struct banData *));
+ reply("CSMSG_LAMERS_HEADER", channel->name);
+ bans = alloca(channel->channel_info->banCount * sizeof(struct banData *)); /* lamers */
+ /* lamers */
for(ban = channel->channel_info->bans; ban; ban = ban->next)
{
if(search && !match_ircglobs(search, ban->mask))
if(owner->access == UL_OWNER)
reply("CSMSG_CHANNEL_OWNER", owner->handle->handle);
reply("CSMSG_CHANNEL_USERS", cData->userCount);
- reply("CSMSG_CHANNEL_BANS", cData->banCount);
+ reply("CSMSG_CHANNEL_LAMERS", cData->banCount);
reply("CSMSG_CHANNEL_VISITED", intervalString(buffer, now - cData->visited, user->handle_info));
reply("CSMSG_CHANNEL_REGISTERED", intervalString(buffer, now - cData->registered, user->handle_info));
reply("CSMSG_NETWORK_USERS", dict_size(clients));
reply("CSMSG_NETWORK_OPERS", curr_opers.used);
reply("CSMSG_NETWORK_CHANNELS", registered_channels);
- reply("CSMSG_NETWORK_BANS", banCount);
+ reply("CSMSG_NETWORK_LAMERS", banCount);
reply("CSMSG_NETWORK_CHANUSERS", userCount);
reply("CSMSG_SERVICES_UPTIME", intervalString(interval, time(NULL) - boot_time, user->handle_info));
reply("CSMSG_BURST_LENGTH", intervalString(interval, burst_length, user->handle_info));
}
else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
{
- if(!(mn->modes & MODE_HALFOP))
+ if(mn->modes & MODE_CHANOP)
{
- changes->args[used].mode = MODE_HALFOP;
+ changes->args[used].mode = MODE_REMOVE | MODE_CHANOP;
changes->args[used++].u.member = mn;
}
- if(mn->modes & MODE_CHANOP)
+ if(!(mn->modes & MODE_HALFOP))
{
- changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+ changes->args[used].mode = MODE_HALFOP;
changes->args[used++].u.member = mn;
}
+ /* why cant halfops keep voice
if(mn->modes & MODE_VOICE)
{
changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
changes->args[used++].u.member = mn;
}
+ */
}
else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/)
{
if(mn->modes & MODE_CHANOP)
{
- changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
+ changes->args[used].mode = MODE_REMOVE | MODE_CHANOP;
changes->args[used++].u.member = mn;
}
if(mn->modes & MODE_HALFOP)
{
- changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
+ changes->args[used].mode = MODE_REMOVE | MODE_HALFOP;
changes->args[used++].u.member = mn;
}
if(!(mn->modes & MODE_VOICE))
dict_set_free_data(plain_dnrs, free);
mask_dnrs = dict_new();
dict_set_free_data(mask_dnrs, free);
- //TODO
- //adduser_pending
reg_svccmd_unbind_func(handle_svccmd_unbind);
chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable);
DEFINE_COMMAND(voice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
DEFINE_COMMAND(devoice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
- DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
- DEFINE_COMMAND(kick, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
- DEFINE_COMMAND(ban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
- DEFINE_COMMAND(unban, 2, 0, "template", "op", NULL);
- DEFINE_COMMAND(unbanall, 1, 0, "template", "op", NULL);
- DEFINE_COMMAND(unbanme, 1, MODCMD_REQUIRE_CHANUSER, "template", "op", NULL);
+ DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+ DEFINE_COMMAND(kick, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+ DEFINE_COMMAND(ban, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+ DEFINE_COMMAND(unban, 2, 0, "template", "hop", NULL);
+ DEFINE_COMMAND(unbanall, 1, 0, "template", "hop", NULL);
+ DEFINE_COMMAND(unbanme, 1, MODCMD_REQUIRE_CHANUSER, "template", "hop", NULL);
DEFINE_COMMAND(open, 1, MODCMD_REQUIRE_CHANUSER, "template", "op", NULL);
- DEFINE_COMMAND(topic, 1, MODCMD_REQUIRE_REGCHAN, "template", "op", "flags", "+never_csuspend", NULL);
+ DEFINE_COMMAND(topic, 1, MODCMD_REQUIRE_REGCHAN, "template", "hop", "flags", "+never_csuspend", NULL);
DEFINE_COMMAND(mode, 1, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
DEFINE_COMMAND(inviteme, 1, MODCMD_REQUIRE_CHANNEL, "access", "1", NULL);
DEFINE_COMMAND(invite, 1, MODCMD_REQUIRE_CHANNEL, "access", "manager", NULL);
DEFINE_COMMAND(wipeinfo, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(resync, 1, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
- DEFINE_COMMAND(events, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog", "access", "350", NULL);
- DEFINE_COMMAND(addban, 2, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
- DEFINE_COMMAND(addtimedban, 3, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
- DEFINE_COMMAND(delban, 2, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
+ DEFINE_COMMAND(events, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog", "access", "manager", NULL);
+ DEFINE_COMMAND(addlamer, 2, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
+ DEFINE_COMMAND(addtimedlamer, 3, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
+
+ /* if you change dellamer access, see also places
+ * like unbanme which have manager hardcoded. */
+ DEFINE_COMMAND(dellamer, 2, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
DEFINE_COMMAND(uset, 1, MODCMD_REQUIRE_CHANUSER, "access", "1", NULL);
- DEFINE_COMMAND(bans, 1, MODCMD_REQUIRE_REGCHAN, "access", "1", "flags", "+nolog", NULL);
+ DEFINE_COMMAND(lamers, 1, MODCMD_REQUIRE_REGCHAN, "access", "1", "flags", "+nolog", NULL);
+
DEFINE_COMMAND(peek, 1, MODCMD_REQUIRE_REGCHAN, "access", "op", "flags", "+nolog", NULL);
DEFINE_COMMAND(myaccess, 1, MODCMD_REQUIRE_AUTHED, NULL);
projects / irc / evilnet / x3.git / blobdiff