/* chanserv.c - Channel service bot
- * Copyright 2000-2004 srvx Development Team
+ * Copyright 2000-2006 srvx Development Team
*
* This file is part of srvx.
*
#include "saxdb.h"
#include "timeq.h"
-#define CHANSERV_CONF_NAME "services/chanserv"
+#define CHANSERV_CONF_NAME "services/chanserv"
/* ChanServ options */
-#define KEY_SUPPORT_CHANNEL "support_channel"
-#define KEY_SUPPORT_CHANNEL_MODES "support_channel_modes"
-#define KEY_DB_BACKUP_FREQ "db_backup_freq"
-#define KEY_INFO_DELAY "info_delay"
-#define KEY_MAX_GREETLEN "max_greetlen"
-#define KEY_ADJUST_THRESHOLD "adjust_threshold"
-#define KEY_ADJUST_DELAY "adjust_delay"
-#define KEY_CHAN_EXPIRE_FREQ "chan_expire_freq"
-#define KEY_CHAN_EXPIRE_DELAY "chan_expire_delay"
-#define KEY_MAX_CHAN_USERS "max_chan_users"
-#define KEY_MAX_CHAN_BANS "max_chan_bans"
-#define KEY_NICK "nick"
-#define KEY_OLD_CHANSERV_NAME "old_chanserv_name"
-#define KEY_8BALL_RESPONSES "8ball"
-#define KEY_OLD_BAN_NAMES "old_ban_names"
-#define KEY_REFRESH_PERIOD "refresh_period"
+#define KEY_SUPPORT_CHANNEL "support_channel"
+#define KEY_SUPPORT_CHANNEL_MODES "support_channel_modes"
+#define KEY_DB_BACKUP_FREQ "db_backup_freq"
+#define KEY_INFO_DELAY "info_delay"
+#define KEY_MAX_GREETLEN "max_greetlen"
+#define KEY_ADJUST_THRESHOLD "adjust_threshold"
+#define KEY_ADJUST_DELAY "adjust_delay"
+#define KEY_CHAN_EXPIRE_FREQ "chan_expire_freq"
+#define KEY_CHAN_EXPIRE_DELAY "chan_expire_delay"
+#define KEY_DNR_EXPIRE_FREQ "dnr_expire_freq"
+#define KEY_MAX_CHAN_USERS "max_chan_users"
+#define KEY_MAX_CHAN_BANS "max_chan_bans"
+#define KEY_NICK "nick"
+#define KEY_OLD_CHANSERV_NAME "old_chanserv_name"
+#define KEY_8BALL_RESPONSES "8ball"
+#define KEY_OLD_BAN_NAMES "old_ban_names"
+#define KEY_REFRESH_PERIOD "refresh_period"
#define KEY_CTCP_SHORT_BAN_DURATION "ctcp_short_ban_duration"
#define KEY_CTCP_LONG_BAN_DURATION "ctcp_long_ban_duration"
#define KEY_MAX_OWNED "max_owned"
#define KEY_IRC_OPERATOR_EPITHET "irc_operator_epithet"
#define KEY_NETWORK_HELPER_EPITHET "network_helper_epithet"
#define KEY_SUPPORT_HELPER_EPITHET "support_helper_epithet"
-#define KEY_NODELETE_LEVEL "nodelete_level"
-#define KEY_MAX_USERINFO_LENGTH "max_userinfo_length"
-#define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout"
+#define KEY_NODELETE_LEVEL "nodelete_level"
+#define KEY_MAX_USERINFO_LENGTH "max_userinfo_length"
+#define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout"
/* ChanServ database */
-#define KEY_CHANNELS "channels"
-#define KEY_NOTE_TYPES "note_types"
+#define KEY_CHANNELS "channels"
+#define KEY_NOTE_TYPES "note_types"
/* Note type parameters */
-#define KEY_NOTE_OPSERV_ACCESS "opserv_access"
-#define KEY_NOTE_CHANNEL_ACCESS "channel_access"
-#define KEY_NOTE_SETTER_ACCESS "setter_access"
-#define KEY_NOTE_VISIBILITY "visibility"
-#define KEY_NOTE_VIS_PRIVILEGED "privileged"
-#define KEY_NOTE_VIS_CHANNEL_USERS "channel_users"
-#define KEY_NOTE_VIS_ALL "all"
-#define KEY_NOTE_MAX_LENGTH "max_length"
-#define KEY_NOTE_SETTER "setter"
-#define KEY_NOTE_NOTE "note"
+#define KEY_NOTE_OPSERV_ACCESS "opserv_access"
+#define KEY_NOTE_CHANNEL_ACCESS "channel_access"
+#define KEY_NOTE_SETTER_ACCESS "setter_access"
+#define KEY_NOTE_VISIBILITY "visibility"
+#define KEY_NOTE_VIS_PRIVILEGED "privileged"
+#define KEY_NOTE_VIS_CHANNEL_USERS "channel_users"
+#define KEY_NOTE_VIS_ALL "all"
+#define KEY_NOTE_MAX_LENGTH "max_length"
+#define KEY_NOTE_SETTER "setter"
+#define KEY_NOTE_NOTE "note"
/* Do-not-register channels */
-#define KEY_DNR "dnr"
-#define KEY_DNR_SET "set"
-#define KEY_DNR_SETTER "setter"
-#define KEY_DNR_REASON "reason"
+#define KEY_DNR "dnr"
+#define KEY_DNR_SET "set"
+#define KEY_DNR_SETTER "setter"
+#define KEY_DNR_REASON "reason"
/* Channel data */
-#define KEY_REGISTERED "registered"
-#define KEY_REGISTRAR "registrar"
-#define KEY_SUSPENDED "suspended"
-#define KEY_PREVIOUS "previous"
-#define KEY_SUSPENDER "suspender"
-#define KEY_ISSUED "issued"
-#define KEY_REVOKED "revoked"
-#define KEY_SUSPEND_EXPIRES "suspend_expires"
-#define KEY_SUSPEND_REASON "suspend_reason"
-#define KEY_VISITED "visited"
-#define KEY_TOPIC "topic"
-#define KEY_GREETING "greeting"
-#define KEY_USER_GREETING "user_greeting"
-#define KEY_MODES "modes"
-#define KEY_FLAGS "flags"
-#define KEY_OPTIONS "options"
-#define KEY_USERS "users"
-#define KEY_BANS "bans"
-#define KEY_MAX "max"
-#define KEY_NOTES "notes"
-#define KEY_TOPIC_MASK "topic_mask"
-#define KEY_OWNER_TRANSFER "owner_transfer"
+#define KEY_REGISTERED "registered"
+#define KEY_REGISTRAR "registrar"
+#define KEY_SUSPENDED "suspended"
+#define KEY_PREVIOUS "previous"
+#define KEY_SUSPENDER "suspender"
+#define KEY_ISSUED "issued"
+#define KEY_REVOKED "revoked"
+#define KEY_SUSPEND_EXPIRES "suspend_expires"
+#define KEY_SUSPEND_REASON "suspend_reason"
+#define KEY_VISITED "visited"
+#define KEY_TOPIC "topic"
+#define KEY_GREETING "greeting"
+#define KEY_USER_GREETING "user_greeting"
+#define KEY_MODES "modes"
+#define KEY_FLAGS "flags"
+#define KEY_OPTIONS "options"
+#define KEY_USERS "users"
+#define KEY_BANS "bans"
+#define KEY_MAX "max"
+#define KEY_NOTES "notes"
+#define KEY_TOPIC_MASK "topic_mask"
+#define KEY_OWNER_TRANSFER "owner_transfer"
/* User data */
-#define KEY_LEVEL "level"
-#define KEY_INFO "info"
-#define KEY_SEEN "seen"
+#define KEY_LEVEL "level"
+#define KEY_INFO "info"
+#define KEY_SEEN "seen"
/* Ban data */
-#define KEY_OWNER "owner"
-#define KEY_REASON "reason"
-#define KEY_SET "set"
-#define KEY_DURATION "duration"
-#define KEY_EXPIRES "expires"
-#define KEY_TRIGGERED "triggered"
-
-#define CHANNEL_DEFAULT_FLAGS (CHANNEL_OFFCHANNEL)
+#define KEY_OWNER "owner"
+#define KEY_REASON "reason"
+#define KEY_SET "set"
+#define KEY_DURATION "duration"
+#define KEY_EXPIRES "expires"
+#define KEY_TRIGGERED "triggered"
+
+#define CHANNEL_DEFAULT_FLAGS (CHANNEL_OFFCHANNEL | CHANNEL_UNREVIEWED)
+#define CHANNEL_PRESERVED_FLAGS (CHANNEL_UNREVIEWED)
#define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnat"
/* Administrative messages */
{ "CSMSG_DNR_SEARCH_RESULTS", "The following do-not-registers were found:" },
{ "CSMSG_DNR_INFO", "$b%s$b is do-not-register (by $b%s$b): %s" },
{ "CSMSG_DNR_INFO_SET", "$b%s$b is do-not-register (set %s by $b%s$b): %s" },
+ { "CSMSG_DNR_INFO_SET_EXPIRES", "$b%s$b is do-not-register (set %s by $b%s$b; expires %s): %s" },
{ "CSMSG_MORE_DNRS", "%d more do-not-register entries skipped." },
{ "CSMSG_DNR_CHANNEL", "Only network staff may register $b%s$b." },
{ "CSMSG_DNR_CHANNEL_MOVE", "Only network staff may move $b%s$b." },
{ "CSMSG_NOREGISTER_CHANNEL", "$b%s$b has been added to the do-not-register list." },
{ "CSMSG_NO_SUCH_DNR", "$b%s$b is not in the do-not-register list." },
{ "CSMSG_DNR_REMOVED", "$b%s$b has been removed from the do-not-register list." },
+ { "CSMSG_DNR_BAD_ACTION", "$b%s$b is not a recognized do-not-register action." },
+ { "CSMSG_DNR_SEARCH_RESULTS", "The following do-not-registers were found:" },
/* Channel unregistration */
{ "CSMSG_UNREG_SUCCESS", "$b%s$b has been unregistered." },
{ "CSMSG_MULTIPLE_OWNERS", "There is more than one owner in %s; please use $bCLVL$b, $bDELOWNER$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_CONFIRM_GIVEOWNERSHIP", "To really give ownership to $b%1$s$b, you must use 'giveownership *%1$s %2$s'." },
{ "CSMSG_OWNERSHIP_GIVEN", "Ownership of $b%s$b has been transferred to account $b%s$b." },
/* Ban management */
{ "CSMSG_TOPIC_SET", "Topic is now '%s'." },
{ "CSMSG_NO_TOPIC", "$b%s$b does not have a default topic." },
{ "CSMSG_TOPICMASK_CONFLICT1", "I do not know how to make that topic work with the current topic mask in $b%s$b, which is: %s" },
- { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic at most %d characters and matches the topic mask pattern." },
+ { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic is at most %d characters and matches the topic mask pattern." },
{ "CSMSG_TOPIC_LOCKED", "The %s topic is locked." },
{ "CSMSG_MASK_BUT_NO_TOPIC", "Warning: $b%s$b does not have a default topic, but you just set the topic mask." },
{ "CSMSG_TOPIC_MISMATCH", "Warning: The default topic for $b%s$b does not match the topic mask; changing it anyway." },
{ "CSMSG_SET_TOYS", "$bToys $b %d - %s" },
{ "CSMSG_SET_CTCPREACTION", "$bCTCPReaction$b %d - %s" },
{ "CSMSG_SET_TOPICREFRESH", "$bTopicRefresh$b %d - %s" },
+ { "CSMSG_SET_UNREVIEWED", "$bUnreviewed $b %s" },
{ "CSMSG_USET_NOAUTOOP", "$bNoAutoOp $b %s" },
{ "CSMSG_USET_NOAUTOVOICE", "$bNoAutoVoice $b %s" },
{ "CSMSG_USET_AUTOINVITE", "$bAutoInvite $b %s" },
{ "CSMSG_HELPER_HAS_ACCESS", "%s has access $b%d$b in %s and has $bsecurity override$b enabled." },
{ "CSMSG_LAZY_SMURF_TARGET", "%s is %s ($bIRCOp$b; not logged in)." },
{ "CSMSG_SMURF_TARGET", "%s is %s ($b%s$b)." },
+ { "CSMSG_OPERATOR_TITLE", "IRC operator" },
+ { "CSMSG_UC_H_TITLE", "network helper" },
+ { "CSMSG_LC_H_TITLE", "support helper" },
{ "CSMSG_LAME_SMURF_TARGET", "%s is an IRC operator." },
/* Seen information */
/* Channel configuration */
{ "CSMSG_INVALID_OPTION", "$b%s$b is not a valid %s option." },
+ { "CSMSG_INVALID_CFLAG", "$b%s$b is not a recognized channel flag." },
{ "CSMSG_CHANNEL_OPTIONS", "Channel Options:" },
{ "CSMSG_GREETING_TOO_LONG", "Your greeting ($b%d$b characters) must be shorter than $b%d$b characters." },
};
/* 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_UNBAN 0x0010
-#define ACTION_DEL_BAN 0x0020
+#define ACTION_KICK 0x0001
+#define ACTION_BAN 0x0002
+#define ACTION_ADD_BAN 0x0004
+#define ACTION_ADD_TIMED_BAN 0x0008
+#define ACTION_UNBAN 0x0010
+#define ACTION_DEL_BAN 0x0020
/* The 40 allows for [+-ntlksimprD] and lots of fudge factor. */
-#define MODELEN 40 + KEYLEN
-#define PADLEN 21
-#define ACCESSLEN 10
+#define MODELEN 40 + KEYLEN
+#define PADLEN 21
+#define ACCESSLEN 10
-#define CSFUNC_ARGS user, channel, argc, argv, cmd
+#define CSFUNC_ARGS user, channel, argc, argv, cmd
#define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
-#define CHANSERV_SYNTAX() svccmd_send_help(user, chanserv, cmd)
-#define REQUIRE_PARAMS(N) if(argc < (N)) { \
- reply("MSG_MISSING_PARAMS", argv[0]); \
- CHANSERV_SYNTAX(); \
- return 0; }
+#define CHANSERV_SYNTAX() svccmd_send_help(user, chanserv, cmd)
+#define REQUIRE_PARAMS(N) if(argc < (N)) { \
+ reply("MSG_MISSING_PARAMS", argv[0]); \
+ CHANSERV_SYNTAX(); \
+ return 0; }
DECLARE_LIST(dnrList, struct do_not_register *);
-DEFINE_LIST(dnrList, struct do_not_register *);
+DEFINE_LIST(dnrList, struct do_not_register *)
static int eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, char *argv[], struct svccmd *cmd, int action);
struct channelList support_channels;
struct mod_chanmode default_modes;
- unsigned long db_backup_frequency;
- unsigned long channel_expire_frequency;
+ unsigned long db_backup_frequency;
+ unsigned long channel_expire_frequency;
+ unsigned long dnr_expire_frequency;
- long info_delay;
- unsigned int adjust_delay;
- long channel_expire_delay;
- unsigned int nodelete_level;
+ unsigned long info_delay;
+ unsigned long adjust_delay;
+ unsigned long channel_expire_delay;
+ unsigned int nodelete_level;
- unsigned int adjust_threshold;
- int join_flood_threshold;
+ unsigned int adjust_threshold;
+ int join_flood_threshold;
- unsigned int greeting_length;
- unsigned int refresh_period;
- unsigned int giveownership_period;
+ unsigned int greeting_length;
+ unsigned int refresh_period;
+ unsigned int giveownership_period;
- unsigned int max_owned;
- unsigned int max_chan_users;
- unsigned int max_chan_bans;
- unsigned int max_userinfo_length;
+ unsigned int max_owned;
+ unsigned int max_chan_users;
+ unsigned int max_chan_bans;
+ unsigned int max_userinfo_length;
struct string_list *set_shows;
struct string_list *eightball;
if(override && HANDLE_FLAGGED(handle, HELPING)
&& ((handle->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel)))
{
- for(uData = helperList;
- uData && uData->handle != handle;
- uData = uData->next);
+ for(uData = helperList;
+ uData && uData->handle != handle;
+ uData = uData->next);
- if(!uData)
- {
- uData = calloc(1, sizeof(struct userData));
- uData->handle = handle;
+ if(!uData)
+ {
+ uData = calloc(1, sizeof(struct userData));
+ uData->handle = handle;
- uData->access = UL_HELPER;
- uData->seen = 0;
+ uData->access = UL_HELPER;
+ uData->seen = 0;
- uData->info = NULL;
+ uData->info = NULL;
- uData->prev = NULL;
- uData->next = helperList;
- if(helperList)
- helperList->prev = uData;
- helperList = uData;
- }
+ uData->prev = NULL;
+ uData->next = helperList;
+ if(helperList)
+ helperList->prev = uData;
+ helperList = uData;
+ }
- head = &helperList;
+ head = &helperList;
}
else
{
- for(uData = channel->users; uData; uData = uData->next)
+ for(uData = channel->users; uData; uData = uData->next)
if((uData->handle == handle) && (allow_suspended || !IsUserSuspended(uData)))
break;
- head = &(channel->users);
+ head = &(channel->users);
}
if(uData && (uData != *head))
{
- /* Shuffle the user to the head of whatever list he was in. */
- if(uData->next)
+ /* Shuffle the user to the head of whatever list he was in. */
+ if(uData->next)
uData->next->prev = uData->prev;
- if(uData->prev)
+ if(uData->prev)
uData->prev->next = uData->next;
- uData->prev = NULL;
- uData->next = *head;
+ uData->prev = NULL;
+ uData->next = *head;
- if(*head)
- (**head).prev = uData;
- *head = uData;
+ if(*head)
+ (**head).prev = uData;
+ *head = uData;
}
return uData;
}
static void
-chanserv_ctcp_check(struct userNode *user, struct chanNode *channel, char *text, UNUSED_ARG(struct userNode *bot))
+chanserv_ctcp_check(struct userNode *user, struct chanNode *channel, const char *text, UNUSED_ARG(struct userNode *bot), UNUSED_ARG(unsigned int is_notice))
{
unsigned int eflags, argc;
char *argv[4];
return;
/* We need to enforce against them; do so. */
eflags = 0;
- argv[0] = text;
+ argv[0] = (char*)text;
argv[1] = user->nick;
argc = 2;
if(GetUserMode(channel, user))
struct note_type *ntype = data;
if(--ntype->refs > 0)
- return;
+ return;
free(ntype);
}
struct chanData *cData;
struct note *note;
unsigned int size = sizeof(*note) + ntype->max_length;
-
+
for(cData = channelList; cData; cData = cData->next) {
note = dict_find(cData->notes, ntype->name, NULL);
if(!note)
continue;
- if(strlen(note->note) <= ntype->max_length)
+ if(strlen(note->note) <= ntype->max_length)
continue;
dict_remove2(cData->notes, ntype->name, 1);
note = realloc(note, size);
if((ntype = dict_find(note_types, argv[1], NULL)))
existed = 1;
else
- ntype = chanserv_create_note_type(argv[arg]);
+ ntype = chanserv_create_note_type(argv[arg]);
if(!irccasecmp(argv[++arg], "privileged"))
{
arg++;
if(!ulvl)
{
reply("CSMSG_INVALID_ACCESS", argv[arg]);
- goto fail;
+ goto fail;
}
ntype->set_access_type = NOTE_SET_CHANNEL_ACCESS;
ntype->set_access.min_ulevel = ulvl;
else
{
reply("CSMSG_BAD_NOTE_ACCESS", argv[arg]);
- goto fail;
+ goto fail;
}
if(!irccasecmp(argv[++arg], "privileged"))
ntype->visible_type = NOTE_VIS_ALL;
else {
reply("CSMSG_BAD_NOTE_ACCESS", argv[arg]);
- goto fail;
+ goto fail;
}
if((arg+1) >= argc) {
reply("MSG_MISSING_PARAMS", argv[0]);
- goto fail;
+ goto fail;
}
max_length = strtoul(argv[++arg], NULL, 0);
if(max_length < 20 || max_length > 450)
{
reply("CSMSG_BAD_MAX_LENGTH", argv[arg]);
- goto fail;
+ goto fail;
}
if(existed && (max_length < ntype->max_length))
{
- ntype->max_length = max_length;
- chanserv_truncate_notes(ntype);
+ ntype->max_length = max_length;
+ chanserv_truncate_notes(ntype);
}
ntype->max_length = max_length;
if(existed)
- reply("CSMSG_NOTE_MODIFIED", ntype->name);
+ reply("CSMSG_NOTE_MODIFIED", ntype->name);
else
reply("CSMSG_NOTE_CREATED", ntype->name);
return 1;
fail:
if(!existed)
- dict_remove(note_types, ntype->name);
+ dict_remove(note_types, ntype->name);
return 0;
}
channel->next = channelList;
if(channelList)
- channelList->prev = channel;
+ channelList->prev = channel;
channelList = channel;
registered_channels++;
}
static struct userData*
-add_channel_user(struct chanData *channel, struct handle_info *handle, unsigned short access, time_t seen, const char *info)
+add_channel_user(struct chanData *channel, struct handle_info *handle, unsigned short access, unsigned long seen, const char *info)
{
struct userData *ud;
if(access > UL_OWNER)
- return NULL;
+ return NULL;
ud = calloc(1, sizeof(*ud));
ud->channel = channel;
ud->prev = NULL;
ud->next = channel->users;
if(channel->users)
- channel->users->prev = ud;
+ channel->users->prev = ud;
channel->users = ud;
channel->userCount++;
static void expire_ban(void *data);
static struct banData*
-add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t set, time_t triggered, time_t expires, char *reason)
+add_channel_ban(struct chanData *channel, const char *mask, char *owner, unsigned long set, unsigned long triggered, unsigned long expires, char *reason)
{
struct banData *bd;
unsigned int ii, l1, l2;
bd->reason = strdup(reason);
if(expires)
- timeq_add(expires, expire_ban, bd);
+ timeq_add(expires, expire_ban, bd);
bd->prev = NULL;
bd->next = channel->bans;
if(channel->bans)
- channel->bans->prev = bd;
+ channel->bans->prev = bd;
channel->bans = bd;
channel->banCount++;
banCount++;
ban->next->prev = ban->prev;
if(ban->expires)
- timeq_del(0, expire_ban, ban, TIMEQ_IGNORE_WHEN);
+ timeq_del(0, expire_ban, ban, TIMEQ_IGNORE_WHEN);
if(ban->reason)
free(ban->reason);
for(ii=0; ii<bans.used; ii++)
{
if(!strcmp(bans.list[ii]->ban, bd->mask))
- {
+ {
change.argc = 1;
change.args[0].mode = MODE_REMOVE|MODE_BAN;
change.args[0].u.hostmask = bd->mask;
*/
if(!channel)
- return;
+ return;
timeq_del(0, NULL, channel, TIMEQ_IGNORE_FUNC | TIMEQ_IGNORE_WHEN);
}
while(channel->users)
- del_channel_user(channel->users, 0);
+ del_channel_user(channel->users, 0);
while(channel->bans)
- del_channel_ban(channel->bans);
+ del_channel_ban(channel->bans);
free(channel->topic);
free(channel->registrar);
if(channel->suspended)
{
- struct chanNode *cNode = channel->channel;
- struct suspended *suspended, *next_suspended;
+ struct chanNode *cNode = channel->channel;
+ struct suspended *suspended, *next_suspended;
for(suspended = channel->suspended; suspended; suspended = next_suspended)
{
free(suspended);
}
- if(cNode)
- cNode->channel_info = NULL;
+ if(cNode)
+ cNode->channel_info = NULL;
}
channel->channel->channel_info = NULL;
for(channel = channelList; channel; channel = next)
{
- next = channel->next;
+ next = channel->next;
/* See if the channel can be expired. */
if(((now - channel->visited) <= chanserv_conf.channel_expire_delay)
}
if(chanserv_conf.channel_expire_frequency)
- timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
+ timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
+}
+
+static void
+expire_dnrs(UNUSED_ARG(void *data))
+{
+ dict_iterator_t it, next;
+ struct do_not_register *dnr;
+
+ for(it = dict_first(handle_dnrs); it; it = next)
+ {
+ dnr = iter_data(it);
+ next = iter_next(it);
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(handle_dnrs, dnr->chan_name + 1);
+ }
+ for(it = dict_first(plain_dnrs); it; it = next)
+ {
+ dnr = iter_data(it);
+ next = iter_next(it);
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(plain_dnrs, dnr->chan_name + 1);
+ }
+ for(it = dict_first(mask_dnrs); it; it = next)
+ {
+ dnr = iter_data(it);
+ next = iter_next(it);
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(mask_dnrs, dnr->chan_name + 1);
+ }
+
+ if(chanserv_conf.dnr_expire_frequency)
+ timeq_add(now + chanserv_conf.dnr_expire_frequency, expire_dnrs, NULL);
}
static int
/* 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 || IsOper(aggressor))
- return 0;
+ 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
switch(protect)
{
case 'l':
- if(cs_victim->access > cs_aggressor->access)
+ if(cs_victim->access > cs_aggressor->access)
return 1;
- break;
+ break;
case 'a':
case 'e':
- if(cs_victim->access >= cs_aggressor->access)
+ if(cs_victim->access >= cs_aggressor->access)
return 1;
- break;
+ break;
}
return 0;
|| (cs_victim->access < cData->lvlOpts[lvlGiveOps]))
&& !check_user_level(channel, user, lvlEnfOps, 0, 0))
{
- send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
- return 0;
+ send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
+ return 0;
}
return 1;
{
if(IsService(victim))
{
- send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
- return 0;
+ send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ return 0;
}
if(protect_user(victim, user, channel->channel_info))
{
- send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
- return 0;
+ send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ return 0;
}
return 1;
}
static struct do_not_register *
-chanserv_add_dnr(const char *chan_name, const char *setter, const char *reason)
+chanserv_add_dnr(const char *chan_name, const char *setter, unsigned long expires, const char *reason)
{
struct do_not_register *dnr = calloc(1, sizeof(*dnr)+strlen(reason));
safestrncpy(dnr->chan_name, chan_name, sizeof(dnr->chan_name));
safestrncpy(dnr->setter, setter, sizeof(dnr->setter));
strcpy(dnr->reason, reason);
dnr->set = now;
+ dnr->expires = expires;
if(dnr->chan_name[0] == '*')
dict_insert(handle_dnrs, dnr->chan_name+1, dnr);
else if(strpbrk(dnr->chan_name, "*?"))
}
static struct dnrList
-chanserv_find_dnrs(const char *chan_name, const char *handle)
+chanserv_find_dnrs(const char *chan_name, const char *handle, unsigned int max)
{
struct dnrList list;
- dict_iterator_t it;
+ dict_iterator_t it, next;
struct do_not_register *dnr;
dnrList_init(&list);
+
if(handle && (dnr = dict_find(handle_dnrs, handle, NULL)))
- dnrList_append(&list, dnr);
+ {
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(handle_dnrs, handle);
+ else if(list.used < max)
+ dnrList_append(&list, dnr);
+ }
+
if(chan_name && (dnr = dict_find(plain_dnrs, chan_name, NULL)))
- dnrList_append(&list, dnr);
+ {
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(plain_dnrs, chan_name);
+ else if(list.used < max)
+ dnrList_append(&list, dnr);
+ }
+
if(chan_name)
- for(it = dict_first(mask_dnrs); it; it = iter_next(it))
- if(match_ircglob(chan_name, iter_key(it)))
- dnrList_append(&list, iter_data(it));
+ {
+ for(it = dict_first(mask_dnrs); it && list.used < max; it = next)
+ {
+ next = iter_next(it);
+ if(!match_ircglob(chan_name, iter_key(it)))
+ continue;
+ dnr = iter_data(it);
+ if(dnr->expires && dnr->expires <= now)
+ dict_remove(mask_dnrs, iter_key(it));
+ else
+ dnrList_append(&list, dnr);
+ }
+ }
+
return list;
}
+static int dnr_print_func(struct do_not_register *dnr, void *extra)
+{
+ struct userNode *user;
+ char buf1[INTERVALLEN];
+ char buf2[INTERVALLEN];
+ time_t feh;
+
+ user = extra;
+ if(dnr->set)
+ {
+ feh = dnr->set;
+ strftime(buf1, sizeof(buf1), "%d %b %Y", localtime(&feh));
+ }
+ if(dnr->expires)
+ {
+ feh = dnr->expires;
+ strftime(buf2, sizeof(buf2), "%d %b %Y", localtime(&feh));
+ send_message(user, chanserv, "CSMSG_DNR_INFO_SET_EXPIRES", dnr->chan_name, buf1, dnr->setter, buf2, dnr->reason);
+ }
+ else if(dnr->set)
+ {
+ send_message(user, chanserv, "CSMSG_DNR_INFO_SET", dnr->chan_name, buf1, dnr->setter, dnr->reason);
+ }
+ else
+ send_message(user, chanserv, "CSMSG_DNR_INFO", dnr->chan_name, dnr->setter, dnr->reason);
+ return 0;
+}
+
static unsigned int
chanserv_show_dnrs(struct userNode *user, struct svccmd *cmd, const char *chan_name, const char *handle)
{
struct dnrList list;
- struct do_not_register *dnr;
unsigned int ii;
- char buf[INTERVALLEN];
- list = chanserv_find_dnrs(chan_name, handle);
+ list = chanserv_find_dnrs(chan_name, handle, UINT_MAX);
for(ii = 0; (ii < list.used) && (ii < 10); ++ii)
- {
- dnr = list.list[ii];
- if(dnr->set)
- {
- strftime(buf, sizeof(buf), "%Y %b %d", localtime(&dnr->set));
- reply("CSMSG_DNR_INFO_SET", dnr->chan_name, buf, dnr->setter, dnr->reason);
- }
- else
- reply("CSMSG_DNR_INFO", dnr->chan_name, dnr->setter, dnr->reason);
- }
+ dnr_print_func(list.list[ii], user);
if(ii < list.used)
reply("CSMSG_MORE_DNRS", list.used - ii);
free(list.list);
struct do_not_register *
chanserv_is_dnr(const char *chan_name, struct handle_info *handle)
{
+ struct dnrList list;
struct do_not_register *dnr;
- dict_iterator_t it;
- if(handle && (dnr = dict_find(handle_dnrs, handle->handle, NULL)))
- return dnr;
- if(chan_name)
+ list = chanserv_find_dnrs(chan_name, handle ? handle->handle : NULL, 1);
+ dnr = list.used ? list.list[0] : NULL;
+ free(list.list);
+ return dnr;
+}
+
+static unsigned int send_dnrs(struct userNode *user, dict_t dict)
+{
+ struct do_not_register *dnr;
+ dict_iterator_t it, next;
+ unsigned int matches = 0;
+
+ for(it = dict_first(dict); it; it = next)
{
- if((dnr = dict_find(plain_dnrs, chan_name, NULL)))
- return dnr;
- for(it = dict_first(mask_dnrs); it; it = iter_next(it))
- if(match_ircglob(chan_name, iter_key(it)))
- return iter_data(it);
+ dnr = iter_data(it);
+ next = iter_next(it);
+ if(dnr->expires && dnr->expires <= now)
+ {
+ dict_remove(dict, iter_key(it));
+ continue;
+ }
+ dnr_print_func(dnr, user);
+ matches++;
}
- return NULL;
+
+ return matches;
}
static CHANSERV_FUNC(cmd_noregister)
{
const char *target;
- struct do_not_register *dnr;
- char buf[INTERVALLEN];
+ const char *reason;
+ unsigned long expiry, duration;
unsigned int matches;
if(argc < 2)
{
- dict_iterator_t it;
-
reply("CSMSG_DNR_SEARCH_RESULTS");
- matches = 0;
- for(it = dict_first(handle_dnrs); it; it = iter_next(it))
- {
- dnr = iter_data(it);
- if(dnr->set)
- reply("CSMSG_DNR_INFO_SET", dnr->chan_name, intervalString(buf, now - dnr->set, user->handle_info), dnr->setter, dnr->reason);
- else
- reply("CSMSG_DNR_INFO", dnr->chan_name, dnr->setter, dnr->reason);
- matches++;
- }
- for(it = dict_first(plain_dnrs); it; it = iter_next(it))
- {
- dnr = iter_data(it);
- if(dnr->set)
- reply("CSMSG_DNR_INFO_SET", dnr->chan_name, intervalString(buf, now - dnr->set, user->handle_info), dnr->setter, dnr->reason);
- else
- reply("CSMSG_DNR_INFO", dnr->chan_name, dnr->setter, dnr->reason);
- matches++;
- }
- for(it = dict_first(mask_dnrs); it; it = iter_next(it))
- {
- dnr = iter_data(it);
- if(dnr->set)
- reply("CSMSG_DNR_INFO_SET", dnr->chan_name, intervalString(buf, now - dnr->set, user->handle_info), dnr->setter, dnr->reason);
- else
- reply("CSMSG_DNR_INFO", dnr->chan_name, dnr->setter, dnr->reason);
- matches++;
- }
-
+ matches = send_dnrs(user, handle_dnrs);
+ matches += send_dnrs(user, plain_dnrs);
+ matches += send_dnrs(user, mask_dnrs);
if(matches)
reply("MSG_MATCH_COUNT", matches);
else
if(argc > 2)
{
- const char *reason = unsplit_string(argv + 2, argc - 2, NULL);
+ if(argc == 3)
+ {
+ reply("MSG_INVALID_DURATION", argv[2]);
+ return 0;
+ }
+
+ if(!strcmp(argv[2], "0"))
+ expiry = 0;
+ else if((duration = ParseInterval(argv[2])))
+ expiry = now + duration;
+ else
+ {
+ reply("MSG_INVALID_DURATION", argv[2]);
+ return 0;
+ }
+
+ reason = unsplit_string(argv + 3, argc - 3, NULL);
if((*target == '*') && !get_handle_info(target + 1))
{
reply("MSG_HANDLE_UNKNOWN", target + 1);
return 0;
}
- chanserv_add_dnr(target, user->handle_info->handle, reason);
+ chanserv_add_dnr(target, user->handle_info->handle, expiry, reason);
reply("CSMSG_NOREGISTER_CHANNEL", target);
return 1;
}
{
const char *chan_name = argv[1];
- if((chan_name[0] == '*') && dict_find(handle_dnrs, chan_name+1, NULL))
+ if(((chan_name[0] == '*') && dict_remove(handle_dnrs, chan_name+1))
+ || dict_remove(plain_dnrs, chan_name)
+ || dict_remove(mask_dnrs, chan_name))
{
- dict_remove(handle_dnrs, chan_name+1);
reply("CSMSG_DNR_REMOVED", chan_name);
+ return 1;
}
- else if(dict_find(plain_dnrs, chan_name, NULL))
+ reply("CSMSG_NO_SUCH_DNR", chan_name);
+ return 0;
+}
+
+struct dnr_search {
+ struct userNode *source;
+ char *chan_mask;
+ char *setter_mask;
+ char *reason_mask;
+ unsigned long min_set, max_set;
+ unsigned long min_expires, max_expires;
+ unsigned int limit;
+};
+
+static int
+dnr_search_matches(const struct do_not_register *dnr, const struct dnr_search *search)
+{
+ return !((dnr->set < search->min_set)
+ || (dnr->set > search->max_set)
+ || (dnr->expires < search->min_expires)
+ || (search->max_expires
+ && ((dnr->expires == 0)
+ || (dnr->expires > search->max_expires)))
+ || (search->chan_mask
+ && !match_ircglob(dnr->chan_name, search->chan_mask))
+ || (search->setter_mask
+ && !match_ircglob(dnr->setter, search->setter_mask))
+ || (search->reason_mask
+ && !match_ircglob(dnr->reason, search->reason_mask)));
+}
+
+static struct dnr_search *
+dnr_search_create(struct userNode *user, struct svccmd *cmd, unsigned int argc, char *argv[])
+{
+ struct dnr_search *discrim;
+ unsigned int ii;
+
+ discrim = calloc(1, sizeof(*discrim));
+ discrim->source = user;
+ discrim->chan_mask = NULL;
+ discrim->setter_mask = NULL;
+ discrim->reason_mask = NULL;
+ discrim->max_set = INT_MAX;
+ discrim->limit = 50;
+
+ for(ii=0; ii<argc; ++ii)
{
- dict_remove(plain_dnrs, chan_name);
- reply("CSMSG_DNR_REMOVED", chan_name);
+ if(ii == argc - 1)
+ {
+ reply("MSG_MISSING_PARAMS", argv[ii]);
+ goto fail;
+ }
+ else if(0 == irccasecmp(argv[ii], "channel"))
+ {
+ discrim->chan_mask = argv[++ii];
+ }
+ else if(0 == irccasecmp(argv[ii], "setter"))
+ {
+ discrim->setter_mask = argv[++ii];
+ }
+ else if(0 == irccasecmp(argv[ii], "reason"))
+ {
+ discrim->reason_mask = argv[++ii];
+ }
+ else if(0 == irccasecmp(argv[ii], "limit"))
+ {
+ discrim->limit = strtoul(argv[++ii], NULL, 0);
+ }
+ else if(0 == irccasecmp(argv[ii], "set"))
+ {
+ const char *cmp = argv[++ii];
+ if(cmp[0] == '<') {
+ if(cmp[1] == '=')
+ discrim->min_set = now - ParseInterval(cmp + 2);
+ else
+ discrim->min_set = now - (ParseInterval(cmp + 1) - 1);
+ } else if(cmp[0] == '=') {
+ discrim->min_set = discrim->max_set = now - ParseInterval(cmp + 1);
+ } else if(cmp[0] == '>') {
+ if(cmp[1] == '=')
+ discrim->max_set = now - ParseInterval(cmp + 2);
+ else
+ discrim->max_set = now - (ParseInterval(cmp + 1) - 1);
+ } else {
+ discrim->max_set = now - (ParseInterval(cmp) - 1);
+ }
+ }
+ else if(0 == irccasecmp(argv[ii], "expires"))
+ {
+ const char *cmp = argv[++ii];
+ if(cmp[0] == '<') {
+ if(cmp[1] == '=')
+ discrim->max_expires = now + ParseInterval(cmp + 2);
+ else
+ discrim->max_expires = now + (ParseInterval(cmp + 1) - 1);
+ } else if(cmp[0] == '=') {
+ discrim->min_expires = discrim->max_expires = now + ParseInterval(cmp + 1);
+ } else if(cmp[0] == '>') {
+ if(cmp[1] == '=')
+ discrim->min_expires = now + ParseInterval(cmp + 2);
+ else
+ discrim->min_expires = now + (ParseInterval(cmp + 1) - 1);
+ } else {
+ discrim->min_expires = now + (ParseInterval(cmp) - 1);
+ }
+ }
+ else
+ {
+ reply("MSG_INVALID_CRITERIA", argv[ii]);
+ goto fail;
+ }
+ }
+ return discrim;
+
+ fail:
+ free(discrim);
+ return NULL;
+}
+
+typedef int (*dnr_search_func)(struct do_not_register *match, void *extra);
+
+static unsigned int
+dnr_search(struct dnr_search *discrim, dnr_search_func dsf, void *data)
+{
+ struct do_not_register *dnr;
+ dict_iterator_t next;
+ dict_iterator_t it;
+ unsigned int count;
+ int target_fixed;
+
+ /* Initialize local variables. */
+ count = 0;
+ target_fixed = 0;
+ if(discrim->chan_mask)
+ {
+ int shift = (discrim->chan_mask[0] == '\\' && discrim->chan_mask[1] == '*') ? 2 : 0;
+ if('\0' == discrim->chan_mask[shift + strcspn(discrim->chan_mask+shift, "*?")])
+ target_fixed = 1;
}
- else if(dict_find(mask_dnrs, chan_name, NULL))
+
+ if(target_fixed && discrim->chan_mask[0] == '\\' && discrim->chan_mask[1] == '*')
{
- dict_remove(mask_dnrs, chan_name);
- reply("CSMSG_DNR_REMOVED", chan_name);
+ /* Check against account-based DNRs. */
+ dnr = dict_find(handle_dnrs, discrim->chan_mask + 2, NULL);
+ if(dnr && dnr_search_matches(dnr, discrim) && (count++ < discrim->limit))
+ dsf(dnr, data);
+ }
+ else if(target_fixed)
+ {
+ /* Check against channel-based DNRs. */
+ dnr = dict_find(plain_dnrs, discrim->chan_mask, NULL);
+ if(dnr && dnr_search_matches(dnr, discrim) && (count++ < discrim->limit))
+ dsf(dnr, data);
+ }
+ else
+ {
+ /* Exhaustively search account DNRs. */
+ for(it = dict_first(handle_dnrs); it; it = next)
+ {
+ next = iter_next(it);
+ dnr = iter_data(it);
+ if(dnr_search_matches(dnr, discrim) && (count++ < discrim->limit) && dsf(dnr, data))
+ break;
+ }
+
+ /* Do the same for channel DNRs. */
+ for(it = dict_first(plain_dnrs); it; it = next)
+ {
+ next = iter_next(it);
+ dnr = iter_data(it);
+ if(dnr_search_matches(dnr, discrim) && (count++ < discrim->limit) && dsf(dnr, data))
+ break;
+ }
+
+ /* Do the same for wildcarded channel DNRs. */
+ for(it = dict_first(mask_dnrs); it; it = next)
+ {
+ next = iter_next(it);
+ dnr = iter_data(it);
+ if(dnr_search_matches(dnr, discrim) && (count++ < discrim->limit) && dsf(dnr, data))
+ break;
+ }
+ }
+ return count;
+}
+
+static int
+dnr_remove_func(struct do_not_register *match, void *extra)
+{
+ struct userNode *user;
+ char *chan_name;
+
+ chan_name = alloca(strlen(match->chan_name) + 1);
+ strcpy(chan_name, match->chan_name);
+ user = extra;
+ if(((chan_name[0] == '*') && dict_remove(handle_dnrs, chan_name+1))
+ || dict_remove(plain_dnrs, chan_name)
+ || dict_remove(mask_dnrs, chan_name))
+ {
+ send_message(user, chanserv, "CSMSG_DNR_REMOVED", chan_name);
+ }
+ return 0;
+}
+
+static int
+dnr_count_func(struct do_not_register *match, void *extra)
+{
+ return 0; (void)match; (void)extra;
+}
+
+static MODCMD_FUNC(cmd_dnrsearch)
+{
+ struct dnr_search *discrim;
+ dnr_search_func action;
+ struct svccmd *subcmd;
+ unsigned int matches;
+ char buf[MAXLEN];
+
+ sprintf(buf, "dnrsearch %s", argv[1]);
+ subcmd = dict_find(cmd->parent->commands, buf, NULL);
+ if(!subcmd)
+ {
+ reply("CSMSG_DNR_BAD_ACTION", argv[1]);
+ return 0;
}
+ if(!svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY))
+ return 0;
+ if(!irccasecmp(argv[1], "print"))
+ action = dnr_print_func;
+ else if(!irccasecmp(argv[1], "remove"))
+ action = dnr_remove_func;
+ else if(!irccasecmp(argv[1], "count"))
+ action = dnr_count_func;
else
{
- reply("CSMSG_NO_SUCH_DNR", chan_name);
+ reply("CSMSG_DNR_BAD_ACTION", argv[1]);
return 0;
}
+
+ discrim = dnr_search_create(user, cmd, argc-2, argv+2);
+ if(!discrim)
+ return 0;
+
+ if(action == dnr_print_func)
+ reply("CSMSG_DNR_SEARCH_RESULTS");
+ matches = dnr_search(discrim, action, user);
+ if(matches)
+ reply("MSG_MATCH_COUNT", matches);
+ else
+ reply("MSG_NO_MATCHES");
+ free(discrim);
return 1;
}
if(argc >= (new_channel+2))
{
- if(!IsHelping(user))
- {
- reply("CSMSG_PROXY_FORBIDDEN");
- return 0;
- }
+ if(!IsHelping(user))
+ {
+ reply("CSMSG_PROXY_FORBIDDEN");
+ return 0;
+ }
- if(!(handle = modcmd_get_handle_info(user, argv[new_channel+1])))
+ if(!(handle = modcmd_get_handle_info(user, argv[new_channel+1])))
return 0;
force = (argc > (new_channel+2)) && !irccasecmp(argv[new_channel+2], "force");
dnr = chanserv_is_dnr(chan_name, handle);
}
else
{
- handle = user->handle_info;
+ handle = user->handle_info;
dnr = chanserv_is_dnr(chan_name, handle);
}
if(dnr && !force)
return 0;
}
confirm_string = make_confirmation_string(uData);
- if((argc < 2) || strcmp(argv[1], confirm_string))
- {
- reply("CSMSG_CONFIRM_UNREG", confirm_string);
- return 0;
- }
+ if((argc < 2) || strcmp(argv[1], confirm_string))
+ {
+ reply("CSMSG_CONFIRM_UNREG", confirm_string);
+ return 0;
+ }
}
sprintf(reason, "unregistered by %s.", user->handle_info->handle);
if(IsProtected(channel->channel_info))
{
- reply("CSMSG_MOVE_NODELETE", channel->name);
- return 0;
+ reply("CSMSG_MOVE_NODELETE", channel->name);
+ return 0;
}
if(!IsChannelName(argv[1]))
}
else if(target->channel_info)
{
- reply("CSMSG_ALREADY_REGGED", target->name);
- return 0;
+ reply("CSMSG_ALREADY_REGGED", target->name);
+ return 0;
}
else if((!(mn = GetUserMode(target, user)) || !(mn->modes && MODE_CHANOP))
&& !IsHelping(user))
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);
/* Insert the source's users into the scratch area. */
for(suData = source->users; suData; suData = suData->next)
- dict_insert(merge, suData->handle->handle, suData);
+ dict_insert(merge, suData->handle->handle, suData);
/* Iterate through the target's users, looking for
users common to both channels. The lower access is
list. */
for(tuData = target->users; tuData; tuData = next)
{
- struct userData *choice;
+ struct userData *choice;
- next = tuData->next;
+ next = tuData->next;
- /* If a source user exists with the same handle as a target
- channel's user, resolve the conflict by removing one. */
- suData = dict_find(merge, tuData->handle->handle, NULL);
- if(!suData)
- continue;
+ /* If a source user exists with the same handle as a target
+ channel's user, resolve the conflict by removing one. */
+ suData = dict_find(merge, tuData->handle->handle, NULL);
+ if(!suData)
+ continue;
- /* Pick the data we want to keep. */
+ /* Pick the data we want to keep. */
/* If the access is the same, use the later seen time. */
- if(suData->access == tuData->access)
- choice = (suData->seen > tuData->seen) ? suData : tuData;
- else /* Otherwise, keep the higher access level. */
- choice = (suData->access > tuData->access) ? suData : tuData;
+ if(suData->access == tuData->access)
+ choice = (suData->seen > tuData->seen) ? suData : tuData;
+ else /* Otherwise, keep the higher access level. */
+ choice = (suData->access > tuData->access) ? suData : tuData;
- /* Remove the user that wasn't picked. */
- if(choice == tuData)
- {
- dict_remove(merge, suData->handle->handle);
- del_channel_user(suData, 0);
- }
- else
- del_channel_user(tuData, 0);
+ /* Remove the user that wasn't picked. */
+ if(choice == tuData)
+ {
+ dict_remove(merge, suData->handle->handle);
+ del_channel_user(suData, 0);
+ }
+ else
+ del_channel_user(tuData, 0);
}
/* Move the remaining users to the target channel. */
for(it = dict_first(merge); it; it = iter_next(it))
{
- suData = iter_data(it);
+ suData = iter_data(it);
- /* Insert the user into the target channel's linked list. */
- suData->prev = NULL;
- suData->next = target->users;
+ /* Insert the user into the target channel's linked list. */
+ suData->prev = NULL;
+ suData->next = target->users;
suData->channel = target;
- if(target->users)
- target->users->prev = suData;
- target->users = suData;
+ if(target->users)
+ target->users->prev = suData;
+ target->users = suData;
- /* Update the user counts for the target channel; the
- source counts are left alone. */
- target->userCount++;
+ /* Update the user counts for the target channel; the
+ source counts are left alone. */
+ target->userCount++;
}
/* Possible to assert (source->users == NULL) here. */
/* Perform a totally expensive O(n*m) merge, ick. */
for(sbData = source->bans; sbData; sbData = sNext)
{
- /* Flag to track whether the ban's been moved
- to the destination yet. */
- int moved = 0;
-
- /* Possible to assert (sbData->prev == NULL) here. */
- sNext = sbData->next;
-
- for(tbData = tFront; tbData; tbData = tNext)
- {
- tNext = tbData->next;
-
- /* Perform two comparisons between each source
- and target ban, conflicts are resolved by
- keeping the broader ban and copying the later
- expiration and triggered time. */
- if(match_ircglobs(tbData->mask, sbData->mask))
- {
- /* There is a broader ban in the target channel that
- overrides one in the source channel; remove the
- source ban and break. */
- if(sbData->expires > tbData->expires)
- tbData->expires = sbData->expires;
- if(sbData->triggered > tbData->triggered)
- tbData->triggered = sbData->triggered;
- del_channel_ban(sbData);
- break;
- }
- else if(match_ircglobs(sbData->mask, tbData->mask))
- {
- /* There is a broader ban in the source channel that
- overrides one in the target channel; remove the
- target ban, fall through and move the source over. */
- if(tbData->expires > sbData->expires)
- sbData->expires = tbData->expires;
- if(tbData->triggered > sbData->triggered)
- sbData->triggered = tbData->triggered;
- if(tbData == tFront)
- tFront = tNext;
- del_channel_ban(tbData);
- }
-
- /* Source bans can override multiple target bans, so
- we allow a source to run through this loop multiple
- times, but we can only move it once. */
- if(moved)
- continue;
- moved = 1;
-
- /* Remove the source ban from the source ban list. */
- if(sbData->next)
- sbData->next->prev = sbData->prev;
-
- /* Modify the source ban's associated channel. */
- sbData->channel = target;
-
- /* Insert the ban into the target channel's linked list. */
- sbData->prev = NULL;
- sbData->next = target->bans;
-
- if(target->bans)
- target->bans->prev = sbData;
- target->bans = sbData;
-
- /* Update the user counts for the target channel. */
- target->banCount++;
- }
+ /* Flag to track whether the ban's been moved
+ to the destination yet. */
+ int moved = 0;
+
+ /* Possible to assert (sbData->prev == NULL) here. */
+ sNext = sbData->next;
+
+ for(tbData = tFront; tbData; tbData = tNext)
+ {
+ tNext = tbData->next;
+
+ /* Perform two comparisons between each source
+ and target ban, conflicts are resolved by
+ keeping the broader ban and copying the later
+ expiration and triggered time. */
+ if(match_ircglobs(tbData->mask, sbData->mask))
+ {
+ /* There is a broader ban in the target channel that
+ overrides one in the source channel; remove the
+ source ban and break. */
+ if(sbData->expires > tbData->expires)
+ tbData->expires = sbData->expires;
+ if(sbData->triggered > tbData->triggered)
+ tbData->triggered = sbData->triggered;
+ del_channel_ban(sbData);
+ break;
+ }
+ else if(match_ircglobs(sbData->mask, tbData->mask))
+ {
+ /* There is a broader ban in the source channel that
+ overrides one in the target channel; remove the
+ target ban, fall through and move the source over. */
+ if(tbData->expires > sbData->expires)
+ sbData->expires = tbData->expires;
+ if(tbData->triggered > sbData->triggered)
+ sbData->triggered = tbData->triggered;
+ if(tbData == tFront)
+ tFront = tNext;
+ del_channel_ban(tbData);
+ }
+
+ /* Source bans can override multiple target bans, so
+ we allow a source to run through this loop multiple
+ times, but we can only move it once. */
+ if(moved)
+ continue;
+ moved = 1;
+
+ /* Remove the source ban from the source ban list. */
+ if(sbData->next)
+ sbData->next->prev = sbData->prev;
+
+ /* Modify the source ban's associated channel. */
+ sbData->channel = target;
+
+ /* Insert the ban into the target channel's linked list. */
+ sbData->prev = NULL;
+ sbData->next = target->bans;
+
+ if(target->bans)
+ target->bans->prev = sbData;
+ target->bans = sbData;
+
+ /* Update the user counts for the target channel. */
+ target->banCount++;
+ }
}
/* Possible to assert (source->bans == NULL) here. */
* Do not touch last_refresh, ban count or user counts.
*/
if(source->visited > target->visited)
- target->visited = source->visited;
+ target->visited = source->visited;
if(source->registered < target->registered)
target->registered = source->registered;
if(source->ownerTransfer > target->ownerTransfer)
static CHANSERV_FUNC(cmd_adduser)
{
struct userData *actee;
- struct userData *actor;
+ struct userData *actor, *real_actor;
struct handle_info *handle;
- unsigned short access;
+ unsigned short access, override = 0;
REQUIRE_PARAMS(3);
if(channel->channel_info->userCount >= chanserv_conf.max_chan_users)
{
- reply("CSMSG_MAXIMUM_USERS", chanserv_conf.max_chan_users);
- return 0;
+ reply("CSMSG_MAXIMUM_USERS", chanserv_conf.max_chan_users);
+ return 0;
}
access = user_level_from_name(argv[2], UL_OWNER);
if(!access)
{
- reply("CSMSG_INVALID_ACCESS", argv[2]);
- return 0;
+ reply("CSMSG_INVALID_ACCESS", argv[2]);
+ return 0;
}
actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
+
if(actor->access <= access)
{
- reply("CSMSG_NO_BUMP_ACCESS");
- return 0;
+ reply("CSMSG_NO_BUMP_ACCESS");
+ return 0;
}
+ /* Trying to add someone with equal/more access? */
+ if (!real_actor || real_actor->access <= access)
+ override = CMD_LOG_OVERRIDE;
+
if(!(handle = modcmd_get_handle_info(user, argv[1])))
return 0;
if((actee = GetTrueChannelAccess(channel->channel_info, handle)))
{
- reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access);
- return 0;
+ reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access);
+ return 0;
}
actee = add_channel_user(channel->channel_info, handle, access, 0, NULL);
scan_user_presence(actee, NULL);
reply("CSMSG_ADDED_USER", handle->handle, channel->name, access);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_clvl)
{
struct handle_info *handle;
struct userData *victim;
- struct userData *actor;
- unsigned short new_access;
+ struct userData *actor, *real_actor;
+ unsigned short new_access, override = 0;
int privileged = IsHelping(user) && ((user->handle_info->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel->channel_info));
REQUIRE_PARAMS(3);
actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(handle = modcmd_get_handle_info(user, argv[1])))
return 0;
if(handle == user->handle_info && !privileged)
{
- reply("CSMSG_NO_SELF_CLVL");
- return 0;
+ reply("CSMSG_NO_SELF_CLVL");
+ return 0;
}
if(!(victim = GetTrueChannelAccess(channel->channel_info, handle)))
{
- reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
- return 0;
+ reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
+ return 0;
}
if(actor->access <= victim->access && !privileged)
{
- reply("MSG_USER_OUTRANKED", handle->handle);
- return 0;
+ reply("MSG_USER_OUTRANKED", handle->handle);
+ return 0;
}
new_access = user_level_from_name(argv[2], UL_OWNER);
if(!new_access)
{
- reply("CSMSG_INVALID_ACCESS", argv[2]);
- return 0;
+ reply("CSMSG_INVALID_ACCESS", argv[2]);
+ return 0;
}
if(new_access >= actor->access && !privileged)
{
- reply("CSMSG_NO_BUMP_ACCESS");
- return 0;
+ reply("CSMSG_NO_BUMP_ACCESS");
+ return 0;
}
+ /* Trying to clvl a equal/higher user? */
+ if(!real_actor || (real_actor->access <= victim->access && handle != user->handle_info))
+ override = CMD_LOG_OVERRIDE;
+ /* Trying to clvl someone to equal/higher access? */
+ if(!real_actor || new_access >= real_actor->access)
+ override = CMD_LOG_OVERRIDE;
+ /* Helpers clvling themselves get caught by the "clvl someone to equal/higher access" check.
+ * If they lower their own access it's not a big problem.
+ */
+
victim->access = new_access;
reply("CSMSG_CHANGED_ACCESS", handle->handle, new_access, channel->name);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_deluser)
{
struct handle_info *handle;
struct userData *victim;
- struct userData *actor;
- unsigned short access;
+ struct userData *actor, *real_actor;
+ unsigned short access, override = 0;
char *chan_name;
REQUIRE_PARAMS(2);
actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(handle = modcmd_get_handle_info(user, argv[argc-1])))
return 0;
if(!(victim = GetTrueChannelAccess(channel->channel_info, handle)))
{
- reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
- return 0;
+ reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
+ return 0;
}
if(argc > 2)
reply("CSMSG_INVALID_ACCESS", argv[1]);
return 0;
}
- if(access != victim->access)
- {
- reply("CSMSG_INCORRECT_ACCESS", handle->handle, victim->access, argv[1]);
- return 0;
- }
+ if(access != victim->access)
+ {
+ reply("CSMSG_INCORRECT_ACCESS", handle->handle, victim->access, argv[1]);
+ return 0;
+ }
}
else
{
if((actor->access <= victim->access) && !IsHelping(user))
{
- reply("MSG_USER_OUTRANKED", victim->handle->handle);
- return 0;
+ reply("MSG_USER_OUTRANKED", victim->handle->handle);
+ return 0;
}
+ /* If people delete themselves it is an override, but they
+ * could've used deleteme so we don't log it as an override
+ */
+ if(!real_actor || (real_actor->access <= victim->access && real_actor != victim))
+ override = CMD_LOG_OVERRIDE;
+
chan_name = strdup(channel->name);
del_channel_user(victim, 1);
reply("CSMSG_DELETED_USER", handle->handle, access, chan_name);
free(chan_name);
- return 1;
+ return 1 | override;
}
static int
cmd_mdel_user(struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, char *mask, struct svccmd *cmd)
{
- struct userData *actor, *uData, *next;
+ struct userData *actor, *real_actor, *uData, *next;
+ unsigned int override = 0;
actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(min_access > max_access)
{
if((actor->access <= max_access) && !IsHelping(user))
{
- reply("CSMSG_NO_ACCESS");
- return 0;
+ reply("CSMSG_NO_ACCESS");
+ return 0;
}
+ if(!real_actor || real_actor->access <= max_access)
+ override = CMD_LOG_OVERRIDE;
+
for(uData = channel->channel_info->users; uData; uData = next)
{
- next = uData->next;
+ next = uData->next;
- if((uData->access >= min_access)
+ if((uData->access >= min_access)
&& (uData->access <= max_access)
&& match_ircglob(uData->handle->handle, mask))
- del_channel_user(uData, 1);
+ del_channel_user(uData, 1);
}
reply("CSMSG_DELETED_USERS", mask, min_access, max_access, channel->name);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_mdelowner)
struct banData *bData, *next;
char interval[INTERVALLEN];
unsigned int count;
- time_t limit;
+ unsigned long limit;
count = 0;
limit = now - duration;
for(bData = channel->channel_info->bans; bData; bData = next)
{
- next = bData->next;
+ next = bData->next;
if((bData->triggered && bData->triggered >= limit) || (bData->set && bData->set >= limit))
continue;
}
static int
-cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, unsigned long duration)
+cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, unsigned long duration, int vacation)
{
struct userData *actor, *uData, *next;
char interval[INTERVALLEN];
unsigned int count;
- time_t limit;
+ unsigned long limit;
- actor = GetChannelUser(channel->channel_info, user->handle_info);
+ actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(min_access > max_access)
{
send_message(user, chanserv, "CSMSG_BAD_RANGE", min_access, max_access);
return 0;
}
- if((actor->access <= max_access) && !IsHelping(user))
+ if(!actor || actor->access <= max_access)
{
- send_message(user, chanserv, "CSMSG_NO_ACCESS");
- return 0;
+ send_message(user, chanserv, "CSMSG_NO_ACCESS");
+ return 0;
}
count = 0;
limit = now - duration;
for(uData = channel->channel_info->users; uData; uData = next)
{
- next = uData->next;
+ next = uData->next;
- if((uData->seen > limit) || uData->present)
- continue;
+ if((uData->seen > limit)
+ || uData->present
+ || (HANDLE_FLAGGED(uData->handle, FROZEN) && !vacation))
+ continue;
- if(((uData->access >= min_access) && (uData->access <= max_access))
+ if(((uData->access >= min_access) && (uData->access <= max_access))
|| (!max_access && (uData->access < actor->access)))
- {
- del_channel_user(uData, 1);
- count++;
- }
+ {
+ del_channel_user(uData, 1);
+ count++;
+ }
}
if(!max_access)
{
unsigned long duration;
unsigned short min_level, max_level;
+ int vacation;
REQUIRE_PARAMS(3);
+ vacation = argc > 3 && !strcmp(argv[3], "vacation");
duration = ParseInterval(argv[2]);
if(duration < 60)
{
- reply("CSMSG_CANNOT_TRIM");
- return 0;
+ reply("CSMSG_CANNOT_TRIM");
+ return 0;
}
if(!irccasecmp(argv[1], "bans"))
{
- cmd_trim_bans(user, channel, duration);
- return 1;
+ cmd_trim_bans(user, channel, duration);
+ return 1;
}
else if(!irccasecmp(argv[1], "users"))
{
- cmd_trim_users(user, channel, 0, 0, duration);
- return 1;
+ cmd_trim_users(user, channel, 0, 0, duration, vacation);
+ return 1;
}
else if(parse_level_range(&min_level, &max_level, argv[1]))
{
- cmd_trim_users(user, channel, min_level, max_level, duration);
- return 1;
+ cmd_trim_users(user, channel, min_level, max_level, duration, vacation);
+ return 1;
}
else if((min_level = user_level_from_name(argv[1], UL_OWNER)))
{
- cmd_trim_users(user, channel, min_level, min_level, duration);
- return 1;
+ cmd_trim_users(user, channel, min_level, min_level, duration, vacation);
+ return 1;
}
else
{
{
if(argc)
reply("MSG_CHANNEL_ABSENT", channel->name);
- return 0;
+ return 0;
}
uData = GetChannelAccess(channel->channel_info, user->handle_info);
{
if(argc)
reply("MSG_CHANNEL_ABSENT", channel->name);
- return 0;
+ return 0;
}
if(!change.args[0].u.member->modes)
{
if(argc)
reply("CSMSG_ALREADY_DOWN", channel->name);
- return 0;
+ return 0;
}
change.args[0].mode = MODE_REMOVE | change.args[0].u.member->modes;
for(cList = user->handle_info->channels; cList; cList = cList->u_next)
{
- if(IsSuspended(cList->channel)
+ if(IsSuspended(cList->channel)
|| IsUserSuspended(cList)
|| !GetUserMode(cList->channel->channel, user))
- continue;
+ continue;
- mcmd(user, cList->channel->channel, 0, NULL, cmd);
+ mcmd(user, cList->channel->channel, 0, NULL, cmd);
}
return 1;
for(ii=valid=0; ++ii < argc; )
{
- if(!(victim = GetUserH(argv[ii])))
+ if(!(victim = GetUserH(argv[ii])))
continue;
change->args[valid].mode = mode;
change->args[valid].u.member = GetUserMode(channel, victim);
if(!change->args[valid].u.member)
continue;
if(validate && !validate(user, channel, victim))
- continue;
+ continue;
valid++;
}
change->argc = valid;
if(valid < (argc-1))
- reply("CSMSG_PROCESS_FAILED");
+ reply("CSMSG_PROCESS_FAILED");
if(valid)
{
modcmd_chanmode_announce(change);
REQUIRE_PARAMS(offset);
if(argc > offset)
{
- reason = unsplit_string(argv + offset, argc - offset, NULL);
+ reason = unsplit_string(argv + offset, argc - offset, NULL);
if(strlen(reason) > (TOPICLEN - (NICKLEN + 3)))
{
/* Truncate the reason to a length of TOPICLEN, as
and the kicker's nick. */
sprintf(reason + (TOPICLEN - (NICKLEN + 6)), "...");
}
- }
+ }
+
+ if((victim = GetUserH(argv[1])))
+ {
+ victims = alloca(sizeof(victims[0]));
+ victims[0] = GetUserMode(channel, victim);
+ /* XXX: The comparison with ACTION_KICK is just because all
+ * other actions can work on users outside the channel, and we
+ * want to allow those (e.g. unbans) in that case. If we add
+ * some other ejection action for in-channel users, change
+ * this too. */
+ victimCount = victims[0] ? 1 : 0;
+
+ if(IsService(victim))
+ {
+ reply("MSG_SERVICE_IMMUNE", victim->nick);
+ return 0;
+ }
+
+ if((action == ACTION_KICK) && !victimCount)
+ {
+ reply("MSG_CHANNEL_USER_ABSENT", victim->nick, channel->name);
+ return 0;
+ }
+
+ if(protect_user(victim, user, channel->channel_info))
+ {
+ reply("CSMSG_USER_PROTECTED", victim->nick);
+ return 0;
+ }
- if((victim = GetUserH(argv[1])))
+ ban = generate_hostmask(victim, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT);
+ name = victim->nick;
+ }
+ else if(!is_ircmask(argv[1]) && (*argv[1] == '*'))
{
- victims = alloca(sizeof(victims[0]));
- victims[0] = GetUserMode(channel, victim);
- /* XXX: The comparison with ACTION_KICK is just because all
- * other actions can work on users outside the channel, and we
- * want to allow those (e.g. unbans) in that case. If we add
- * some other ejection action for in-channel users, change
- * this too. */
- victimCount = victims[0] ? 1 : 0;
+ struct handle_info *hi;
+ char banmask[NICKLEN + USERLEN + HOSTLEN + 3];
+ const char *accountname = argv[1] + 1;
+
+ if(!(hi = get_handle_info(accountname)))
+ {
+ reply("MSG_HANDLE_UNKNOWN", accountname);
+ return 0;
+ }
- if(IsService(victim))
- {
- reply("MSG_SERVICE_IMMUNE", victim->nick);
- return 0;
- }
+ snprintf(banmask, sizeof(banmask), "*!*@%s.*", hi->handle);
+ victims = alloca(sizeof(victims[0]) * channel->members.used);
- if((action == ACTION_KICK) && !victimCount)
+ if(bad_channel_ban(channel, user, banmask, &victimCount, victims))
{
- reply("MSG_CHANNEL_USER_ABSENT", victim->nick, channel->name);
+ reply("CSMSG_MASK_PROTECTED", banmask);
return 0;
}
- if(protect_user(victim, user, channel->channel_info))
- {
- reply("CSMSG_USER_PROTECTED", victim->nick);
- return 0;
- }
+ if((action == ACTION_KICK) && (victimCount == 0))
+ {
+ reply("CSMSG_NO_MATCHING_USERS", channel->name, banmask);
+ return 0;
+ }
- ban = generate_hostmask(victim, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT);
- name = victim->nick;
+ name = ban = strdup(banmask);
}
else
{
- if(!is_ircmask(argv[1]))
- {
- reply("MSG_NICK_UNKNOWN", argv[1]);
- return 0;
- }
+ if(!is_ircmask(argv[1]))
+ {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
- victims = alloca(sizeof(victims[0]) * channel->members.used);
+ victims = alloca(sizeof(victims[0]) * channel->members.used);
if(bad_channel_ban(channel, user, argv[1], &victimCount, victims))
{
- reply("CSMSG_MASK_PROTECTED", argv[1]);
- return 0;
- }
+ reply("CSMSG_MASK_PROTECTED", argv[1]);
+ return 0;
+ }
if((victimCount > 4) && ((victimCount * 3) > channel->members.used) && !IsOper(user))
{
return 0;
}
- name = ban = strdup(argv[1]);
+ name = ban = strdup(argv[1]);
}
/* Truncate the ban in place if necessary; we must ensure
if(action & ACTION_ADD_BAN)
{
- struct banData *bData, *next;
-
- if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans)
- {
- reply("CSMSG_MAXIMUM_BANS", chanserv_conf.max_chan_bans);
- free(ban);
- return 0;
- }
-
- if(action & ACTION_ADD_TIMED_BAN)
- {
- duration = ParseInterval(argv[2]);
-
- if(duration < 15)
- {
- reply("CSMSG_DURATION_TOO_LOW");
- free(ban);
- return 0;
- }
- else if(duration > (86400 * 365 * 2))
- {
- reply("CSMSG_DURATION_TOO_HIGH");
- free(ban);
- return 0;
- }
- }
-
- for(bData = channel->channel_info->bans; bData; bData = next)
- {
- if(match_ircglobs(bData->mask, ban))
- {
- int exact = !irccasecmp(bData->mask, ban);
-
- /* The ban is redundant; there is already a ban
- with the same effect in place. */
- if(exact)
- {
- if(bData->reason)
+ struct banData *bData, *next;
+
+ if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans)
+ {
+ reply("CSMSG_MAXIMUM_BANS", chanserv_conf.max_chan_bans);
+ free(ban);
+ return 0;
+ }
+
+ if(action & ACTION_ADD_TIMED_BAN)
+ {
+ duration = ParseInterval(argv[2]);
+
+ if(duration < 15)
+ {
+ reply("CSMSG_DURATION_TOO_LOW");
+ free(ban);
+ return 0;
+ }
+ else if(duration > (86400 * 365 * 2))
+ {
+ reply("CSMSG_DURATION_TOO_HIGH");
+ free(ban);
+ return 0;
+ }
+ }
+
+ for(bData = channel->channel_info->bans; bData; bData = next)
+ {
+ if(match_ircglobs(bData->mask, ban))
+ {
+ int exact = !irccasecmp(bData->mask, ban);
+
+ /* The ban is redundant; there is already a ban
+ with the same effect in place. */
+ if(exact)
+ {
+ if(bData->reason)
free(bData->reason);
- bData->reason = strdup(reason);
+ bData->reason = strdup(reason);
safestrncpy(bData->owner, (user->handle_info ? user->handle_info->handle : user->nick), sizeof(bData->owner));
if(cmd)
reply("CSMSG_REASON_CHANGE", ban);
- if(!bData->expires)
+ if(!bData->expires)
goto post_add_ban;
- }
- if(exact && bData->expires)
- {
- int reset = 0;
-
- /* If the ban matches an existing one exactly,
- extend the expiration time if the provided
- duration is longer. */
- if(duration && ((time_t)(now + duration) > bData->expires))
- {
- bData->expires = now + duration;
- reset = 1;
- }
- else if(!duration)
- {
- bData->expires = 0;
- reset = 1;
- }
-
- if(reset)
- {
- /* Delete the expiration timeq entry and
- requeue if necessary. */
- timeq_del(0, expire_ban, bData, TIMEQ_IGNORE_WHEN);
-
- if(bData->expires)
- timeq_add(bData->expires, expire_ban, bData);
+ }
+ if(exact && bData->expires)
+ {
+ int reset = 0;
+
+ /* If the ban matches an existing one exactly,
+ extend the expiration time if the provided
+ duration is longer. */
+ if(duration && (now + duration > bData->expires))
+ {
+ bData->expires = now + duration;
+ reset = 1;
+ }
+ else if(!duration)
+ {
+ bData->expires = 0;
+ reset = 1;
+ }
+
+ if(reset)
+ {
+ /* Delete the expiration timeq entry and
+ requeue if necessary. */
+ timeq_del(0, expire_ban, bData, TIMEQ_IGNORE_WHEN);
+
+ if(bData->expires)
+ timeq_add(bData->expires, expire_ban, bData);
if(!cmd)
{
/* automated kickban */
}
- else if(duration)
- reply("CSMSG_BAN_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
- else
- reply("CSMSG_BAN_ADDED", name, channel->name);
-
- goto post_add_ban;
- }
- }
+ else if(duration)
+ reply("CSMSG_BAN_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
+ else
+ reply("CSMSG_BAN_ADDED", name, channel->name);
+
+ goto post_add_ban;
+ }
+ }
if(cmd)
reply("CSMSG_REDUNDANT_BAN", name, channel->name);
- free(ban);
- return 0;
- }
+ free(ban);
+ return 0;
+ }
- next = bData->next;
- if(match_ircglobs(ban, bData->mask))
- {
- /* The ban we are adding makes previously existing
- bans redundant; silently remove them. */
- del_channel_ban(bData);
- }
- }
+ next = bData->next;
+ if(match_ircglobs(ban, bData->mask))
+ {
+ /* The ban we are adding makes previously existing
+ bans redundant; silently remove them. */
+ del_channel_ban(bData);
+ }
+ }
- bData = add_channel_ban(channel->channel_info, ban, (user->handle_info ? user->handle_info->handle : user->nick), now, (victimCount ? now : 0), (duration ? now + duration : 0), reason);
+ bData = add_channel_ban(channel->channel_info, ban, (user->handle_info ? user->handle_info->handle : user->nick), now, (victimCount ? now : 0), (duration ? now + duration : 0), reason);
free(ban);
name = ban = strdup(bData->mask);
}
}
}
- post_add_ban:
+ post_add_ban:
if(action & ACTION_BAN)
{
- unsigned int exists;
+ unsigned int exists;
struct mod_chanmode *change;
- if(channel->banlist.used >= MAXBANS)
- {
+ if(channel->banlist.used >= MAXBANS)
+ {
if(cmd)
reply("CSMSG_BANLIST_FULL", channel->name);
- free(ban);
- return 0;
- }
+ free(ban);
+ return 0;
+ }
exists = ChannelBanExists(channel, ban);
change = mod_chanmode_alloc(victimCount + 1);
mod_chanmode_free(change);
if(exists && (action == ACTION_BAN))
- {
+ {
if(cmd)
reply("CSMSG_REDUNDANT_BAN", name, channel->name);
free(ban);
if(action & ACTION_KICK)
{
char kick_reason[MAXLEN];
- sprintf(kick_reason, "(%s) %s", user->nick, reason);
+ sprintf(kick_reason, "(%s) %s", user->nick, reason);
- for(n = 0; n < victimCount; n++)
- KickChannelUser(victims[n]->user, channel, chanserv, kick_reason);
+ for(n = 0; n < victimCount; n++)
+ KickChannelUser(victims[n]->user, channel, chanserv, kick_reason);
}
if(!cmd)
}
else if(action & ACTION_ADD_BAN)
{
- if(duration)
- reply("CSMSG_TIMED_BAN_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
- else
- reply("CSMSG_BAN_ADDED", name, channel->name);
+ if(duration)
+ reply("CSMSG_TIMED_BAN_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
+ else
+ reply("CSMSG_BAN_ADDED", name, channel->name);
}
else if((action & (ACTION_BAN | ACTION_KICK)) == (ACTION_BAN | ACTION_KICK))
- reply("CSMSG_KICK_BAN_DONE", name, channel->name);
+ reply("CSMSG_KICK_BAN_DONE", name, channel->name);
else if(action & ACTION_BAN)
- reply("CSMSG_BAN_DONE", name, channel->name);
+ reply("CSMSG_BAN_DONE", name, channel->name);
else if(action & ACTION_KICK && victimCount)
- reply("CSMSG_KICK_DONE", name, channel->name);
+ reply("CSMSG_KICK_DONE", name, channel->name);
free(ban);
return 1;
/* may want to allow a comma delimited list of users... */
if(!(actee = GetUserH(argv[1])))
{
- if(!is_ircmask(argv[1]))
- {
- reply("MSG_NICK_UNKNOWN", argv[1]);
- return 0;
- }
+ if(!is_ircmask(argv[1]) && *argv[1] == '*')
+ {
+ char banmask[NICKLEN + USERLEN + HOSTLEN + 3];
+ const char *accountname = argv[1] + 1;
- mask = strdup(argv[1]);
+ snprintf(banmask, sizeof(banmask), "*!*@%s.*", accountname);
+ mask = strdup(banmask);
+ }
+ else if(!is_ircmask(argv[1]))
+ {
+ reply("MSG_NICK_UNKNOWN", argv[1]);
+ return 0;
+ }
+ else
+ {
+ mask = strdup(argv[1]);
+ }
}
/* We don't sanitize the mask here because ircu
if(action & ACTION_DEL_BAN)
{
- struct banData *ban, *next;
+ struct banData *ban, *next;
- ban = channel->channel_info->bans;
- while(ban)
- {
- if(actee)
- for( ; ban && !user_matches_glob(actee, ban->mask,
+ ban = channel->channel_info->bans;
+ while(ban)
+ {
+ if(actee)
+ for( ; ban && !user_matches_glob(actee, ban->mask,
MATCH_USENICK | MATCH_VISIBLE);
- ban = ban->next);
- else
- for( ; ban && !match_ircglobs(mask, ban->mask);
- ban = ban->next);
- if(!ban)
+ ban = ban->next);
+ else
+ for( ; ban && !match_ircglobs(mask, ban->mask);
+ ban = ban->next);
+ if(!ban)
break;
- next = ban->next;
- del_channel_ban(ban);
- ban = next;
- acted = 1;
- }
+ next = ban->next;
+ del_channel_ban(ban);
+ ban = next;
+ acted = 1;
+ }
}
if(!acted)
- reply("CSMSG_BAN_NOT_FOUND", actee ? actee->nick : mask);
+ reply("CSMSG_BAN_NOT_FOUND", actee ? actee->nick : mask);
else
- reply("CSMSG_BAN_REMOVED", actee ? actee->nick : mask);
+ reply("CSMSG_BAN_REMOVED", actee ? actee->nick : mask);
if(mask)
free(mask);
return 1;
/* remove permanent bans if the user has the proper access. */
if(uData->access >= UL_MASTER)
- flags |= ACTION_DEL_BAN;
+ flags |= ACTION_DEL_BAN;
argv[1] = user->nick;
return unban_user(user, channel, 2, argv, cmd, flags);
if(!channel->banlist.used)
{
- reply("CSMSG_NO_BANS", channel->name);
- return 0;
+ reply("CSMSG_NO_BANS", channel->name);
+ return 0;
}
change = mod_chanmode_alloc(channel->banlist.used);
if(argc < 2)
{
- target = user;
+ target = user;
target_handle = target->handle_info;
}
else if((target = GetUserH(argv[1])))
if(target == chanserv)
{
- reply("CSMSG_IS_CHANSERV");
- return 1;
+ reply("CSMSG_IS_CHANSERV");
+ return 1;
}
if(!target_handle)
reply("CSMSG_LAZY_SMURF_TARGET", target->nick, chanserv_conf.irc_operator_epithet);
return 0;
}
- if(target != user)
- {
- reply("MSG_USER_AUTHENTICATE", target->nick);
- return 0;
- }
+ if(target != user)
+ {
+ reply("MSG_USER_AUTHENTICATE", target->nick);
+ return 0;
+ }
reply("MSG_AUTHENTICATE");
return 0;
}
if(IsOper(target))
{
epithet = chanserv_conf.irc_operator_epithet;
- type = "IRCOp";
+ type = user_find_message(user, "CSMSG_OPERATOR_TITLE");
}
else if(IsNetworkHelper(target))
{
epithet = chanserv_conf.network_helper_epithet;
- type = "network helper";
+ type = user_find_message(user, "CSMSG_UC_H_TITLE");
}
else if(IsSupportHelper(target))
{
epithet = chanserv_conf.support_helper_epithet;
- type = "support helper";
+ type = user_find_message(user, "CSMSG_LC_H_TITLE");
}
if(epithet)
{
if(user->handle_info)
{
- switch(user->handle_info->userlist_style)
- {
- case HI_STYLE_DEF: send_list = def_list; break;
+ switch(user->handle_info->userlist_style)
+ {
+ case HI_STYLE_DEF: send_list = def_list; break;
case HI_STYLE_ZOOT: send_list = def_list; break;
- }
+ }
}
lData.users = alloca(channel->channel_info->userCount * sizeof(struct userData *));
matches = 0;
for(uData = channel->channel_info->users; uData; uData = uData->next)
{
- if((uData->access < lowest)
+ if((uData->access < lowest)
|| (uData->access > highest)
|| (lData.search && !match_ircglob(uData->handle->handle, lData.search)))
- continue;
- lData.users[matches++] = uData;
+ continue;
+ lData.users[matches++] = uData;
}
qsort(lData.users, matches, sizeof(lData.users[0]), userData_access_comp);
static CHANSERV_FUNC(cmd_bans)
{
+ struct userNode *search_u = NULL;
struct helpfile_table tbl;
- unsigned int matches = 0, timed = 0, ii;
+ unsigned int matches = 0, timed = 0, search_wilds = 0, ii;
char t_buffer[INTERVALLEN], e_buffer[INTERVALLEN], *search;
const char *msg_never, *triggered, *expires;
struct banData *ban, **bans;
- if(argc > 1)
- search = argv[1];
- else
+ if(argc < 2)
search = NULL;
+ else if(strchr(search = argv[1], '!'))
+ {
+ search = argv[1];
+ search_wilds = search[strcspn(search, "?*")];
+ }
+ else if(!(search_u = GetUserH(search)))
+ reply("MSG_NICK_UNKNOWN", search);
bans = alloca(channel->channel_info->banCount * sizeof(struct banData *));
for(ban = channel->channel_info->bans; ban; ban = ban->next)
{
- if(search && !match_ircglobs(search, ban->mask))
- continue;
- bans[matches++] = ban;
- if(ban->expires)
+ if(search_u)
+ {
+ if(!user_matches_glob(search_u, ban->mask, MATCH_USENICK | MATCH_VISIBLE))
+ continue;
+ }
+ else if(search)
+ {
+ if(search_wilds ? !match_ircglobs(search, ban->mask) : !match_ircglob(search, ban->mask))
+ continue;
+ }
+ bans[matches++] = ban;
+ if(ban->expires)
timed = 1;
}
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;
+ return 0;
}
msg_never = user_find_message(user, "MSG_NEVER");
for(ii = 0; ii < matches; )
{
- ban = bans[ii];
+ ban = bans[ii];
- if(!timed)
- expires = "";
- else if(ban->expires)
- expires = intervalString(e_buffer, ban->expires - now, user->handle_info);
- else
- expires = msg_never;
+ if(!timed)
+ expires = "";
+ else if(ban->expires)
+ expires = intervalString(e_buffer, ban->expires - now, user->handle_info);
+ else
+ expires = msg_never;
- if(ban->triggered)
- triggered = intervalString(t_buffer, now - ban->triggered, user->handle_info);
- else
- triggered = msg_never;
+ if(ban->triggered)
+ triggered = intervalString(t_buffer, now - ban->triggered, user->handle_info);
+ else
+ triggered = msg_never;
tbl.contents[++ii] = malloc(tbl.width * sizeof(tbl.contents[0][0]));
tbl.contents[ii][0] = ban->mask;
cData = channel->channel_info;
if(argc < 2)
{
- if(cData->topic)
- {
- SetChannelTopic(channel, chanserv, cData->topic, 1);
- reply("CSMSG_TOPIC_SET", cData->topic);
+ if(cData->topic)
+ {
+ SetChannelTopic(channel, chanserv, cData->topic, 1);
+ reply("CSMSG_TOPIC_SET", cData->topic);
return 1;
- }
+ }
reply("CSMSG_NO_TOPIC", channel->name);
return 0;
if(argc < 2)
{
change = &channel->channel_info->modes;
- if(change->modes_set || change->modes_clear) {
+ if(change->modes_set || change->modes_clear) {
modcmd_chanmode_announce(change);
reply("CSMSG_DEFAULTED_MODES", channel->name);
- } else
- reply("CSMSG_NO_MODES", channel->name);
- return 1;
+ } else
+ reply("CSMSG_NO_MODES", channel->name);
+ return 1;
}
uData = GetChannelUser(channel->channel_info, user->handle_info);
change = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_REGISTERED, base_oplevel);
if(!change)
{
- reply("MSG_INVALID_MODES", unsplit_string(argv+1, argc-1, NULL));
- return 0;
+ reply("MSG_INVALID_MODES", unsplit_string(argv+1, argc-1, NULL));
+ return 0;
}
if(!check_user_level(channel, user, lvlEnfModes, 1, 0)
if(argc > 1)
{
if(!(invite = GetUserH(argv[1])))
- {
+ {
reply("MSG_NICK_UNKNOWN", argv[1]);
return 0;
}
if(GetUserMode(channel, invite))
{
- reply("CSMSG_ALREADY_PRESENT", invite->nick, channel->name);
- return 0;
+ reply("CSMSG_ALREADY_PRESENT", invite->nick, channel->name);
+ return 0;
}
if(user != invite)
}
irc_invite(chanserv, invite, channel);
if(argc > 1)
- reply("CSMSG_INVITED_USER", argv[1], channel->name);
+ reply("CSMSG_INVITED_USER", argv[1], channel->name);
return 1;
}
{
if(GetUserMode(channel, user))
{
- reply("CSMSG_YOU_ALREADY_PRESENT", channel->name);
- return 0;
+ reply("CSMSG_YOU_ALREADY_PRESENT", channel->name);
+ return 0;
}
if(channel->channel_info
&& !check_user_level(channel, user, lvlInviteMe, 1, 0))
if(uData && (uData->access >= cData->lvlOpts[lvlGiveOps]))
{
mod_chanmode_format(&cData->modes, modes);
- reply("CSMSG_CHANNEL_TOPIC", cData->topic);
- reply("CSMSG_CHANNEL_MODES", modes[0] ? modes : user_find_message(user, "MSG_NONE"));
+ reply("CSMSG_CHANNEL_TOPIC", cData->topic);
+ reply("CSMSG_CHANNEL_MODES", modes[0] ? modes : user_find_message(user, "MSG_NONE"));
}
for(it = dict_first(cData->notes); it; it = iter_next(it))
static CHANSERV_FUNC(cmd_netinfo)
{
- extern time_t boot_time;
+ extern unsigned long boot_time;
extern unsigned long burst_length;
char interval[INTERVALLEN];
table.contents = alloca(channel->members.used*sizeof(*table.contents));
for(n = 0; n < channel->members.used; n++)
{
- mn = channel->members.list[n];
- if(!(mn->modes & MODE_CHANOP) || IsLocal(mn->user))
+ mn = channel->members.list[n];
+ if(!(mn->modes & MODE_CHANOP) || IsLocal(mn->user))
continue;
table.contents[table.length] = alloca(sizeof(**table.contents));
table.contents[table.length][0] = mn->user->nick;
static MODCMD_FUNC(cmd_wipeinfo)
{
struct handle_info *victim;
- struct userData *ud, *actor;
+ struct userData *ud, *actor, *real_actor;
+ unsigned int override = 0;
REQUIRE_PARAMS(2);
actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(victim = modcmd_get_handle_info(user, argv[1])))
return 0;
if(!(ud = GetTrueChannelAccess(channel->channel_info, victim)))
reply("MSG_USER_OUTRANKED", victim->handle);
return 0;
}
+ if((ud != real_actor) && (!real_actor || (ud->access >= real_actor->access)))
+ override = CMD_LOG_OVERRIDE;
if(ud->info)
free(ud->info);
ud->info = NULL;
reply("CSMSG_WIPED_INFO_LINE", argv[1], channel->name);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_resync)
if(!irccasecmp(argv[1], chanserv->nick))
{
- reply("CSMSG_IS_CHANSERV");
- return 1;
+ reply("CSMSG_IS_CHANSERV");
+ return 1;
}
if(!(handle = get_handle_info(argv[1])))
{
- reply("MSG_HANDLE_UNKNOWN", argv[1]);
- return 0;
+ reply("MSG_HANDLE_UNKNOWN", argv[1]);
+ return 0;
}
if(!(uData = GetTrueChannelAccess(channel->channel_info, handle)))
{
- reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
- return 0;
+ reply("CSMSG_NO_CHAN_USER", handle->handle, channel->name);
+ return 0;
}
if(uData->present)
- reply("CSMSG_USER_PRESENT", handle->handle);
+ reply("CSMSG_USER_PRESENT", handle->handle);
else if(uData->seen)
reply("CSMSG_USER_SEEN", handle->handle, channel->name, intervalString(seen, now - uData->seen, user->handle_info));
else
reply("CSMSG_EVENT_SEARCH_RESULTS");
matches = log_entry_search(&discrim, log_report_entry, &report);
if(matches)
- reply("MSG_MATCH_COUNT", matches);
+ reply("MSG_MATCH_COUNT", matches);
else
- reply("MSG_NO_MATCHES");
+ reply("MSG_NO_MATCHES");
return 1;
}
msg = unsplit_string(argv + 1, argc - 1, NULL);
send_channel_message(channel, cmd->parent->bot, "%s", msg);
}
+ else if(*argv[1] == '*' && argv[1][1] != '\0')
+ {
+ struct handle_info *hi;
+ struct userNode *authed;
+
+ REQUIRE_PARAMS(3);
+ msg = unsplit_string(argv + 2, argc - 2, NULL);
+
+ if (!(hi = get_handle_info(argv[1] + 1)))
+ {
+ reply("MSG_HANDLE_UNKNOWN", argv[1] + 1);
+ return 0;
+ }
+
+ for (authed = hi->users; authed; authed = authed->next_authed)
+ send_target_message(5, authed->nick, cmd->parent->bot, "%s", msg);
+ }
else if(GetUserH(argv[1]))
{
REQUIRE_PARAMS(3);
msg = unsplit_string(argv + 1, argc - 1, NULL);
send_channel_message(channel, cmd->parent->bot, "\001ACTION %s\001", msg);
}
+ else if(*argv[1] == '*' && argv[1][1] != '\0')
+ {
+ struct handle_info *hi;
+ struct userNode *authed;
+
+ REQUIRE_PARAMS(3);
+ msg = unsplit_string(argv + 2, argc - 2, NULL);
+
+ if (!(hi = get_handle_info(argv[1] + 1)))
+ {
+ reply("MSG_HANDLE_UNKNOWN", argv[1] + 1);
+ return 0;
+ }
+
+ for (authed = hi->users; authed; authed = authed->next_authed)
+ send_target_message(5, authed->nick, cmd->parent->bot, "\001ACTION %s\001", msg);
+ }
else if(GetUserH(argv[1]))
{
msg = unsplit_string(argv + 2, argc - 2, NULL);
{
struct suspended *suspended;
char reason[MAXLEN];
- time_t expiry, duration;
+ unsigned long expiry, duration;
struct userData *uData;
REQUIRE_PARAMS(3);
argv[1]++;
else if(IsSuspended(channel->channel_info))
{
- reply("CSMSG_ALREADY_SUSPENDED", channel->name);
+ reply("CSMSG_ALREADY_SUSPENDED", channel->name);
show_suspension_info(cmd, user, channel->channel_info->suspended);
- return 0;
+ return 0;
}
if(!strcmp(argv[1], "0"))
char *name;
char *registrar;
- time_t unvisited;
- time_t registered;
+ unsigned long unvisited;
+ unsigned long registered;
unsigned long flags;
unsigned int limit;
for(i = 0; i < argc; i++)
{
- /* Assume all criteria require arguments. */
- if(i == (argc - 1))
- {
- send_message(user, chanserv, "MSG_MISSING_PARAMS", argv[i]);
+ /* Assume all criteria require arguments. */
+ if(i == (argc - 1))
+ {
+ send_message(user, chanserv, "MSG_MISSING_PARAMS", argv[i]);
+ goto fail;
+ }
+
+ if(!irccasecmp(argv[i], "name"))
+ search->name = argv[++i];
+ else if(!irccasecmp(argv[i], "registrar"))
+ search->registrar = argv[++i];
+ else if(!irccasecmp(argv[i], "unvisited"))
+ search->unvisited = ParseInterval(argv[++i]);
+ else if(!irccasecmp(argv[i], "registered"))
+ search->registered = ParseInterval(argv[++i]);
+ else if(!irccasecmp(argv[i], "flags"))
+ {
+ i++;
+ if(!irccasecmp(argv[i], "nodelete"))
+ search->flags |= CHANNEL_NODELETE;
+ else if(!irccasecmp(argv[i], "suspended"))
+ search->flags |= CHANNEL_SUSPENDED;
+ else if(!irccasecmp(argv[i], "unreviewed"))
+ search->flags |= CHANNEL_UNREVIEWED;
+ else
+ {
+ send_message(user, chanserv, "CSMSG_INVALID_CFLAG", argv[i]);
+ goto fail;
+ }
+ }
+ else if(!irccasecmp(argv[i], "limit"))
+ search->limit = strtoul(argv[++i], NULL, 10);
+ else
+ {
+ send_message(user, chanserv, "MSG_INVALID_CRITERIA", argv[i]);
goto fail;
- }
-
- if(!irccasecmp(argv[i], "name"))
- search->name = argv[++i];
- else if(!irccasecmp(argv[i], "registrar"))
- search->registrar = argv[++i];
- else if(!irccasecmp(argv[i], "unvisited"))
- search->unvisited = ParseInterval(argv[++i]);
- else if(!irccasecmp(argv[i], "registered"))
- search->registered = ParseInterval(argv[++i]);
- else if(!irccasecmp(argv[i], "flags"))
- {
- i++;
- if(!irccasecmp(argv[i], "nodelete"))
- search->flags |= CHANNEL_NODELETE;
- else if(!irccasecmp(argv[i], "suspended"))
- search->flags |= CHANNEL_SUSPENDED;
- else
- {
- send_message(user, chanserv, "CSMSG_INVALID_CFLAG", argv[i]);
- goto fail;
- }
- }
- else if(!irccasecmp(argv[i], "limit"))
- search->limit = strtoul(argv[++i], NULL, 10);
- else
- {
- send_message(user, chanserv, "MSG_INVALID_CRITERIA", argv[i]);
- goto fail;
- }
+ }
}
if(search->name && !strcmp(search->name, "*"))
- search->name = 0;
+ search->name = 0;
if(search->registrar && !strcmp(search->registrar, "*"))
- search->registrar = 0;
+ search->registrar = 0;
return search;
fail:
(search->unvisited && (now - channel->visited) < search->unvisited) ||
(search->registered && (now - channel->registered) > search->registered) ||
(search->flags && ((search->flags & channel->flags) != search->flags)))
- return 0;
+ return 0;
return 1;
}
for(channel = channelList; channel && matches < search->limit; channel = channel->next)
{
- if(!chanserv_channel_match(channel, search))
+ if(!chanserv_channel_match(channel, search))
continue;
- matches++;
- smf(channel, data);
+ matches++;
+ smf(channel, data);
}
return matches;
REQUIRE_PARAMS(3);
if(!irccasecmp(argv[1], "count"))
- action = search_count;
+ action = search_count;
else if(!irccasecmp(argv[1], "print"))
- action = search_print;
+ action = search_print;
else
{
- reply("CSMSG_ACTION_INVALID", argv[1]);
- return 0;
+ reply("CSMSG_ACTION_INVALID", argv[1]);
+ return 0;
}
search = chanserv_search_create(user, argc - 2, argv + 2);
return 0;
if(action == search_count)
- search->limit = INT_MAX;
+ search->limit = INT_MAX;
if(action == search_print)
- reply("CSMSG_CHANNEL_SEARCH_RESULTS");
+ reply("CSMSG_CHANNEL_SEARCH_RESULTS");
matches = chanserv_channel_search(search, action, user);
if(matches)
- reply("MSG_MATCH_COUNT", matches);
+ reply("MSG_MATCH_COUNT", matches);
else
- reply("MSG_NO_MATCHES");
+ reply("MSG_NO_MATCHES");
free(search);
return 1;
static CHANSERV_FUNC(cmd_unvisited)
{
struct chanData *cData;
- time_t interval = chanserv_conf.channel_expire_delay;
+ unsigned long interval = chanserv_conf.channel_expire_delay;
char buffer[INTERVALLEN];
unsigned int limit = 25, matches = 0;
if(argc > 1)
{
- interval = ParseInterval(argv[1]);
- if(argc > 2)
+ interval = ParseInterval(argv[1]);
+ if(argc > 2)
limit = atoi(argv[2]);
}
for(cData = channelList; cData && matches < limit; cData = cData->next)
{
- if((now - cData->visited) < interval)
+ if((now - cData->visited) < interval)
continue;
- intervalString(buffer, now - cData->visited, user->handle_info);
- reply("CSMSG_UNVISITED_DATA", cData->channel->name, buffer);
- matches++;
+ intervalString(buffer, now - cData->visited, user->handle_info);
+ reply("CSMSG_UNVISITED_DATA", cData->channel->name, buffer);
+ matches++;
}
return 1;
return 0;
}
- topic = unsplit_string(argv+1, argc-1, NULL);
+ topic = unsplit_string(argv+1, argc-1, NULL);
free(channel->channel_info->topic);
- if(topic[0] == '*' && topic[1] == 0)
- {
+ if(topic[0] == '*' && topic[1] == 0)
+ {
topic = channel->channel_info->topic = NULL;
- }
- else
- {
- topic = channel->channel_info->topic = strdup(topic);
+ }
+ else
+ {
+ topic = channel->channel_info->topic = strdup(topic);
if(channel->channel_info->topic_mask
&& !match_ircglob(channel->channel_info->topic, channel->channel_info->topic_mask))
reply("CSMSG_TOPIC_MISMATCH", channel->name);
- }
+ }
SetChannelTopic(channel, chanserv, topic ? topic : "", 1);
}
return 0;
}
- mask = unsplit_string(argv+1, argc-1, NULL);
+ mask = unsplit_string(argv+1, argc-1, NULL);
if(cData->topic_mask)
free(cData->topic_mask);
- if(mask[0] == '*' && mask[1] == 0)
- {
- cData->topic_mask = 0;
- }
- else
- {
+ if(mask[0] == '*' && mask[1] == 0)
+ {
+ cData->topic_mask = 0;
+ }
+ else
+ {
cData->topic_mask = strdup(mask);
if(!cData->topic)
reply("CSMSG_MASK_BUT_NO_TOPIC", channel->name);
else if(!match_ircglob(cData->topic, cData->topic_mask))
reply("CSMSG_TOPIC_MISMATCH", channel->name);
- }
+ }
}
if(channel->channel_info->topic_mask)
char *previous;
previous = *data;
- if(greeting[0] == '*' && greeting[1] == 0)
- *data = NULL;
- else
- {
- unsigned int length = strlen(greeting);
- if(length > chanserv_conf.greeting_length)
- {
- reply("CSMSG_GREETING_TOO_LONG", length, chanserv_conf.greeting_length);
- return 0;
- }
- *data = strdup(greeting);
- }
+ if(greeting[0] == '*' && greeting[1] == 0)
+ *data = NULL;
+ else
+ {
+ unsigned int length = strlen(greeting);
+ if(length > chanserv_conf.greeting_length)
+ {
+ reply("CSMSG_GREETING_TOO_LONG", length, chanserv_conf.greeting_length);
+ return 0;
+ }
+ *data = strdup(greeting);
+ }
if(previous)
free(previous);
}
reply("CSMSG_NO_ACCESS");
return 0;
}
- if(argv[1][0] == '*' && argv[1][1] == 0)
- {
+ if(argv[1][0] == '*' && argv[1][1] == 0)
+ {
memset(&channel->channel_info->modes, 0, sizeof(channel->channel_info->modes));
- }
- else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_REGISTERED, 0)))
- {
+ }
+ else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_REGISTERED, 0)))
+ {
reply("CSMSG_INVALID_MODE_LOCK", unsplit_string(argv+1, argc-1, NULL));
return 0;
}
if(argc > 1)
{
- /* Set flag according to value. */
- if(enabled_string(argv[1]))
- {
- cData->flags |= mask;
- value = 1;
- }
- else if(disabled_string(argv[1]))
- {
- cData->flags &= ~mask;
- value = 0;
- }
- else
- {
- reply("MSG_INVALID_BINARY", argv[1]);
- return 0;
- }
+ /* Set flag according to value. */
+ if(enabled_string(argv[1]))
+ {
+ cData->flags |= mask;
+ value = 1;
+ }
+ else if(disabled_string(argv[1]))
+ {
+ cData->flags &= ~mask;
+ value = 0;
+ }
+ else
+ {
+ reply("MSG_INVALID_BINARY", argv[1]);
+ return 0;
+ }
}
else
{
- /* Find current option value. */
- value = (cData->flags & mask) ? 1 : 0;
+ /* Find current option value. */
+ value = (cData->flags & mask) ? 1 : 0;
}
if(value)
{
if((argc > 1) && (!IsOper(user) || !user->handle_info || (user->handle_info->opserv_level < chanserv_conf.nodelete_level)))
{
- reply("MSG_SETTING_PRIVILEGED", argv[0]);
- return 0;
+ reply("MSG_SETTING_PRIVILEGED", argv[0]);
+ return 0;
}
CHANNEL_BINARY_OPTION("CSMSG_SET_NODELETE", CHANNEL_NODELETE);
if(argc > 1)
{
- /* Set flag according to value. */
- if(enabled_string(argv[1]))
- {
+ /* Set flag according to value. */
+ if(enabled_string(argv[1]))
+ {
if(!IsOffChannel(cData))
DelChannelUser(chanserv, channel, "Going off-channel.", 0);
- cData->flags |= CHANNEL_OFFCHANNEL;
- value = 1;
- }
- else if(disabled_string(argv[1]))
- {
+ cData->flags |= CHANNEL_OFFCHANNEL;
+ value = 1;
+ }
+ else if(disabled_string(argv[1]))
+ {
if(IsOffChannel(cData))
{
struct mod_chanmode change;
change.args[0].u.member = AddChannelUser(chanserv, channel);
mod_chanmode_announce(chanserv, channel, &change);
}
- cData->flags &= ~CHANNEL_OFFCHANNEL;
- value = 0;
- }
- else
- {
- reply("MSG_INVALID_BINARY", argv[1]);
- return 0;
- }
+ cData->flags &= ~CHANNEL_OFFCHANNEL;
+ value = 0;
+ }
+ else
+ {
+ reply("MSG_INVALID_BINARY", argv[1]);
+ return 0;
+ }
}
else
{
- /* Find current option value. */
- value = (cData->flags & CHANNEL_OFFCHANNEL) ? 1 : 0;
+ /* Find current option value. */
+ value = (cData->flags & CHANNEL_OFFCHANNEL) ? 1 : 0;
}
if(value)
return 1;
}
+static MODCMD_FUNC(chan_opt_unreviewed)
+{
+ struct chanData *cData = channel->channel_info;
+ int value = (cData->flags & CHANNEL_UNREVIEWED) ? 1 : 0;
+
+ if(argc > 1)
+ {
+ int new_value;
+
+ /* The two directions can have different ACLs. */
+ if(enabled_string(argv[1]))
+ new_value = 1;
+ else if(disabled_string(argv[1]))
+ new_value = 0;
+ else
+ {
+ reply("MSG_INVALID_BINARY", argv[1]);
+ return 0;
+ }
+
+ if (new_value != value)
+ {
+ struct svccmd *subcmd;
+ char subcmd_name[32];
+
+ snprintf(subcmd_name, sizeof(subcmd_name), "%s %s", argv[0], (new_value ? "on" : "off"));
+ subcmd = dict_find(cmd->parent->commands, subcmd_name, NULL);
+ if(!subcmd)
+ {
+ reply("MSG_COMMAND_DISABLED", subcmd_name);
+ return 0;
+ }
+ else if(!svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY))
+ return 0;
+
+ if (new_value)
+ cData->flags |= CHANNEL_UNREVIEWED;
+ else
+ {
+ free(cData->registrar);
+ cData->registrar = strdup(user->handle_info->handle);
+ cData->flags &= ~CHANNEL_UNREVIEWED;
+ }
+ value = new_value;
+ }
+ }
+
+ if(value)
+ reply("CSMSG_SET_UNREVIEWED", user_find_message(user, "MSG_ON"));
+ else
+ reply("CSMSG_SET_UNREVIEWED", user_find_message(user, "MSG_OFF"));
+ return 1;
+}
+
static MODCMD_FUNC(chan_opt_defaults)
{
struct userData *uData;
reply("CSMSG_CONFIRM_DEFAULTS", channel->name, confirm);
return 0;
}
- cData->flags = CHANNEL_DEFAULT_FLAGS;
+ cData->flags = (CHANNEL_DEFAULT_FLAGS & ~CHANNEL_PRESERVED_FLAGS)
+ | (cData->flags & CHANNEL_PRESERVED_FLAGS);
cData->modes = chanserv_conf.default_modes;
for(lvlOpt = 0; lvlOpt < NUM_LEVEL_OPTIONS; ++lvlOpt)
cData->lvlOpts[lvlOpt] = levelOptions[lvlOpt].default_value;
}
value = user_level_from_name(argv[1], UL_OWNER+1);
if(!value && strcmp(argv[1], "0"))
- {
- reply("CSMSG_INVALID_ACCESS", argv[1]);
+ {
+ reply("CSMSG_INVALID_ACCESS", argv[1]);
return 0;
}
uData = GetChannelUser(cData, user->handle_info);
{
index = atoi(argv[1]);
- if(!isdigit(argv[1][0]) || (index < 0) || (index >= count))
- {
- reply("CSMSG_INVALID_NUMERIC", index);
+ if(!isdigit(argv[1][0]) || (index < 0) || (index >= count))
+ {
+ reply("CSMSG_INVALID_NUMERIC", index);
/* Show possible values. */
for(index = 0; index < count; index++)
reply(charOptions[option].format_name, index, user_find_message(user, charOptions[option].values[index].format_name));
- return 0;
- }
+ return 0;
+ }
- cData->chOpts[option] = charOptions[option].values[index].value;
+ cData->chOpts[option] = charOptions[option].values[index].value;
}
else
{
- /* Find current option value. */
+ /* Find current option value. */
find_value:
- for(index = 0;
+ for(index = 0;
(index < count) && (cData->chOpts[option] != charOptions[option].values[index].value);
index++);
if(index == count)
if(argc < 2)
{
- reply("CSMSG_CHANNEL_OPTIONS");
+ reply("CSMSG_CHANNEL_OPTIONS");
for(ii = 0; ii < set_shows_list.used; ii++)
{
subcmd = set_shows_list.list[ii];
subcmd->command->func(user, channel, 1, argv+1, subcmd);
}
- return 1;
+ return 1;
}
sprintf(buf, "%s %s", argv[0], argv[1]);
return 0;
}
+ argv[0] = "";
+ argv[1] = buf;
return subcmd->command->func(user, channel, argc - 1, argv + 1, subcmd);
}
if(argc < 2)
{
- /* Just show current option value. */
+ /* Just show current option value. */
}
else if(enabled_string(argv[1]))
{
if(!uData)
{
- /* If they got past the command restrictions (which require access)
+ /* If they got past the command restrictions (which require access)
* but fail this test, we have some fool with security override on.
*/
- reply("CSMSG_NOT_USER", channel->name);
- return 0;
+ reply("CSMSG_NOT_USER", channel->name);
+ return 0;
}
if(argc > 1)
if(argc < 2)
{
- /* Do this so options are presented in a consistent order. */
- reply("CSMSG_USER_OPTIONS");
+ /* Do this so options are presented in a consistent order. */
+ reply("CSMSG_USER_OPTIONS");
for(ii = 0; ii < uset_shows_list.used; ii++)
uset_shows_list.list[ii]->command->func(user, channel, 1, argv+1, uset_shows_list.list[ii]);
- return 1;
+ return 1;
}
sprintf(buf, "%s %s", argv[0], argv[1]);
static CHANSERV_FUNC(cmd_giveownership)
{
struct handle_info *new_owner_hi;
- struct userData *new_owner, *curr_user;
+ struct userData *new_owner;
+ struct userData *curr_user;
+ struct userData *invoker;
struct chanData *cData = channel->channel_info;
struct do_not_register *dnr;
+ const char *confirm;
unsigned int force;
unsigned short co_access;
char reason[MAXLEN];
}
curr_user = owner;
}
- else if (!force && (now < (time_t)(cData->ownerTransfer + chanserv_conf.giveownership_period)))
+ else if(!force && (now < cData->ownerTransfer + chanserv_conf.giveownership_period))
{
char delay[INTERVALLEN];
intervalString(delay, cData->ownerTransfer + chanserv_conf.giveownership_period - now, user->handle_info);
{
if(force)
{
- new_owner = add_channel_user(cData, new_owner_hi, UL_COOWNER, 0, NULL);
+ new_owner = add_channel_user(cData, new_owner_hi, UL_OWNER - 1, 0, NULL);
}
else
{
chanserv_show_dnrs(user, cmd, NULL, new_owner_hi->handle);
return 0;
}
+ invoker = GetChannelUser(cData, user->handle_info);
+ if(invoker->access <= UL_OWNER)
+ {
+ confirm = make_confirmation_string(curr_user);
+ if((argc < 3) || strcmp(argv[2], confirm))
+ {
+ reply("CSMSG_CONFIRM_GIVEOWNERSHIP", new_owner_hi->handle, confirm);
+ return 0;
+ }
+ }
if(new_owner->access >= UL_COOWNER)
co_access = new_owner->access;
else
static CHANSERV_FUNC(cmd_suspend)
{
struct handle_info *hi;
- struct userData *self, *target;
+ struct userData *self, *real_self, *target;
+ unsigned int override = 0;
REQUIRE_PARAMS(2);
if(!(hi = modcmd_get_handle_info(user, argv[1]))) return 0;
self = GetChannelUser(channel->channel_info, user->handle_info);
+ real_self = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(target = GetTrueChannelAccess(channel->channel_info, hi)))
{
reply("CSMSG_NO_CHAN_USER", hi->handle, channel->name);
target->present = 0;
target->seen = now;
}
+ if(!real_self || target->access >= real_self->access)
+ override = CMD_LOG_OVERRIDE;
target->flags |= USER_SUSPENDED;
reply("CSMSG_USER_SUSPENDED", hi->handle, channel->name);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_unsuspend)
{
struct handle_info *hi;
- struct userData *self, *target;
+ struct userData *self, *real_self, *target;
+ unsigned int override = 0;
REQUIRE_PARAMS(2);
if(!(hi = modcmd_get_handle_info(user, argv[1]))) return 0;
self = GetChannelUser(channel->channel_info, user->handle_info);
+ real_self = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(target = GetTrueChannelAccess(channel->channel_info, hi)))
{
reply("CSMSG_NO_CHAN_USER", hi->handle, channel->name);
reply("CSMSG_NOT_SUSPENDED", hi->handle);
return 0;
}
+ if(!real_self || target->access >= real_self->access)
+ override = CMD_LOG_OVERRIDE;
target->flags &= ~USER_SUSPENDED;
scan_user_presence(target, NULL);
reply("CSMSG_USER_UNSUSPENDED", hi->handle, channel->name);
- return 1;
+ return 1 | override;
}
static MODCMD_FUNC(cmd_deleteme)
unsigned int ii;
for(ii = 0; ii < channel->banlist.used; ii++)
{
- if(user_matches_glob(user, channel->banlist.list[ii]->ban, MATCH_USENICK | MATCH_VISIBLE))
+ if(user_matches_glob(user, channel->banlist.list[ii]->ban, MATCH_USENICK))
{
/* Riding a netburst. Naughty. */
KickChannelUser(user, channel, chanserv, "User from far side of netsplit should have been banned - bye.");
{
/* Not joining through a ban. */
for(bData = cData->bans;
- bData && !user_matches_glob(user, bData->mask, MATCH_USENICK | MATCH_VISIBLE);
+ bData && !user_matches_glob(user, bData->mask, MATCH_USENICK);
bData = bData->next);
if(bData)
uData->present = 1;
}
}
+
+ /* If user joining normally (not during burst), apply op or voice,
+ * and send greeting/userinfo as appropriate.
+ */
if(!user->uplink->burst)
{
if(modes)
change.args[0].u.member = mNode;
mod_chanmode_announce(chanserv, channel, &change);
}
- if(greeting && !user->uplink->burst)
+ if(greeting)
send_message_type(4, user, chanserv, "(%s) %s", channel->name, greeting);
if(uData && info)
send_target_message(5, channel->name, chanserv, "[%s] %s", user->nick, uData->info);
unsigned int ii, jj;
if(!user->handle_info)
- return;
+ return;
mod_chanmode_init(&change);
change.argc = 1;
continue;
}
- if(channel->access >= UL_PRESENT)
- channel->channel->visited = now;
+ if(channel->access >= UL_PRESENT)
+ channel->channel->visited = now;
if(IsUserAutoOp(channel))
{
mod_chanmode_announce(chanserv, cn, &change);
}
- channel->seen = now;
- channel->present = 1;
+ channel->seen = now;
+ channel->present = 1;
}
for(ii = 0; ii < user->channels.used; ++ii)
|| IsSuspended(channel->channel_info))
continue;
for(jj = 0; jj < channel->banlist.used; ++jj)
- if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK | MATCH_VISIBLE))
+ if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK))
break;
if(jj < channel->banlist.used)
continue;
if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !mn->channel->join_flooded)
{
- /* Allow for a bit of padding so that the limit doesn't
- track the user count exactly, which could get annoying. */
- if((mn->channel->limit - mn->channel->members.used) > chanserv_conf.adjust_threshold + 5)
- {
- timeq_del(0, chanserv_adjust_limit, cData, TIMEQ_IGNORE_WHEN);
- timeq_add(now + chanserv_conf.adjust_delay, chanserv_adjust_limit, cData);
- }
+ /* Allow for a bit of padding so that the limit doesn't
+ track the user count exactly, which could get annoying. */
+ if((mn->channel->limit - mn->channel->members.used) > chanserv_conf.adjust_threshold + 5)
+ {
+ timeq_del(0, chanserv_adjust_limit, cData, TIMEQ_IGNORE_WHEN);
+ timeq_add(now + chanserv_conf.adjust_delay, chanserv_adjust_limit, cData);
+ }
}
if((uData = GetTrueChannelAccess(cData, mn->user->handle_info)))
{
- scan_user_presence(uData, mn->user);
+ scan_user_presence(uData, mn->user);
uData->seen = now;
+ if (uData->access >= UL_PRESENT)
+ cData->visited = now;
}
if(IsHelping(mn->user) && IsSupportHelper(mn->user))
if(protect_user(victim, kicker, channel->channel_info))
{
const char *reason = user_find_message(kicker, "CSMSG_USER_PROTECTED");
- KickChannelUser(kicker, channel, chanserv, reason);
+ KickChannelUser(kicker, channel, chanserv, reason);
}
if((uData = GetTrueChannelAccess(channel->channel_info, victim->handle_info)))
continue;
/* Look for a matching ban already on the channel. */
for(jj = 0; jj < channel->banlist.used; ++jj)
- if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK | MATCH_VISIBLE))
+ if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK))
break;
/* Need not act if we found one. */
if(jj < channel->banlist.used)
if(!(conf_node = conf_get_data(CHANSERV_CONF_NAME, RECDB_OBJECT)))
{
- log_module(CS_LOG, LOG_ERROR, "Invalid config node `%s'.", CHANSERV_CONF_NAME);
- return;
+ log_module(CS_LOG, LOG_ERROR, "Invalid config node `%s'.", CHANSERV_CONF_NAME);
+ return;
}
for(ii = 0; ii < chanserv_conf.support_channels.used; ++ii)
UnlockChannel(chanserv_conf.support_channels.list[ii]);
chanserv_conf.channel_expire_frequency = str ? ParseInterval(str) : 86400;
str = database_get_data(conf_node, KEY_CHAN_EXPIRE_DELAY, RECDB_QSTRING);
chanserv_conf.channel_expire_delay = str ? ParseInterval(str) : 86400*30;
+ str = database_get_data(conf_node, KEY_DNR_EXPIRE_FREQ, RECDB_QSTRING);
+ chanserv_conf.dnr_expire_frequency = str ? ParseInterval(str) : 3600;
str = database_get_data(conf_node, KEY_NODELETE_LEVEL, RECDB_QSTRING);
chanserv_conf.nodelete_level = str ? atoi(str) : 1;
str = database_get_data(conf_node, KEY_MAX_CHAN_USERS, RECDB_QSTRING);
struct handle_info *handle;
struct userData *uData;
char *seen, *inf, *flags;
- time_t last_seen;
+ unsigned long last_seen;
unsigned short access;
if(rd->type != RECDB_OBJECT || !dict_size(rd->d.object))
{
- log_module(CS_LOG, LOG_ERROR, "Invalid user in %s.", chan->channel->name);
- return;
+ log_module(CS_LOG, LOG_ERROR, "Invalid user in %s.", chan->channel->name);
+ return;
}
access = atoi(database_get_data(rd->d.object, KEY_LEVEL, RECDB_QSTRING));
if(access > UL_OWNER)
{
- log_module(CS_LOG, LOG_ERROR, "Invalid access level for %s in %s.", key, chan->channel->name);
- return;
+ log_module(CS_LOG, LOG_ERROR, "Invalid access level for %s in %s.", key, chan->channel->name);
+ return;
}
inf = database_get_data(rd->d.object, KEY_INFO, RECDB_QSTRING);
seen = database_get_data(rd->d.object, KEY_SEEN, RECDB_QSTRING);
- last_seen = seen ? (signed)strtoul(seen, NULL, 0) : now;
+ last_seen = seen ? strtoul(seen, NULL, 0) : now;
flags = database_get_data(rd->d.object, KEY_FLAGS, RECDB_QSTRING);
handle = get_handle_info(key);
if(!handle)
{
struct banData *bData;
char *set, *triggered, *s_duration, *s_expires, *reason, *owner;
- time_t set_time, triggered_time, expires_time;
+ unsigned long set_time, triggered_time, expires_time;
if(rd->type != RECDB_OBJECT || !dict_size(rd->d.object))
{
- log_module(CS_LOG, LOG_ERROR, "Invalid ban in %s.", chan->channel->name);
- return;
+ log_module(CS_LOG, LOG_ERROR, "Invalid ban in %s.", chan->channel->name);
+ return;
}
set = database_get_data(rd->d.object, KEY_SET, RECDB_QSTRING);
if (!reason || !owner)
return;
- set_time = set ? (time_t)strtoul(set, NULL, 0) : now;
- triggered_time = triggered ? (time_t)strtoul(triggered, NULL, 0) : 0;
+ set_time = set ? strtoul(set, NULL, 0) : now;
+ triggered_time = triggered ? strtoul(triggered, NULL, 0) : 0;
if(s_expires)
- expires_time = (time_t)strtoul(s_expires, NULL, 0);
+ expires_time = strtoul(s_expires, NULL, 0);
else if(s_duration)
expires_time = set_time + atoi(s_duration);
else
dict_t previous;
str = database_get_data(obj, KEY_EXPIRES, RECDB_QSTRING);
- suspended->expires = str ? (time_t)strtoul(str, NULL, 0) : 0;
+ suspended->expires = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(obj, KEY_REVOKED, RECDB_QSTRING);
- suspended->revoked = str ? (time_t)strtoul(str, NULL, 0) : 0;
+ suspended->revoked = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(obj, KEY_ISSUED, RECDB_QSTRING);
- suspended->issued = str ? (time_t)strtoul(str, NULL, 0) : 0;
+ suspended->issued = str ? strtoul(str, NULL, 0) : 0;
suspended->suspender = strdup(database_get_data(obj, KEY_SUSPENDER, RECDB_QSTRING));
suspended->reason = strdup(database_get_data(obj, KEY_REASON, RECDB_QSTRING));
previous = database_get_data(obj, KEY_PREVIOUS, RECDB_OBJECT);
if(!cData)
{
log_module(CS_LOG, LOG_ERROR, "Unable to register channel %s from database.", key);
- return 0;
+ return 0;
}
if((obj = database_get_data(channel, KEY_OPTIONS, RECDB_OBJECT)))
enum charOption chOpt;
unsigned int count;
- cData->flags = base64toint(str, 5);
+ cData->flags = base64toint(str, 5);
count = strlen(str += 5);
for(lvlOpt = 0; lvlOpt < NUM_LEVEL_OPTIONS; ++lvlOpt)
{
for(chOpt = 0; chOpt < NUM_CHAR_OPTIONS; ++chOpt)
cData->chOpts[chOpt] = ((count <= charOptions[chOpt].old_idx) ? str : CHANNEL_DEFAULT_OPTIONS)[charOptions[chOpt].old_idx];
}
-
+
if((obj = database_get_data(hir->d.object, KEY_SUSPENDED, RECDB_OBJECT)))
{
suspended = chanserv_read_suspended(obj);
}
str = database_get_data(channel, KEY_REGISTERED, RECDB_QSTRING);
- cData->registered = str ? (time_t)strtoul(str, NULL, 0) : now;
+ cData->registered = str ? strtoul(str, NULL, 0) : now;
str = database_get_data(channel, KEY_VISITED, RECDB_QSTRING);
- cData->visited = str ? (time_t)strtoul(str, NULL, 0) : now;
+ cData->visited = str ? strtoul(str, NULL, 0) : now;
str = database_get_data(channel, KEY_OWNER_TRANSFER, RECDB_QSTRING);
- cData->ownerTransfer = str ? (time_t)strtoul(str, NULL, 0) : 0;
+ cData->ownerTransfer = str ? strtoul(str, NULL, 0) : 0;
str = database_get_data(channel, KEY_MAX, RECDB_QSTRING);
cData->max = str ? atoi(str) : 0;
str = database_get_data(channel, KEY_GREETING, RECDB_QSTRING);
&& (argc = split_line(str, 0, ArrayLength(argv), argv))
&& (modes = mod_chanmode_parse(cNode, argv, argc, MCP_KEY_FREE, 0))) {
cData->modes = *modes;
- if(off_channel > 0)
+ if(off_channel > 0)
cData->modes.modes_set |= MODE_REGISTERED;
if(cData->modes.argc > 1)
cData->modes.argc = 1;
obj = database_get_data(channel, KEY_USERS, RECDB_OBJECT);
for(it = dict_first(obj); it; it = iter_next(it))
- user_read_helper(iter_key(it), iter_data(it), cData);
+ user_read_helper(iter_key(it), iter_data(it), cData);
if(!cData->users && !IsProtected(cData))
{
log_module(CS_LOG, LOG_ERROR, "Channel %s had no users in database, unregistering it.", key);
- unregister_channel(cData, "has empty user list.");
+ unregister_channel(cData, "has empty user list.");
return 0;
}
{
const char *setter, *reason, *str;
struct do_not_register *dnr;
+ unsigned long expiry;
setter = database_get_data(hir->d.object, KEY_DNR_SETTER, RECDB_QSTRING);
if(!setter)
log_module(CS_LOG, LOG_ERROR, "Missing reason for DNR %s.", key);
return;
}
- dnr = chanserv_add_dnr(key, setter, reason);
+ str = database_get_data(hir->d.object, KEY_EXPIRES, RECDB_QSTRING);
+ expiry = str ? strtoul(str, NULL, 0) : 0;
+ if(expiry && expiry <= now)
+ return;
+ dnr = chanserv_add_dnr(key, setter, expiry, reason);
if(!dnr)
return;
str = database_get_data(hir->d.object, KEY_DNR_SET, RECDB_QSTRING);
chanserv_note_type_read(iter_key(it), iter_data(it));
if((section = database_get_data(database, KEY_CHANNELS, RECDB_OBJECT)))
- for(it = dict_first(section); it; it = iter_next(it))
- chanserv_channel_read(iter_key(it), iter_data(it));
+ for(it = dict_first(section); it; it = iter_next(it))
+ chanserv_channel_read(iter_key(it), iter_data(it));
if((section = database_get_data(database, KEY_DNR, RECDB_OBJECT)))
for(it = dict_first(section); it; it = iter_next(it))
saxdb_write_int(ctx, KEY_SEEN, uData->seen);
if(uData->flags)
saxdb_write_int(ctx, KEY_FLAGS, uData->flags);
- if(uData->info)
+ if(uData->info)
saxdb_write_string(ctx, KEY_INFO, uData->info);
saxdb_end_record(ctx);
}
if(channel->modes.modes_set || channel->modes.modes_clear)
{
- mod_chanmode_format(&channel->modes, buf);
+ mod_chanmode_format(&channel->modes, buf);
saxdb_write_string(ctx, KEY_MODES, buf);
}
saxdb_start_record(ctx, KEY_NOTES, 1);
for(it = dict_first(channel->notes); it; it = iter_next(it))
{
- struct note *note = iter_data(it);
+ struct note *note = iter_data(it);
saxdb_start_record(ctx, iter_key(it), 0);
saxdb_write_string(ctx, KEY_NOTE_SETTER, note->setter);
saxdb_write_string(ctx, KEY_NOTE_NOTE, note->note);
write_dnrs_helper(struct saxdb_context *ctx, struct dict *dnrs)
{
struct do_not_register *dnr;
- dict_iterator_t it;
+ dict_iterator_t it, next;
- for(it = dict_first(dnrs); it; it = iter_next(it))
+ for(it = dict_first(dnrs); it; it = next)
{
+ next = iter_next(it);
dnr = iter_data(it);
+ if(dnr->expires && dnr->expires <= now)
+ {
+ dict_remove(dnrs, iter_key(it));
+ continue;
+ }
saxdb_start_record(ctx, dnr->chan_name, 0);
if(dnr->set)
saxdb_write_int(ctx, KEY_DNR_SET, dnr->set);
+ if(dnr->expires)
+ saxdb_write_int(ctx, KEY_EXPIRES, dnr->expires);
saxdb_write_string(ctx, KEY_DNR_SETTER, dnr->setter);
saxdb_write_string(ctx, KEY_DNR_REASON, dnr->reason);
saxdb_end_record(ctx);
CS_LOG = log_register_type("ChanServ", "file:chanserv.log");
conf_register_reload(chanserv_conf_read);
- reg_server_link_func(handle_server_link);
-
- reg_new_channel_func(handle_new_channel);
- reg_join_func(handle_join);
- reg_part_func(handle_part);
- reg_kick_func(handle_kick);
- reg_topic_func(handle_topic);
- reg_mode_change_func(handle_mode);
- reg_nick_change_func(handle_nick_change);
+ if(nick)
+ {
+ reg_server_link_func(handle_server_link);
+ reg_new_channel_func(handle_new_channel);
+ reg_join_func(handle_join);
+ reg_part_func(handle_part);
+ reg_kick_func(handle_kick);
+ reg_topic_func(handle_topic);
+ reg_mode_change_func(handle_mode);
+ reg_nick_change_func(handle_nick_change);
+ reg_auth_func(handle_auth);
+ }
- reg_auth_func(handle_auth);
reg_handle_rename_func(handle_rename);
reg_unreg_func(handle_unreg);
DEFINE_COMMAND(register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+helping", NULL);
DEFINE_COMMAND(noregister, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
DEFINE_COMMAND(allowregister, 2, 0, "template", "noregister", NULL);
+ DEFINE_COMMAND(dnrsearch, 3, 0, "template", "noregister", NULL);
+ modcmd_register(chanserv_module, "dnrsearch print", NULL, 0, 0, NULL);
+ modcmd_register(chanserv_module, "dnrsearch remove", NULL, 0, 0, NULL);
+ modcmd_register(chanserv_module, "dnrsearch count", NULL, 0, 0, NULL);
DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
DEFINE_CHANNEL_OPTION(ctcpusers);
DEFINE_CHANNEL_OPTION(ctcpreaction);
DEFINE_CHANNEL_OPTION(inviteme);
+ DEFINE_CHANNEL_OPTION(unreviewed);
+ modcmd_register(chanserv_module, "set unreviewed on", NULL, 0, 0, "flags", "+helping", NULL);
+ modcmd_register(chanserv_module, "set unreviewed off", NULL, 0, 0, "flags", "+oper", NULL);
if(off_channel > 1)
DEFINE_CHANNEL_OPTION(offchannel);
modcmd_register(chanserv_module, "set defaults", chan_opt_defaults, 1, 0, "access", "owner", NULL);
if(nick)
{
const char *modes = conf_get_data("services/chanserv/modes", RECDB_QSTRING);
- chanserv = AddService(nick, modes ? modes : NULL, "Channel Services", NULL);
+ chanserv = AddLocalUser(nick, nick, NULL, "Channel Services", modes);
service_register(chanserv)->trigger = '!';
reg_chanmsg_func('\001', chanserv, chanserv_ctcp_check);
}
saxdb_register("ChanServ", chanserv_saxdb_read, chanserv_saxdb_write);
if(chanserv_conf.channel_expire_frequency)
- timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
+ timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
+
+ if(chanserv_conf.dnr_expire_frequency)
+ timeq_add(now + chanserv_conf.dnr_expire_frequency, expire_dnrs, NULL);
if(chanserv_conf.refresh_period)
{
- time_t next_refresh;
+ unsigned long next_refresh;
next_refresh = (now + chanserv_conf.refresh_period - 1) / chanserv_conf.refresh_period * chanserv_conf.refresh_period;
timeq_add(next_refresh, chanserv_refresh_topics, NULL);
}
projects / srvx.git / blobdiff