*
* x3 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
#include "chanserv.h"
#include "conf.h"
#include "global.h"
+#include "gline.h"
+#include "ioset.h"
#include "modcmd.h"
#include "opserv.h" /* for opserv_bad_channel() */
+#include "nickserv.h" /* for oper_outranks() */
#include "saxdb.h"
+#include "shun.h"
+#include "spamserv.h"
#include "timeq.h"
#define CHANSERV_CONF_NAME "services/chanserv"
#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_BAN_TIMEOUT_FREQ "ban_timeout_freq"
#define KEY_MAX_CHAN_USERS "max_chan_users"
#define KEY_MAX_CHAN_BANS "max_chan_bans"
#define KEY_NODELETE_LEVEL "nodelete_level"
#define KEY_MAX_USERINFO_LENGTH "max_userinfo_length"
#define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout"
+#define KEY_VALID_CHANNEL_REGEX "valid_channel_regex"
/* ChanServ database */
#define KEY_VERSION_CONTROL "version_control"
#define KEY_NOTES "notes"
#define KEY_TOPIC_MASK "topic_mask"
#define KEY_OWNER_TRANSFER "owner_transfer"
+#define KEY_MAXSETINFO "maxsetinfo"
/* User data */
#define KEY_LEVEL "level"
#define KEY_INFO "info"
#define KEY_SEEN "seen"
+#define KEY_ACCESSEXPIRY "accessexpiry"
+#define KEY_CLVLEXPIRY "clvlexpiry"
+#define KEY_LASTLEVEL "lastlevel"
/* Ban data */
#define KEY_OWNER "owner"
#define KEY_EXPIRES "expires"
#define KEY_TRIGGERED "triggered"
-#define CHANNEL_DEFAULT_FLAGS (CHANNEL_OFFCHANNEL)
+#define KEY_GOD_TIMEOUT "god_timeout"
+
+#define CHANNEL_DEFAULT_FLAGS (CHANNEL_OFFCHANNEL | CHANNEL_UNREVIEWED)
+#define CHANNEL_PRESERVED_FLAGS (CHANNEL_UNREVIEWED)
#define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnat"
/* Administrative messages */
/* Do-not-register channels */
{ "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." },
{ "CSMSG_DNR_SEARCH_RESULTS", "$bDo-Not-Register Channels$b" },
- { "CSMSG_DNR_INFO", "$b%s$b (set by $b%s$b): %s" },
- { "CSMSG_DNR_INFO_SET", "$b%s$b (set %s ago by $b%s$b): %s" },
+ { "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_ALREADY_VOICED", "You are already voiced in $b%s$b." },
{ "CSMSG_ALREADY_DOWN", "You are not opped, halfopped, or voiced in $b%s$b." },
{ "CSMSG_ALREADY_OPCHANNED", "There has been no net.join since the last opchan in $b%s$b." },
+ { "CSMSG_OUT_OF_CHANNEL", "For some reason I don't seem to be in $b%s$b." },
{ "CSMSG_OPCHAN_DONE", "I have (re-)opped myself in $b%s$b." },
+ { "CSMSG_NOT_IN_CHANNEL", "I am not in %s." },
/* Removing yourself from a channel. */
{ "CSMSG_NO_OWNER_DELETEME", "You cannot delete your owner access in $b%s$b." },
{ "CSMSG_DELETED_YOU", "Your $b%d$b access has been deleted from $b%s$b." },
/* User management */
+ { "CSMSG_AUTO_DELETED", "Your %s access has expired in %s." },
+ { "CSMSG_CLVL_EXPIRED", "Your CLVL access has expired in %s." },
{ "CSMSG_ADDED_USER", "Added %s to the %s user list with access %s (%d)." },
{ "CSMSG_DELETED_USER", "Deleted %s (with access %d) from the %s user list." },
{ "CSMSG_BAD_RANGE", "Invalid access range; minimum (%d) must be greater than maximum (%d)." },
{ "CSMSG_NO_SELF_CLVL", "You cannot change your own access." },
{ "CSMSG_NO_BUMP_ACCESS", "You cannot give users access greater than or equal to your own." },
+ { "CSMSG_NO_BUMP_EXPIRY", "You cannot give users timed $bCLVL$b's when they already have timed access." },
{ "CSMSG_MULTIPLE_OWNERS", "There is more than one owner in %s; please use $bCLVL$b, $bDELOWNER$b and/or $bADDOWNER$b instead." },
+ { "CSMSG_NO_OWNER", "There is no owner for %s; please use $bCLVL$b and/or $bADDOWNER$b instead." },
{ "CSMSG_TRANSFER_WAIT", "You must wait %s before you can give ownership of $b%s$b to someone else." },
{ "CSMSG_NO_TRANSFER_SELF", "You cannot give ownership to your own account." },
+ { "CSMSG_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_BAN_DONE", "Banned $b%s$b from %s." },
{ "CSMSG_REASON_CHANGE", "Reason for LAMER $b%s$b changed." },
{ "CSMSG_LAMER_EXTENDED", "Extended LAMER for $b%s$b, now expires in %s." },
- { "CSMSG_BAN_REMOVED", "Matching ban(s) and LAMER(s) in $b%s$b were removed." },
+ { "CSMSG_BAN_REMOVED", "Ban(s) and LAMER(s) matching $b%s$b were removed." },
{ "CSMSG_TRIMMED_LAMERS", "Trimmed $b%d LAMERs$b from the %s LAMER list that were inactive for at least %s." },
{ "CSMSG_REDUNDANT_BAN", "$b%s$b is already banned in %s." },
{ "CSMSG_REDUNDANT_LAMER", "$b%s$b is already LAMER'd in %s." },
{ "CSMSG_NO_MATCHING_USERS", "No one in $b%s$b has a hostmask matching $b%s$b." },
{ "CSMSG_BAN_NOT_FOUND", "Sorry, no ban or LAMER found: $b%s$b." },
{ "CSMSG_BANLIST_FULL", "The $b%s$b channel ban list is $bfull$b." },
+ { "CSMSG_BAD_BAN", "The given ban $b%s$b is invalid." },
{ "CSMSG_INVALID_TRIM", "$b%s$b isn't a valid trim target." },
{ "CSMSG_SET_USERGREETING", "$bUserGreeting$b %s" },
{ "CSMSG_SET_MODES", "$bModes $b %s" },
{ "CSMSG_SET_NODELETE", "$bNoDelete $b %s" },
+ { "CSMSG_SET_UNREVIEWED", "$bUnreviewed $b %s" },
{ "CSMSG_SET_DYNLIMIT", "$bDynLimit $b %s - +l joinflood protection." },
{ "CSMSG_SET_OFFCHANNEL", "$bOffChannel $b %s" },
{ "CSMSG_SET_USERINFO", "$bUserInfo $b %d - and above userinfos are shown." },
{ "CSMSG_SET_TOYS", "$bToys $b %d - %s" },
{ "CSMSG_SET_CTCPREACTION", "$bCTCPReaction$b %d - %s" },
{ "CSMSG_SET_TOPICREFRESH", "$bTopicRefresh$b %d - %s" },
+ { "CSMSG_SET_RESYNC", "$bResync $b %d - %s" },
{ "CSMSG_SET_BANTIMEOUT", "$bBanTimeout $b %d - %s" },
+ { "CSMSG_SET_MAXSETINFO", "$bMaxSetInfo $b %d - maximum characters in a setinfo line." },
{ "CSMSG_USET_AUTOOP", "$bAutoOp $b %s" },
{ "CSMSG_USET_AUTOVOICE", "$bAutoVoice $b %s" },
{ "CSMSG_USET_AUTOINVITE", "$bAutoInvite $b %s" },
+ { "CSMSG_USET_AUTOJOIN", "$bAutoJoin $b %s" },
{ "CSMSG_USET_INFO", "$bInfo $b %s" },
{ "CSMSG_USER_PROTECTED", "Sorry, $b%s$b is protected." },
{ "CSMSG_DEVOICED_USERS", "Devoiced users in $b%s$b." },
{ "CSMSG_AUTOMODE_NONE", "Noone will be automatically oped, half-oped, or voiced." },
- { "CSMSG_AUTOMODE_NORMAL", "Give voice to peons, half-op to halfops, and op to ops." },
+ { "CSMSG_AUTOMODE_NORMAL", "Give voice to pals, half-op to halfops, and op to ops." },
{ "CSMSG_AUTOMODE_VOICE", "#1 plus give voice to everyone." },
{ "CSMSG_AUTOMODE_HOP", "#1 plus give halfops to everyone." },
{ "CSMSG_AUTOMODE_OP", "#1 plus give ops to everyone (not advised)" },
{ "CSMSG_AUTOMODE_MUTE", "Give half-op to halfops, and op to ops only." },
+ { "CSMSG_AUTOMODE_ONLYVOICE", "Just voice everyone with access." },
{ "CSMSG_PROTECT_ALL", "Non-users and users will be protected from those of equal or lower access." },
{ "CSMSG_PROTECT_EQUAL", "Users will be protected from those of equal or lower access." },
{ "CSMSG_TOPICREFRESH_12_HOURS", "Refresh every 12 hours." },
{ "CSMSG_TOPICREFRESH_24_HOURS", "Refresh every 24 hours." },
+ { "CSMSG_RESYNC_NEVER", "Never automaticly resync userlist." },
+ { "CSMSG_RESYNC_3_HOURS", "Resync userlist every 3 hours." },
+ { "CSMSG_RESYNC_6_HOURS", "Resync userlist every 6 hours." },
+ { "CSMSG_RESYNC_12_HOURS", "Resync userlist every 12 hours." },
+ { "CSMSG_RESYNC_24_HOURS", "Resync userlist every 24 hours." },
+
{ "CSMSG_CTCPREACTION_NONE", "CTCPs are allowed" },
{ "CSMSG_CTCPREACTION_KICK", "Kick on disallowed CTCPs" },
{ "CSMSG_CTCPREACTION_KICKBAN", "Kickban on disallowed CTCPs" },
{ "CSMSG_INVITED_USER", "Invited $b%s$b to join %s." },
{ "CSMSG_INVITING_YOU_REASON", "$b%s$b invites you to join %s: %s" },
{ "CSMSG_INVITING_YOU", "$b%s$b invites you to join %s." },
+ { "CSMSG_CANNOT_INVITE", "You cannot invite %s to %s." },
{ "CSMSG_ALREADY_PRESENT", "%s is already in $b%s$b." },
{ "CSMSG_YOU_ALREADY_PRESENT", "You are already in $b%s$b." },
- { "CSMSG_LOW_CHANNEL_ACCESS", "You lack sufficient access in %s to use this command." },
+ { "CSMSG_LOW_CHANNEL_ACCESS", "You lack sufficient access in %s for $S to invite you." },
{ "CSMSG_INFOLINE_TOO_LONG", "Your infoline may not exceed %u characters." },
{ "CSMSG_BAD_INFOLINE", "You may not use the character \\%03o in your infoline." },
{ "CSMSG_HELPER_NO_ACCESS", "%s lacks access to %s but has $bsecurity override$b enabled." },
{ "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access (%d) 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_SMURF_TARGET", "%s %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", "$bChannel Options for %s$b" },
{ "CSMSG_CHANNEL_OPTIONS_END", "-------------End of Options-------------" },
{ "CSMSG_GREETING_TOO_LONG", "Your greeting ($b%d$b characters) must be shorter than $b%d$b characters." },
{ "CSMSG_DIE_ROLL", "A $b%lu$b shows on the %lu-sided die." },
{ "CSMSG_HUGGLES_HIM", "\001ACTION huggles %s\001" },
{ "CSMSG_HUGGLES_YOU", "\001ACTION huggles you\001" },
+ { "CSMSG_ROULETTE_LOADS", "\001ACTION loads the gun and sets it on the table\001" },
+ { "CSMSG_ROULETTE_NEW", "Please type %croulette to start a new round" } ,
+ { "CSMSG_ROULETTE_BETTER_LUCK", "Better luck next time, %s" },
+ { "CSMSG_ROULETTE_BANG", "Bang!!!" } ,
+ { "CSMSG_ROULETTE_CLICK", "Click" } ,
+
+ { "CSMSG_SPIN_WHEEL1", "\001ACTION spins the wheel of misfortune for: %s\001" } ,
+ { "CSMSG_SPIN_WHEEL2", "Round and round she goes, where she stops, nobody knows...!" } ,
+ { "CSMSG_SPIN_WHEEL3", "The wheel of misfortune has stopped on..." } ,
+
+ { "CSMSG_SPIN_PEER", "Peer: Peer's gonna eat you!!!!" } ,
+ { "CSMSG_SPIN_PARTALL", "Part all: Part all channels" } ,
+ { "CSMSG_SPIN_Gline", "Gline: /gline for random amount of time" } ,
+ { "CSMSG_SPIN_SHUN", "Shun: /shun for random amount of time" } ,
+ { "CSMSG_SPIN_NOTHING", "Nothing: Absolutely nothing" } ,
+ { "CSMSG_SPIN_RANDJOIN", "Random join: Join a bunch of random channels, then /part all of 'em several times" } ,
+ { "CSMSG_SPIN_ABUSEWHOIS", "Abuse whois: Abuse line added to /whois info" } ,
+ { "CSMSG_SPIN_KICKALL", "Kick all: /kick from each channel you're in" } ,
+ { "CSMSG_SPIN_NICKCHANGE", "Nick change: Random Nick Change" } ,
+ { "CSMSG_SPIN_KILL", "Kill: /kill" } ,
+ { "CSMSG_SPIN_SVSIGNORE", "Ignore: Services ignore for random amount of time" } ,
+ { "CSMSG_SPIN_SVSIGNORE_OPER", "Ignore: I'm trying REALLY hard to ignore you, but your IRCOp smell is overwhelming!" } ,
+ { "CSMSG_SPIN_KICKBANALL", "Kickban all: /kick and ban from each channel your're in" } ,
+ { "CSMSG_SPIN_UNKNOWN", "Error: I don't know how to '%s' you, so you live for now..." },
/* Other things */
{ "CSMSG_EVENT_SEARCH_RESULTS", "$bChannel Events for %s$b" },
{ "CSMSG_LAST_INVALID", "Invalid argument. must be 1-200" },
+ { "CSMSG_DEFCON_NO_NEW_CHANNELS", "You cannot register new channels at this time, please try again soon." },
+ { "CSMSG_DEFCON_NO_MODE_CHANGE", "You cannot change the MODE at this time, please try again soon." },
{ NULL, NULL }
};
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 userNode *chanserv;
dict_t note_types;
int off_channel;
+extern struct string_list *autojoin_channels;
static dict_t plain_dnrs, mask_dnrs, handle_dnrs;
static struct log_type *CS_LOG;
struct adduserPending* adduser_pendings = NULL;
unsigned int adduser_pendings_count = 0;
+unsigned long god_timeout;
static struct
{
unsigned long db_backup_frequency;
unsigned long channel_expire_frequency;
unsigned long ban_timeout_frequency;
+ unsigned long dnr_expire_frequency;
long info_delay;
unsigned int adjust_delay;
unsigned int max_chan_users;
unsigned int max_chan_bans; /* lamers */
unsigned int max_userinfo_length;
+ unsigned int valid_channel_regex_set : 1;
+
+ regex_t valid_channel_regex;
struct string_list *set_shows;
struct string_list *eightball;
struct string_list *old_ban_names;
+ struct string_list *wheel;
const char *ctcp_short_ban_duration;
const char *ctcp_long_ban_duration;
NOTE_VIS_PRIVILEGED
};
+struct io_fd *socket_io_fd;
+extern struct cManagerNode cManager;
+
struct note_type
{
enum note_access_type set_access_type;
unsigned short level;
char ch;
} accessLevels[] = { /* MUST be orderd less to most! */
+ { "pal", "Pal", UL_PEON, '+' },
{ "peon", "Peon", UL_PEON, '+' },
{ "halfop", "HalfOp", UL_HALFOP, '%' },
{ "op", "Op", UL_OP, '@' },
{ 'v', "CSMSG_AUTOMODE_VOICE" },
{ 'h', "CSMSG_AUTOMODE_HOP" },
{ 'o', "CSMSG_AUTOMODE_OP" },
- { 'm', "CSMSG_AUTOMODE_MUTE" }
+ { 'm', "CSMSG_AUTOMODE_MUTE" },
+ { 'l', "CSMSG_AUTOMODE_ONLYVOICE" }
}, protectValues[] = {
{ 'a', "CSMSG_PROTECT_ALL" },
{ 'e', "CSMSG_PROTECT_EQUAL" },
{ '3', "CSMSG_BANTIMEOUT_4H" },
{ '4', "CSMSG_BANTIMEOUT_1D" },
{ '5', "CSMSG_BANTIMEOUT_1W" }
+},
+resyncValues[] = {
+ { 'n', "CSMSG_RESYNC_NEVER" },
+ { '1', "CSMSG_RESYNC_3_HOURS" },
+ { '2', "CSMSG_RESYNC_6_HOURS" },
+ { '3', "CSMSG_RESYNC_12_HOURS" },
+ { '4', "CSMSG_RESYNC_24_HOURS" }
};
static const struct {
{ "CSMSG_SET_TOYS", "toys", 'p', 6, ArrayLength(toysValues), toysValues },
{ "CSMSG_SET_TOPICREFRESH", "topicrefresh", 'n', 8, ArrayLength(topicRefreshValues), topicRefreshValues },
{ "CSMSG_SET_CTCPREACTION", "ctcpreaction", 'n', 10, ArrayLength(ctcpReactionValues), ctcpReactionValues },
- { "CSMSG_SET_BANTIMEOUT", "bantimeout", '0', 11, ArrayLength(banTimeoutValues), banTimeoutValues }
+ { "CSMSG_SET_BANTIMEOUT", "bantimeout", '0', 11, ArrayLength(banTimeoutValues), banTimeoutValues },
+ { "CSMSG_SET_RESYNC", "resync", 'n', 12, ArrayLength(resyncValues), resyncValues },
};
struct userData *helperList;
#define CHANSERV_DB_VERSION 2
-#define GetChannelUser(channel, handle) _GetChannelUser(channel, handle, 1, 0)
#define GetChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 0)
#define GetTrueChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 1)
+void sputsock(const char *text, ...) PRINTF_LIKE(1, 2);
+
+void
+sputsock(const char *text, ...)
+{
+ va_list arg_list;
+ char buffer[MAXLEN];
+ int pos;
+
+ if (!cManager.uplink || cManager.uplink->state == DISCONNECTED) return;
+ buffer[0] = '\0';
+ va_start(arg_list, text);
+ pos = vsnprintf(buffer, MAXLEN - 2, text, arg_list);
+ va_end(arg_list);
+ if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
+ buffer[pos] = 0;
+ log_replay(MAIN_LOG, true, buffer);
+ buffer[pos++] = '\n';
+ buffer[pos] = 0;
+ ioset_write(socket_io_fd, buffer, pos);
+}
+
unsigned short
user_level_from_name(const char *name, unsigned short clamp_level)
{
highest = "None";
if(level >= 1)
- highest = "Peon";
+ highest = "Pal";
for(ii = 0; (ii < ArrayLength(accessLevels)); ii++)
if(level >= accessLevels[ii].level)
highest = accessLevels[ii].title;
}
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), UNUSED_ARG(void *extra))
{
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))
}
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_level, time_t seen, const char *info, time_t accessexpiry)
{
struct userData *ud;
- if(access > UL_OWNER)
+ if(access_level > UL_OWNER)
return NULL;
ud = calloc(1, sizeof(*ud));
ud->channel = channel;
ud->handle = handle;
ud->seen = seen;
- ud->access = access;
+ ud->access = access_level;
ud->info = info ? strdup(info) : NULL;
+ ud->accessexpiry = accessexpiry ? accessexpiry : 0;
+ ud->clvlexpiry = 0;
+ ud->lastaccess = 0;
ud->prev = NULL;
ud->next = channel->users;
static void unregister_channel(struct chanData *channel, const char *reason);
+static void
+chanserv_expire_tempuser(void *data)
+{
+ struct userData *uData = data;
+ char *handle;
+
+ if (data) {
+ handle = strdup(uData->handle->handle);
+ if (uData->accessexpiry > 0) {
+ if (uData->present) {
+ struct userNode *user, *next_un = NULL;
+ struct handle_info *hi;
+
+ hi = get_handle_info(handle);
+ for (user = hi->users; user; user = next_un) {
+ struct mod_chanmode *change;
+ struct modeNode *mn;
+ unsigned int count = 0;
+
+ send_message(user, chanserv, "CSMSG_AUTO_DELETED", chanserv->nick, uData->channel->channel->name);
+ if (!(mn = GetUserMode(uData->channel->channel, user)) || !(mn->modes & MODE_CHANOP)) {
+ next_un = user->next_authed;
+ continue;
+ }
+
+ change = mod_chanmode_alloc(2);
+ change->args[count].mode = MODE_REMOVE | MODE_CHANOP;
+ change->args[count++].u.member = mn;
+
+ if (count) {
+ change->argc = count;
+ mod_chanmode_announce(chanserv, uData->channel->channel, change);
+ }
+ mod_chanmode_free(change);
+ next_un = user->next_authed;
+ }
+ }
+ del_channel_user(uData, 1);
+ }
+ }
+}
+
+static void
+chanserv_expire_tempclvl(void *data)
+{
+ struct userData *uData = data;
+ char *handle;
+
+ if (data) {
+ handle = strdup(uData->handle->handle);
+ if (uData->clvlexpiry > 0) {
+ int changemodes = 0;
+ unsigned int mode = 0;
+
+ if (((uData->lastaccess == UL_PEON) || (uData->lastaccess == UL_HALFOP)) && (uData->access >= UL_OP)) {
+ changemodes = 1;
+ mode = MODE_REMOVE | MODE_CHANOP;
+ } else if ((uData->lastaccess == UL_PEON) && (uData->access == UL_HALFOP)) {
+ changemodes = 1;
+ mode = MODE_REMOVE | MODE_HALFOP;
+ } else
+ changemodes = 0;
+
+ if (uData->present) {
+ struct userNode *user, *next_un = NULL;
+ struct handle_info *hi;
+
+ hi = get_handle_info(handle);
+ for (user = hi->users; user; user = next_un) {
+ struct mod_chanmode *change;
+ struct modeNode *mn;
+ unsigned int count = 0;
+
+ send_message(user, chanserv, "CSMSG_CLVL_EXPIRED", uData->channel->channel->name);
+ if (!(mn = GetUserMode(uData->channel->channel, user))) {
+ next_un = user->next_authed;
+ continue;
+ }
+
+ if (changemodes == 0) {
+ next_un = user->next_authed;
+ continue;
+ }
+
+ change = mod_chanmode_alloc(2);
+ change->args[count].mode = mode;
+ change->args[count++].u.member = mn;
+
+ if (count) {
+ change->argc = count;
+ mod_chanmode_announce(chanserv, uData->channel->channel, change);
+ }
+ mod_chanmode_free(change);
+ next_un = user->next_authed;
+ }
+ }
+
+ uData->access = uData->lastaccess;
+ uData->lastaccess = 0;
+ uData->clvlexpiry = 0;
+ }
+ }
+}
+
void
del_channel_user(struct userData *user, int do_gc)
{
channel->userCount--;
userCount--;
+ timeq_del(0, chanserv_expire_tempuser, user, TIMEQ_IGNORE_WHEN);
+ timeq_del(0, chanserv_expire_tempclvl, user, TIMEQ_IGNORE_WHEN);
+
if(user->prev)
user->prev->next = user->next;
else
free(user->info);
free(user);
- if(do_gc && !channel->users && !IsProtected(channel))
+ if(do_gc && !channel->users && !IsProtected(channel)) {
+ spamserv_cs_unregister(NULL, channel->channel, lost_all_users, NULL);
unregister_channel(channel, "lost all users.");
+ }
}
static struct adduserPending*
}
else
{
- actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
+ actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL, 0);
scan_user_presence(actee, NULL);
}
del_adduser_pending(ap);
static void expire_ban(void *data);
-static struct banData*
+struct banData*
add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t set, time_t triggered, time_t expires, char *reason)
{
struct banData *bd;
/* Unregister the channel */
log_module(CS_LOG, LOG_INFO, "(%s) Channel registration expired.", channel->channel->name);
+ spamserv_cs_unregister(NULL, channel->channel, expire, NULL);
unregister_channel(channel, "registration expired.");
}
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
-protect_user(const struct userNode *victim, const struct userNode *aggressor, struct chanData *channel)
+protect_user(const struct userNode *victim, const struct userNode *aggressor, struct chanData *channel, int protect_invitables)
{
char protect = channel->chOpts[chProtect];
struct userData *cs_victim, *cs_aggressor;
- /* Don't protect if no one is to be protected, someone is attacking
- himself, or if the aggressor is an IRC Operator. */
- if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/ || IsOper(aggressor) */)
- return 0;
+ /* If victim access level is greater than set invitelevel, don't let
+ * us kick them, but don't consider it punishment if someone else does
+ */
+
+ if(victim == aggressor)
+ return 0;
/* Don't protect if the victim isn't authenticated (because they
can't be a channel user), unless we are to protect non-users
also. */
+
cs_victim = GetChannelAccess(channel, victim->handle_info);
+
+ /* If they have enough access to invite themselvs through a ban,
+ * and its us kicking them, don't. -Rubin */
+ if(protect_invitables==true && cs_victim && (cs_victim->access >= channel->lvlOpts[lvlInviteMe]))
+ return 1;
+
+ if(protect == 'n')
+ return 0;
+
if(protect != 'a' && !cs_victim)
return 0;
/* Protect if the aggressor isn't a user because at this point,
the aggressor can only be less than or equal to the victim. */
+
+ /* Not protected from chanserv except above */
+ /* XXX: need to generic-ize chanserv to "one of x3's services" somehow.. */
+ if(aggressor == chanserv)
+ return 0;
+
cs_aggressor = GetChannelAccess(channel, aggressor->handle_info);
if(!cs_aggressor)
return 1;
}
static int
-validate_op(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_op(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
struct chanData *cData = channel->channel_info;
struct userData *cs_victim;
|| (cs_victim->access < UL_OP /* cData->lvlOpts[lvlGiveOps]*/))
&& !check_user_level(channel, user, lvlEnfOps, 0, 0))
{
- send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
+ if(cmd)
+ reply("CSMSG_OPBY_LOCKED");
+ else
+ send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
return 0;
}
}
static int
-validate_halfop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_halfop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
struct chanData *cData = channel->channel_info;
struct userData *cs_victim;
|| (cs_victim->access < UL_HALFOP /* cData->lvlOpts[lvlGiveHalfOps] */))
&& !check_user_level(channel, user, lvlEnfHalfOps, 0, 0))
{
- send_message(user, chanserv, "CSMSG_HOPBY_LOCKED");
+ reply("CSMSG_HOPBY_LOCKED");
return 0;
}
static int
-validate_deop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_deop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
if(IsService(victim))
{
- send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ reply("MSG_SERVICE_IMMUNE", victim->nick);
return 0;
}
- if(protect_user(victim, user, channel->channel_info))
+ if(protect_user(victim, user, channel->channel_info, false))
{
- send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ reply("CSMSG_USER_PROTECTED", victim->nick);
return 0;
}
}
static int
-validate_dehop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+validate_dehop(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
if(IsService(victim))
{
- send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ reply("MSG_SERVICE_IMMUNE", victim->nick);
return 0;
}
- if(protect_user(victim, user, channel->channel_info))
+ if(protect_user(victim, user, channel->channel_info, false))
{
- send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ reply("CSMSG_USER_PROTECTED", victim->nick);
return 0;
}
}
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, time_t 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];
+
+ user = extra;
+ if(dnr->set)
+ strftime(buf1, sizeof(buf1), "%d %b %Y", localtime(&dnr->set));
+ if(dnr->expires)
+ {
+ strftime(buf2, sizeof(buf2), "%d %b %Y", localtime(&dnr->expires));
+ 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;
+ time_t expiry, duration;
unsigned int matches;
if(argc < 2)
{
- dict_iterator_t it;
-
reply("CSMSG_DNR_SEARCH_RESULTS");
- if(user->handle_info && user->handle_info->userlist_style != HI_STYLE_CLEAN)
- reply("CSMSG_BAR");
- 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;
+ time_t min_set, max_set;
+ time_t 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
{
- reply("CSMSG_NO_SUCH_DNR", chan_name);
+ /* 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_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;
}
struct do_not_register *dnr;
unsigned int n;
+ if (checkDefCon(DEFCON_NO_NEW_CHANNELS) && !IsOper(user)) {
+ reply("CSMSG_DEFCON_NO_NEW_CHANNELS");
+ return 0;
+ }
if(channel)
{
}
*/
+ if (chanserv_conf.valid_channel_regex_set) {
+ int err = regexec(&chanserv_conf.valid_channel_regex, chan_name, 0, 0, 0);
+ if (err) {
+ char buff[256];
+ buff[regerror(err, &chanserv_conf.valid_channel_regex, buff, sizeof(buff))] = 0;
+ log_module(CS_LOG, LOG_INFO, "regexec error: %s (%d)", buff, err);
+ }
+ if(err == REG_NOMATCH) {
+ reply("CSMSG_ILLEGAL_CHANNEL", chan_name);
+ return 0;
+ }
+ }
+
if(new_channel)
- channel = AddChannel(argv[1], now, NULL, NULL, NULL);
+ channel = AddChannel(chan_name, now, NULL, NULL, NULL);
cData = register_channel(channel, user->handle_info->handle);
- scan_user_presence(add_channel_user(cData, handle, UL_OWNER, 0, NULL), NULL);
+ scan_user_presence(add_channel_user(cData, handle, UL_OWNER, 0, NULL, 0), NULL);
cData->modes = chanserv_conf.default_modes;
if(off_channel > 0)
cData->modes.modes_set |= MODE_REGISTERED;
/* Initialize the channel's max user record. */
cData->max = channel->members.used;
+ cData->maxsetinfo = chanserv_conf.max_userinfo_length;
if(handle != user->handle_info)
reply("CSMSG_PROXY_SUCCESS", handle->handle, channel->name);
else
- reply("CSMSG_REG_SUCCESS", channel->name);
sprintf(reason, "%s registered to %s by %s.", channel->name, handle->handle, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_REGISTERED_TO", channel->name,
+ handle->handle, user->handle_info->handle);
return 1;
}
sprintf(reason, "unregistered by %s.", user->handle_info->handle);
name = strdup(channel->name);
unregister_channel(cData, reason);
+ spamserv_cs_unregister(user, channel, manually, "unregistered");
reply("CSMSG_UNREG_SUCCESS", name);
free(name);
return 1;
}
+static void
+ss_cs_join_channel(struct chanNode *channel, int spamserv_join)
+{
+ extern struct userNode *spamserv;
+ struct mod_chanmode *change;
+
+ if(spamserv && spamserv_join && get_chanInfo(channel->name))
+ {
+ change = mod_chanmode_alloc(2);
+ change->argc = 2;
+ change->args[0].mode = MODE_CHANOP;
+ change->args[0].u.member = AddChannelUser(chanserv, channel);
+ change->args[1].mode = MODE_CHANOP;
+ change->args[1].u.member = AddChannelUser(spamserv, channel);
+ }
+ else
+ {
+ change = mod_chanmode_alloc(1);
+ change->argc = 1;
+ change->args[0].mode = MODE_CHANOP;
+ change->args[0].u.member = AddChannelUser(chanserv, channel);
+ }
+
+ mod_chanmode_announce(chanserv, channel, change);
+ mod_chanmode_free(change);
+}
+
static CHANSERV_FUNC(cmd_move)
{
struct mod_chanmode change;
struct chanNode *target;
struct modeNode *mn;
struct userData *uData;
- char reason[MAXLEN];
struct do_not_register *dnr;
+ int chanserv_join = 0, spamserv_join;
REQUIRE_PARAMS(2);
{
target = AddChannel(argv[1], now, NULL, NULL, NULL);
if(!IsSuspended(channel->channel_info))
- AddChannelUser(chanserv, target);
+ chanserv_join = 1;
}
else if(target->channel_info)
{
return 0;
}
else if(!IsSuspended(channel->channel_info))
- {
- change.argc = 1;
- change.args[0].mode = MODE_CHANOP;
- change.args[0].u.member = AddChannelUser(chanserv, target);
- mod_chanmode_announce(chanserv, target, &change);
- }
+ chanserv_join = 1;
if(off_channel > 0)
{
target->channel_info->channel = target;
channel->channel_info = NULL;
- reply("CSMSG_MOVE_SUCCESS", target->name);
+ spamserv_join = spamserv_cs_move_merge(user, channel, target, 1);
+
+ if (chanserv_join)
+ ss_cs_join_channel(target, spamserv_join);
- sprintf(reason, "%s moved to %s by %s.", channel->name, target->name, user->handle_info->handle);
if(!IsSuspended(target->channel_info))
{
char reason2[MAXLEN];
- sprintf(reason2, "Channel moved to %s by %s.", target->name, user->handle_info->handle);
- DelChannelUser(chanserv, channel, reason2, 0);
+ sprintf(reason2, "Channel moved to %s by %s.", target->name, user->handle_info->handle);
+ DelChannelUser(chanserv, channel, reason2, 0);
}
+
UnlockChannel(channel);
LockChannel(target);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_CHANNEL_MOVED",
+ channel->name, target->name, user->handle_info->handle);
+
+ reply("CSMSG_MOVE_SUCCESS", target->name);
return 1;
}
struct userData *target_user;
struct chanNode *target;
char reason[MAXLEN];
+ int nodelete = 0;
REQUIRE_PARAMS(2);
return 0;
}
+ if (argc > 2) {
+ if (!irccasecmp("nodelete", argv[2]))
+ nodelete = 1;
+ }
+
if(!target->channel_info)
{
reply("CSMSG_NOT_REGISTERED", target->name);
/* Merge the channel structures and associated data. */
merge_channel(channel->channel_info, target->channel_info);
+ spamserv_cs_move_merge(user, channel, target, 0);
sprintf(reason, "merged into %s by %s.", target->name, user->handle_info->handle);
- unregister_channel(channel->channel_info, reason);
+ if (!nodelete)
+ unregister_channel(channel->channel_info, reason);
reply("CSMSG_MERGE_SUCCESS", target->name);
return 1;
}
reply("CSMSG_ALREADY_OPCHANNED", channel->name);
return 0;
}
+ if(!IsInChannel(channel,chanserv)) {
+ reply("CSMSG_NOT_IN_CHANNEL", channel->name);
+ return 0;
+ }
channel->channel_info->may_opchan = 0;
mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
change.args[0].u.member = GetUserMode(channel, chanserv);
+ if(!change.args[0].u.member)
+ {
+ reply("CSMSG_OUT_OF_CHANNEL", channel->name);
+ return 0;
+ }
mod_chanmode_announce(chanserv, channel, &change);
reply("CSMSG_OPCHAN_DONE", channel->name);
return 1;
static CHANSERV_FUNC(cmd_adduser)
{
struct userData *actee;
- struct userData *actor;
- struct handle_info *handle;
- unsigned short access;
+ struct userData *actor, *real_actor;
+ struct handle_info *handle = NULL;
+ struct adduserPending *tmp;
+ unsigned short access_level, override = 0;
REQUIRE_PARAMS(3);
return 0;
}
- access = user_level_from_name(argv[2], UL_OWNER);
- if(!access)
+ access_level = user_level_from_name(argv[2], UL_OWNER);
+ if(!access_level)
{
reply("CSMSG_INVALID_ACCESS", argv[2]);
return 0;
}
actor = GetChannelUser(channel->channel_info, user->handle_info);
- if(actor->access <= access)
+ real_actor = GetTrueChannelAccess(channel->channel_info, user->handle_info);
+
+ if(actor->access <= access_level)
{
reply("CSMSG_NO_BUMP_ACCESS");
return 0;
}
+ /* Trying to add someone with equal/more access */
+ if (!real_actor || real_actor->access <= access_level)
+ override = CMD_LOG_OVERRIDE;
+
if(!(handle = modcmd_get_handle_info(user, argv[1])))
{
- // 'kevin must first authenticate with AuthServ.' is sent to user
+ /* 'kevin must first authenticate with AuthServ'. is sent to user */
struct userNode *unode;
unode = GetUserH(argv[1]); /* find user struct by nick */
if(unode)
else {
if(IsInChannel(channel, unode)) {
reply("CSMSG_ADDUSER_PENDING");
- add_adduser_pending(channel, unode, access);
+ tmp = add_adduser_pending(channel, unode, access_level);
send_message_type(1,unode, chanserv, "CSMSG_ADDUSER_PENDING_TARGET", user->nick, channel->name);
}
/* this results in user must auth AND not in chan errors. too confusing..
return 0;
}
- actee = add_channel_user(channel->channel_info, handle, access, 0, NULL);
+ time_t accessexpiry = 0;
+ unsigned int duration = 0;
+ if (argc > 3) {
+ if ((duration = ParseInterval(argv[3])))
+ accessexpiry = now + duration;
+ }
+
+ actee = add_channel_user(channel->channel_info, handle, access_level, 0, NULL, accessexpiry);
scan_user_presence(actee, NULL);
- reply("CSMSG_ADDED_USER", handle->handle, channel->name, user_level_name_from_level(access), access);
- return 1;
+
+ if (duration > 0)
+ timeq_add(accessexpiry, chanserv_expire_tempuser, actee);
+
+ reply("CSMSG_ADDED_USER", handle->handle, channel->name, user_level_name_from_level(access_level), access_level);
+ 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;
return 0;
}
+ time_t clvlexpiry = 0;
+ unsigned int duration = 0;
+ if (argc > 3) {
+ if ((duration = ParseInterval(argv[3])))
+ clvlexpiry = now + duration;
+ }
+
+ if (duration > 0) {
+ if (victim->accessexpiry > 0) {
+ reply("CSMSG_NO_BUMP_EXPIRY");
+ return 0;
+ }
+
+ victim->clvlexpiry = clvlexpiry;
+ victim->lastaccess = victim->access;
+ timeq_add(clvlexpiry, chanserv_expire_tempclvl, victim);
+ }
+
+ /* 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, user_level_name_from_level(new_access), 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_level, 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(argc > 2)
{
- access = user_level_from_name(argv[1], UL_OWNER);
- if(!access)
+ access_level = user_level_from_name(argv[1], UL_OWNER);
+ char *useraccess = user_level_name_from_level(victim->access);
+ if(!access_level)
{
reply("CSMSG_INVALID_ACCESS", argv[1]);
return 0;
}
- if(access != victim->access)
+ if(strcasecmp(argv[1], useraccess))
{
reply("CSMSG_INCORRECT_ACCESS", handle->handle, user_level_name_from_level(victim->access), argv[1]);
return 0;
}
else
{
- access = victim->access;
+ access_level = victim->access;
}
if((actor->access <= victim->access) && !IsHelping(user))
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);
+ reply("CSMSG_DELETED_USER", handle->handle, access_level, 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)
{
reply("CSMSG_BAD_RANGE", min_access, max_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;
}
reply("CSMSG_DELETED_USERS", mask, min_access, max_access, channel->name);
- return 1;
+ return 1 | override;
}
static CHANSERV_FUNC(cmd_mdelowner)
static CHANSERV_FUNC(cmd_mdelcoowner)
{
- return cmd_mdel_user(user, channel, UL_COOWNER, UL_COOWNER, argv[1], cmd);
+ return cmd_mdel_user(user, channel, UL_COOWNER, UL_OWNER-1, argv[1], cmd);
}
static CHANSERV_FUNC(cmd_mdelmanager)
{
- return cmd_mdel_user(user, channel, UL_MANAGER, UL_MANAGER, argv[1], cmd);
+ return cmd_mdel_user(user, channel, UL_MANAGER, UL_COOWNER-1, argv[1], cmd);
}
static CHANSERV_FUNC(cmd_mdelop)
{
- return cmd_mdel_user(user, channel, UL_OP, UL_OP, argv[1], cmd);
+ return cmd_mdel_user(user, channel, UL_OP, UL_MANAGER-1, argv[1], cmd);
+}
+
+static CHANSERV_FUNC(cmd_mdelhalfop)
+{
+ return cmd_mdel_user(user, channel, UL_HALFOP, UL_OP-1, argv[1], cmd);
}
static CHANSERV_FUNC(cmd_mdelpeon)
{
- return cmd_mdel_user(user, channel, UL_PEON, UL_PEON, argv[1], cmd);
+ return cmd_mdel_user(user, channel, UL_PEON, UL_HALFOP-1, argv[1], cmd);
}
-static CHANSERV_FUNC(cmd_mdelhalfop)
+static CHANSERV_FUNC(cmd_mdelpal)
{
- return cmd_mdel_user(user, channel, UL_HALFOP, UL_HALFOP, argv[1], cmd);
+ return cmd_mdel_user(user, channel, UL_PEON, UL_HALFOP-1, argv[1], cmd);
}
+static CHANSERV_FUNC(cmd_levels)
+{
+ struct helpfile_table tbl;
+ int ii = 0;
+
+ tbl.length = 6 + 1; // 6 levels
+ tbl.width = 4;
+ tbl.flags = 0;
+ tbl.contents = calloc(tbl.length,sizeof(tbl.contents[0]));
+ tbl.contents[0] = calloc(tbl.width,sizeof(tbl.contents[0][0]));
+ tbl.contents[0][0] = "Level";
+ tbl.contents[0][1] = "From";
+ tbl.contents[0][2] = "-";
+ tbl.contents[0][3] = "To";
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_OWNER));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_OWNER);
+ tbl.contents[ii][2] = msnprintf(2, " ");
+ tbl.contents[ii][3] = msnprintf(1, "");
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_COOWNER));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_COOWNER);
+ tbl.contents[ii][2] = msnprintf(2, "-");
+ tbl.contents[ii][3] = msnprintf(4, "%d", UL_OWNER-1);
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_MANAGER));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_MANAGER);
+ tbl.contents[ii][2] = msnprintf(2, "-");
+ tbl.contents[ii][3] = msnprintf(4, "%d", UL_COOWNER-1);
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_OP));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_OP);
+ tbl.contents[ii][2] = msnprintf(2, "-");
+ tbl.contents[ii][3] = msnprintf(4, "%d", UL_MANAGER-1);
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_HALFOP));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_HALFOP);
+ tbl.contents[ii][2] = msnprintf(2, "-");
+ tbl.contents[ii][3] = msnprintf(4, "%d", UL_OP-1);
+
+ tbl.contents[++ii] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
+ tbl.contents[ii][0] = strdup(user_level_name_from_level(UL_PEON));
+ tbl.contents[ii][1] = msnprintf(4, "%d", UL_PEON);
+ tbl.contents[ii][2] = msnprintf(2, "-");
+ tbl.contents[ii][3] = msnprintf(4, "%d", UL_HALFOP-1);
+
+ table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
+ return 0;
+
+/*
+ reply("CSMSG_LEVELS_HEADER");
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_OWNER), UL_OWNER, UL_OWNER);
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_COOWNER), UL_COOWNER, UL_OWNER-1);
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_MANAGER), UL_MANAGER, UL_COOWNER-1);
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_OP), UL_OP, UL_MANAGER-1);
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_HALFOP), UL_HALFOP, UL_OP-1);
+ reply("CSMSG_LEVELS", user_level_name_from_level(UL_PEON), UL_PEON, UL_HALFOP-1);
+ reply("CSMSG_BAR");
+ */
+}
/* trim_lamers.. */
static int
-cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long duration)
+cmd_trim_bans(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, unsigned long duration)
{
struct banData *bData, *next;
char interval[INTERVALLEN];
}
intervalString(interval, duration, user->handle_info);
- send_message(user, chanserv, "CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
+ reply("CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
return 1;
}
static int
-cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short min_access, unsigned short max_access, unsigned long duration, int vacation)
+cmd_trim_users(struct svccmd *cmd, 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;
- 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);
+ reply("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");
+ reply("CSMSG_NO_ACCESS");
return 0;
}
min_access = 1;
max_access = (actor->access > UL_OWNER) ? UL_OWNER : (actor->access - 1);
}
- send_message(user, chanserv, "CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
+ reply("CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
return 1;
}
if(!irccasecmp(argv[1], "lamers"))
{
- cmd_trim_bans(user, channel, duration); /* trim_lamers.. */
+ cmd_trim_bans(cmd, user, channel, duration); /* trim_lamers.. */
return 1;
}
else if(!irccasecmp(argv[1], "users"))
{
- cmd_trim_users(user, channel, 0, 0, duration, vacation);
+ cmd_trim_users(cmd, 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, vacation);
+ cmd_trim_users(cmd, 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, vacation);
+ cmd_trim_users(cmd, user, channel, min_level, min_level, duration, vacation);
return 1;
}
else
return cmd_all(CSFUNC_ARGS, cmd_down);
}
-typedef int validate_func_t(struct userNode *user, struct chanNode *channel, struct userNode *victim);
+typedef int validate_func_t(struct svccmd *cmd, struct userNode *user, struct chanNode *channel, struct userNode *victim);
typedef void process_func_t(unsigned int num, struct userNode **newops, struct chanNode *channel, struct userNode *who, int announce);
static int
change->args[valid].u.member = GetUserMode(channel, victim);
if(!change->args[valid].u.member)
continue;
- if(validate && !validate(user, channel, victim))
+ if(validate && !validate(cmd, user, channel, victim))
continue;
valid++;
}
bad_channel_ban(struct chanNode *channel, struct userNode *user, const char *ban, unsigned int *victimCount, struct modeNode **victims)
{
unsigned int ii;
+ int b = 0;
if(victimCount)
*victimCount = 0;
if(IsService(mn->user))
continue;
- if(!user_matches_glob(mn->user, ban, MATCH_USENICK | MATCH_VISIBLE))
+ b = user_matches_glob(mn->user, ban, MATCH_USENICK | MATCH_VISIBLE, 0);
+ if (b == -1)
+ return -1;
+ else if (b == 0)
continue;
- if(protect_user(mn->user, user, channel->channel_info))
+ if(protect_user(mn->user, user, channel->channel_info, false))
return 1;
if(victims)
struct userNode *victim;
struct modeNode **victims;
unsigned int offset, n, victimCount, duration = 0;
+ int b = 0;
char *reason = "Bye.", *ban, *name;
char interval[INTERVALLEN];
return 0;
}
- if(protect_user(victim, user, channel->channel_info))
+ if(protect_user(victim, user, channel->channel_info, false))
{
// This translates to send_message(user, cmd->parent->bot, ...)
// if user is x3 (ctcp action) cmd is null and segfault.
ban = generate_hostmask(victim, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT);
name = victim->nick;
}
+ else if(!is_ircmask(argv[1]) && (*argv[1] == '*'))
+ {
+ 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;
+ }
+
+ snprintf(banmask, sizeof(banmask), "*!*@%s.*", hi->handle);
+ victims = alloca(sizeof(victims[0]) * channel->members.used);
+
+ b = bad_channel_ban(channel, user, banmask, &victimCount, victims);
+ if(b == 1)
+ {
+ reply("CSMSG_MASK_PROTECTED", banmask);
+ return 0;
+ }else if(b == -1)
+ {
+ reply("CSMSG_BAD_BAN", banmask);
+ return 0;
+ }
+
+ if((action == ACTION_KICK) && (victimCount == 0))
+ {
+ reply("CSMSG_NO_MATCHING_USERS", channel->name, banmask);
+ return 0;
+ }
+
+ name = ban = strdup(banmask);
+ }
else
{
if(!is_ircmask(argv[1]))
victims = alloca(sizeof(victims[0]) * channel->members.used);
- if(bad_channel_ban(channel, user, argv[1], &victimCount, victims))
- {
- if(cmd)
- reply("CSMSG_MASK_PROTECTED", argv[1]);
+ b = bad_channel_ban(channel, user, argv[1], &victimCount, victims);
+ if(cmd && (b == 1)) {
+ reply("CSMSG_MASK_PROTECTED", argv[1]);
+ return 0;
+ }
+ else if(cmd && (b == -1)) {
+ reply("CSMSG_BAD_BAN", argv[1]);
return 0;
}
/* If i want to ban *.nl and theres 5 of them, what is it to the bot?!?
/* Truncate the ban in place if necessary; we must ensure
that 'ban' is a valid ban mask before sanitizing it. */
- sanitize_ircmask(ban);
+ if (*ban != '~')
+ sanitize_ircmask(ban);
if(action & ACTION_ADD_LAMER)
{
}
}
- if(action & ACTION_KICK)
+ if(action & ACTION_ADD_LAMER)
+ {
+ char kick_reason[MAXLEN];
+ sprintf(kick_reason, "(%s) %s", user->nick, reason);
+
+ for(n = 0; n < victimCount; n++) {
+ if(!protect_user(victims[n]->user, user, channel->channel_info, true)) {
+ KickChannelUser(victims[n]->user, channel, chanserv, kick_reason);
+ }
+ }
+ }
+ else if(action & ACTION_KICK)
{
char kick_reason[MAXLEN];
sprintf(kick_reason, "(%s) %s", user->nick, reason);
- for(n = 0; n < victimCount; n++)
+ for(n = 0; n < victimCount; n++) {
KickChannelUser(victims[n]->user, channel, chanserv, kick_reason);
+ }
}
if(!cmd)
for(ii = count = 0; ii < bans->used; ++ii)
{
match[ii] = user_matches_glob(actee, bans->list[ii]->ban,
- MATCH_USENICK | MATCH_VISIBLE);
+ MATCH_USENICK | MATCH_VISIBLE, 0);
if(match[ii])
count++;
}
/* may want to allow a comma delimited list of users... */
if(!(actee = GetUserH(argv[1])))
{
- if(!is_ircmask(argv[1]))
+ if(!is_ircmask(argv[1]) && *argv[1] == '*')
+ {
+ char banmask[NICKLEN + USERLEN + HOSTLEN + 3];
+ const char *accountname = argv[1] + 1;
+
+ snprintf(banmask, sizeof(banmask), "*!*@%s.*", accountname);
+ mask = strdup(banmask);
+ }
+ else if(!is_ircmask(argv[1]))
{
reply("MSG_NICK_UNKNOWN", argv[1]);
return 0;
}
-
- mask = strdup(argv[1]);
+ else
+ {
+ mask = strdup(argv[1]);
+ }
}
/* We don't sanitize the mask here because ircu
while(ban)
{
if(actee)
- for( ; ban && !user_matches_glob(actee, ban->mask, MATCH_USENICK | MATCH_VISIBLE);
+ for( ; ban && !user_matches_glob(actee, ban->mask, MATCH_USENICK | MATCH_VISIBLE, 0);
ban = ban->next);
else
for( ; ban && !match_ircglobs(mask, ban->mask);
if(argc < 2)
target_handle = user->handle_info;
- else if(!IsHelping(user))
+ else if(!IsStaff(user))
{
reply("CSMSG_MYACCESS_SELF_ONLY", argv[0]);
return 0;
else if(!(target_handle = modcmd_get_handle_info(user, argv[1])))
return 0;
+ if(!oper_outranks(user, target_handle))
+ return 0;
+
if(!target_handle->channels)
{
reply("CSMSG_SQUAT_ACCESS", target_handle->handle);
continue;
sbuf.used = 0;
string_buffer_append_printf(&sbuf, "[%s (%d", cData->channel->name, uData->access);
- if(uData->flags == USER_AUTO_OP)
+ if(uData->flags != 0)
string_buffer_append(&sbuf, ',');
if(IsUserSuspended(uData))
string_buffer_append(&sbuf, 's');
}
if(IsUserAutoInvite(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe]))
string_buffer_append(&sbuf, 'i');
+ if(IsUserAutoJoin(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe]))
+ string_buffer_append(&sbuf, 'j');
if(uData->info)
string_buffer_append_printf(&sbuf, ")] %s", uData->info);
else
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)
{
lData.table.contents = malloc(lData.table.length*sizeof(*lData.table.contents));
if(user->handle_info && user->handle_info->userlist_style == HI_STYLE_ADVANCED)
- lData.table.width = 5; /* with level = 5 */
+ lData.table.width = 6; /* with level = 6 */
else
- lData.table.width = 4; /* without = 4 */
+ lData.table.width = 5; /* without = 5 */
ary = malloc(lData.table.width*sizeof(**lData.table.contents));
lData.table.contents[0] = ary;
if(user->handle_info) {
ary[i] = "Last Seen";
seen_index = i++;
ary[i++] = "Status";
+ ary[i++] = "Expiry";
for(matches = 1; matches < lData.table.length; ++matches)
{
- struct userData *uData = lData.users[matches-1];
char seen[INTERVALLEN];
+
+ uData = lData.users[matches-1];
i = 0;
ary = malloc(lData.table.width*sizeof(**lData.table.contents));
lData.table.contents[matches] = ary;
ary[i++] = "Vacation";
else
ary[i++] = "Normal";
+
+ if ((uData->accessexpiry > 0) || (uData->clvlexpiry > 0)) {
+ char delay[INTERVALLEN];
+ time_t diff;
+
+ if (uData->accessexpiry > 0) {
+ diff = uData->accessexpiry - now;
+ intervalString(delay, diff, user->handle_info);
+ } else {
+ diff = uData->clvlexpiry - now;
+ intervalString(delay, diff, user->handle_info);
+ }
+ ary[i++] = delay;
+ } else
+ ary[i++] = "Never";
}
+
send_list(&lData);
for(matches = 1; matches < lData.table.length; ++matches)
{
static CHANSERV_FUNC(cmd_lamers)
{
+ 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; /* lamers */
- 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);
reply("CSMSG_LAMERS_HEADER", channel->name);
bans = alloca(channel->channel_info->banCount * sizeof(struct banData *)); /* lamers */
/* lamers */
for(ban = channel->channel_info->bans; ban; ban = ban->next)
{
- if(search && !match_ircglobs(search, ban->mask))
- continue;
+ if(search_u)
+ {
+ if(!user_matches_glob(search_u, ban->mask, MATCH_USENICK | MATCH_VISIBLE, 0))
+ 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;
{
if(cData->topic)
{
+ /*XXX Why would we ever want to send chanserv as the setter? I dont understand -Rubin */
SetChannelTopic(channel, chanserv, p10 ? user : chanserv, cData->topic, 1);
reply("CSMSG_TOPIC_SET", cData->topic);
return 1;
if(argc < 2)
{
+ if (checkDefCon(DEFCON_NO_MODE_CHANGE) && !IsOper(user)) {
+ reply("CSMSG_DEFCON_NO_MODE_CHANGE");
+ return 0;
+ }
+
change = &channel->channel_info->modes;
if(change->modes_set || change->modes_clear) {
modcmd_chanmode_announce(change);
else
send_message(invite, chanserv, "CSMSG_INVITING_YOU", user->nick, channel->name);
}
+
+ if (invite->handle_info && invite->handle_info->ignores->used && (argc > 1)) {
+ unsigned int i;
+ for (i=0; i < invite->handle_info->ignores->used; i++) {
+ if (user_matches_glob(user, invite->handle_info->ignores->list[i], MATCH_USENICK, 0)) {
+ reply("CSMSG_CANNOT_INVITE", argv[1], channel->name);
+ return 0;
+ }
+ }
+ }
+
irc_invite(chanserv, invite, channel);
if(argc > 1)
reply("CSMSG_INVITED_USER", argv[1], channel->name);
reply("CSMSG_CHANNEL_VISITED", intervalString(buffer, now - cData->visited, user->handle_info));
privileged = IsStaff(user);
- if(privileged)
+ /* if(privileged) */
reply("CSMSG_CHANNEL_REGISTERED", intervalString(buffer, now - cData->registered, user->handle_info));
- if(((uData && uData->access >= UL_COOWNER) || privileged) && cData->registrar)
+ if(/*((uData && uData->access >= UL_COOWNER) || privileged) && */cData->registrar)
reply("CSMSG_CHANNEL_REGISTRAR", cData->registrar);
if(privileged && (dnr = chanserv_is_dnr(channel->name, NULL)))
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)
+static void
+resync_channel(struct chanNode *channel)
{
struct mod_chanmode *changes;
struct chanData *cData = channel->channel_info;
}
}
changes->argc = used;
- modcmd_chanmode_announce(changes);
+ mod_chanmode_announce(chanserv, channel, changes);
mod_chanmode_free(changes);
+}
+
+static CHANSERV_FUNC(cmd_resync)
+{
+ resync_channel(channel);
reply("CSMSG_RESYNCED_USERS", channel->name);
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 = data;
struct chanNode *channel;
+ unsigned int ii;
+ /* Update the channel registration data structure. */
if(!suspended->expires || (now < suspended->expires))
suspended->revoked = now;
channel = suspended->cData->channel;
suspended->cData->channel = channel;
suspended->cData->flags &= ~CHANNEL_SUSPENDED;
+
+ /* If appropriate, re-join ChanServ to the channel. */
if(!IsOffChannel(suspended->cData))
{
- struct mod_chanmode change;
- mod_chanmode_init(&change);
- change.argc = 1;
- change.args[0].mode = MODE_CHANOP;
- change.args[0].u.member = AddChannelUser(chanserv, channel);
- mod_chanmode_announce(chanserv, channel, &change);
+ spamserv_cs_suspend(channel, 0, 0, NULL);
+ ss_cs_join_channel(channel, 1);
+ }
+
+ /* Mark everyone currently in the channel as present. */
+ for(ii = 0; ii < channel->members.used; ++ii)
+ {
+ struct userData *uData = GetChannelAccess(suspended->cData, channel->members.list[ii]->user->handle_info);
+ if(uData)
+ {
+ uData->present = 1;
+ uData->seen = now;
+ }
}
}
suspended->previous->revoked = now;
if(suspended->previous->expires)
timeq_del(suspended->previous->expires, chanserv_expire_suspension, suspended->previous, 0);
- sprintf(reason, "%s suspension modified by %s.", channel->name, suspended->suspender);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_SUSPENSION_MODIFIED",
+ channel->name, suspended->suspender);
}
else
{
/* Mark the channel as suspended, then part. */
channel->channel_info->flags |= CHANNEL_SUSPENDED;
+ spamserv_cs_suspend(channel, expiry, 1, suspended->reason);
DelChannelUser(chanserv, channel, suspended->reason, 0);
reply("CSMSG_SUSPENDED", channel->name);
- sprintf(reason, "%s suspended by %s.", channel->name, suspended->suspender);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_SUSPENDED_BY",
+ channel->name, suspended->suspender);
}
return 1;
}
static CHANSERV_FUNC(cmd_cunsuspend)
{
struct suspended *suspended;
- char message[MAXLEN];
if(!IsSuspended(channel->channel_info))
{
timeq_del(suspended->expires, chanserv_expire_suspension, suspended, 0);
chanserv_expire_suspension(suspended);
reply("CSMSG_UNSUSPENDED", channel->name);
- sprintf(message, "%s unsuspended by %s.", channel->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS|MESSAGE_RECIPIENT_HELPERS, message);
+ global_message_args(MESSAGE_RECIPIENT_OPERS|MESSAGE_RECIPIENT_HELPERS, "CSMSG_UNSUSPENDED_BY",
+ channel->name, user->handle_info->handle);
return 1;
}
typedef void (*channel_search_func)(struct chanData *channel, void *data);
static search_t
-chanserv_search_create(struct userNode *user, unsigned int argc, char *argv[])
+chanserv_search_create(struct svccmd *cmd, struct userNode *user, unsigned int argc, char *argv[])
{
search_t search;
unsigned int i;
/* Assume all criteria require arguments. */
if(i == (argc - 1))
{
- send_message(user, chanserv, "MSG_MISSING_PARAMS", argv[i]);
+ reply("MSG_MISSING_PARAMS", argv[i]);
goto fail;
}
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]);
+ reply("CSMSG_INVALID_CFLAG", argv[i]);
goto fail;
}
}
search->limit = strtoul(argv[++i], NULL, 10);
else
{
- send_message(user, chanserv, "MSG_INVALID_CRITERIA", argv[i]);
+ reply("MSG_INVALID_CRITERIA", argv[i]);
goto fail;
}
}
return 0;
}
- search = chanserv_search_create(user, argc - 2, argv + 2);
+ search = chanserv_search_create(cmd, user, argc - 2, argv + 2);
if(!search)
return 0;
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_defaulttopic)
{
if(argc > 1)
&& !match_ircglob(channel->channel_info->topic, channel->channel_info->topic_mask))
reply("CSMSG_TOPIC_MISMATCH", channel->name);
}
- SetChannelTopic(channel, chanserv, chanserv, topic ? topic : "", 1);
+ SetChannelTopic(channel, chanserv, user, topic ? topic : "", 1);
}
if(channel->channel_info->topic)
return opt_greeting_common(user, cmd, argc, argv, "CSMSG_SET_USERGREETING", &channel->channel_info->user_greeting);
}
+static MODCMD_FUNC(chan_opt_maxsetinfo)
+{
+ unsigned int charmax;
+
+ if(argc > 1) {
+ charmax = atoi(argv[1]);
+ if ((charmax > 0) && (charmax < chanserv_conf.max_userinfo_length))
+ channel->channel_info->maxsetinfo = charmax;
+ }
+
+ reply("CSMSG_SET_MAXSETINFO", channel->channel_info->maxsetinfo);
+ return 1;
+}
+
static MODCMD_FUNC(chan_opt_modes)
{
struct mod_chanmode *new_modes;
if(argc > 1)
{
+ if (checkDefCon(DEFCON_NO_MODE_CHANGE) && !IsOper(user)) {
+ reply("CSMSG_DEFCON_NO_MODE_CHANGE");
+ return 0;
+ }
+
if(!check_user_level(channel, user, lvlEnfModes, 1, 0))
{
reply("CSMSG_NO_ACCESS");
static MODCMD_FUNC(chan_opt_dynlimit)
{
+ struct mod_chanmode change;
+
+ if (argc > 1) {
+ if (disabled_string(argv[1])) {
+ mod_chanmode_init(&change);
+ change.modes_clear |= MODE_LIMIT;
+ mod_chanmode_announce(chanserv, channel, &change);
+ }
+ }
+
CHANNEL_BINARY_OPTION("CSMSG_SET_DYNLIMIT", CHANNEL_DYNAMIC_LIMIT);
}
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;
channel_multiple_option(enum charOption option, struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
{
struct chanData *cData = channel->channel_info;
- int count = charOptions[option].count, index;
+ int count = charOptions[option].count, idx;
if(argc > 1)
{
- index = atoi(argv[1]);
+ idx = atoi(argv[1]);
- if(!isdigit(argv[1][0]) || (index < 0) || (index >= count))
+ if(!isdigit(argv[1][0]) || (idx < 0) || (idx >= count))
{
- reply("CSMSG_INVALID_NUMERIC", index);
+ reply("CSMSG_INVALID_NUMERIC", idx);
/* 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));
+ for(idx = 0; idx < count; idx++)
+ reply(charOptions[option].format_name, idx, user_find_message(user, charOptions[option].values[idx].format_name));
return 0;
}
- cData->chOpts[option] = charOptions[option].values[index].value;
+ cData->chOpts[option] = charOptions[option].values[idx].value;
}
else
{
/* Find current option value. */
find_value:
- for(index = 0;
- (index < count) && (cData->chOpts[option] != charOptions[option].values[index].value);
- index++);
- if(index == count)
+ for(idx = 0;
+ (idx < count) && (cData->chOpts[option] != charOptions[option].values[idx].value);
+ idx++);
+ if(idx == count)
{
/* Somehow, the option value is corrupt; reset it to the default. */
cData->chOpts[option] = charOptions[option].default_value;
}
}
- reply(charOptions[option].format_name, index, user_find_message(user, charOptions[option].values[index].format_name));
+ reply(charOptions[option].format_name, idx, user_find_message(user, charOptions[option].values[idx].format_name));
return 1;
}
return channel_multiple_option(chTopicRefresh, CSFUNC_ARGS);
}
+static MODCMD_FUNC(chan_opt_resync)
+{
+ return channel_multiple_option(chResync, CSFUNC_ARGS);
+}
+
static struct svccmd_list set_shows_list;
static void
-handle_svccmd_unbind(struct svccmd *target) {
+handle_svccmd_unbind(struct svccmd *target, UNUSED_ARG(void *extra)) {
unsigned int ii;
for(ii=0; ii<set_shows_list.used; ++ii)
if(target == set_shows_list.list[ii])
return 0;
}
+ argv[0] = "";
+ argv[1] = buf;
return subcmd->command->func(user, channel, argc - 1, argv + 1, subcmd);
}
reply("CSMSG_NOT_USER", channel->name);
return 0;
}
- if(uData->access < UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
+ if(uData->access < UL_HALFOP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
return user_binary_option("CSMSG_USET_AUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS);
else
return user_binary_option("CSMSG_USET_AUTOOP", USER_AUTO_OP, CSFUNC_ARGS);
- /* TODO: add halfops error message? or is the op one generic enough? */
}
static MODCMD_FUNC(user_opt_autoinvite)
{
+ if((argc > 1) && !check_user_level(channel, user, lvlInviteMe, 1, 0))
+ {
+ reply("CSMSG_LOW_CHANNEL_ACCESS", channel->name);
+ }
return user_binary_option("CSMSG_USET_AUTOINVITE", USER_AUTO_INVITE, CSFUNC_ARGS);
}
+static MODCMD_FUNC(user_opt_autojoin)
+{
+ return user_binary_option("CSMSG_USET_AUTOJOIN", USER_AUTO_JOIN, CSFUNC_ARGS);
+}
+
static MODCMD_FUNC(user_opt_info)
{
struct userData *uData;
{
size_t bp;
infoline = unsplit_string(argv + 1, argc - 1, NULL);
- if(strlen(infoline) > chanserv_conf.max_userinfo_length)
+ if(strlen(infoline) > channel->channel_info->maxsetinfo)
{
- reply("CSMSG_INFOLINE_TOO_LONG", chanserv_conf.max_userinfo_length);
+ reply("CSMSG_INFOLINE_TOO_LONG", channel->channel_info->maxsetinfo);
return 0;
}
bp = strcspn(infoline, "\001");
{
char *options[] =
{
- "AutoOp", "AutoInvite", "Info"
+ "AutoOp", "AutoInvite", "AutoJoin", "Info"
};
if(!uset_shows_list.size)
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;
struct giveownership *giveownership;
+ const char *confirm;
unsigned int force, override;
unsigned short co_access, new_owner_old_access;
- char reason[MAXLEN], transfer_reason[MAXLEN];
+ char transfer_reason[MAXLEN];
REQUIRE_PARAMS(2);
curr_user = GetChannelAccess(cData, user->handle_info);
}
curr_user = owner;
}
- else if (!force && (now < (time_t)(cData->ownerTransfer + chanserv_conf.giveownership_period)))
+ else if(!force && (now < (time_t)(cData->ownerTransfer + chanserv_conf.giveownership_period)))
{
char delay[INTERVALLEN];
intervalString(delay, cData->ownerTransfer + chanserv_conf.giveownership_period - now, user->handle_info);
reply("CSMSG_TRANSFER_WAIT", delay, channel->name);
return 0;
}
+ if (!curr_user) {
+ reply("CSMSG_NO_OWNER", channel->name);
+ return 0;
+ }
if(!(new_owner_hi = modcmd_get_handle_info(user, argv[1])))
return 0;
if(new_owner_hi == user->handle_info)
{
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, 0);
}
else
{
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;
+ }
+ }
+
new_owner_old_access = new_owner->access;
if(new_owner->access >= UL_COOWNER)
co_access = new_owner->access;
giveownership = calloc(1, sizeof(*giveownership));
giveownership->issued = now;
- giveownership->old_owner = curr_user->handle->handle;
- giveownership->target = new_owner_hi->handle;
+ giveownership->old_owner = strdup(curr_user->handle->handle);
+ giveownership->target = strdup(new_owner_hi->handle);
giveownership->target_access = new_owner_old_access;
if(override)
{
channel->channel_info->giveownership = giveownership;
reply("CSMSG_OWNERSHIP_GIVEN", channel->name, new_owner_hi->handle);
- sprintf(reason, "%s ownership transferred to %s by %s.", channel->name, new_owner_hi->handle, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ global_message_args(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, "CSMSG_OWNERSHIP_TRANSFERRED",
+ channel->name, new_owner_hi->handle, user->handle_info->handle);
return 1;
}
static CHANSERV_FUNC(cmd_suspend)
{
struct handle_info *hi;
- struct userData *self, *target;
+ struct userData *actor, *real_actor, *target;
+ unsigned int override = 0;
time_t expiry;
REQUIRE_PARAMS(3);
if(!(hi = modcmd_get_handle_info(user, argv[1]))) return 0;
- self = GetChannelUser(channel->channel_info, user->handle_info);
+ actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(target = GetTrueChannelAccess(channel->channel_info, hi)))
{
reply("CSMSG_NO_CHAN_USER", hi->handle, channel->name);
return 0;
}
- if(target->access >= self->access)
+ if(target->access >= actor->access)
{
reply("MSG_USER_OUTRANKED", hi->handle);
return 0;
if(target->expires)
timeq_add(target->expires, chanserv_expire_user_suspension, target);
+ if(!real_actor || target->access >= real_actor->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 *actor = NULL, *real_actor = NULL, *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);
+ actor = GetChannelUser(channel->channel_info, user->handle_info);
+ real_actor = GetChannelAccess(channel->channel_info, user->handle_info);
if(!(target = GetTrueChannelAccess(channel->channel_info, hi)))
{
reply("CSMSG_NO_CHAN_USER", hi->handle, channel->name);
return 0;
}
- if(target->access >= self->access)
+ if(target->access >= actor->access)
{
reply("MSG_USER_OUTRANKED", hi->handle);
return 0;
reply("CSMSG_NOT_SUSPENDED", hi->handle);
return 0;
}
+ if(!real_actor || target->access >= real_actor->access)
+ override = CMD_LOG_OVERRIDE;
target->flags &= ~USER_SUSPENDED;
scan_user_presence(target, NULL);
timeq_del(target->expires, chanserv_expire_user_suspension, target, 0);
reply("CSMSG_USER_UNSUSPENDED", hi->handle, channel->name);
- return 1;
+ return 1 | override;
}
static MODCMD_FUNC(cmd_deleteme)
static void
chanserv_refresh_topics(UNUSED_ARG(void *data))
{
- unsigned int refresh_num = (now - self->link) / chanserv_conf.refresh_period;
+ unsigned int refresh_num = (now - self->link_time) / chanserv_conf.refresh_period;
struct chanData *cData;
char opt;
timeq_add(now + chanserv_conf.refresh_period, chanserv_refresh_topics, NULL);
}
+static void
+chanserv_auto_resync(UNUSED_ARG(void *data))
+{
+ unsigned int refresh_num = (now - self->link_time) / chanserv_conf.refresh_period;
+ struct chanData *cData;
+ char opt;
+
+ for(cData = channelList; cData; cData = cData->next)
+ {
+ if(IsSuspended(cData)) continue;
+ opt = cData->chOpts[chResync];
+ if(opt == 'n') continue;
+ if((refresh_num - cData->last_resync) < (unsigned int)(1 << (opt - '1'))) continue;
+ resync_channel(cData->channel);
+ cData->last_resync = refresh_num;
+ }
+ timeq_add(now + chanserv_conf.refresh_period, chanserv_auto_resync, NULL);
+}
+
static CHANSERV_FUNC(cmd_unf)
{
if(channel)
sprintf(response, "\ 2%s\ 2: %s", user->nick, fmt);
irc_privmsg(cmd->parent->bot, channel->name, response);
}
- else
- reply("CSMSG_UNF_RESPONSE");
+ else
+ reply("CSMSG_UNF_RESPONSE");
+ return 1;
+}
+
+static CHANSERV_FUNC(cmd_ping)
+{
+ if(channel)
+ {
+ char response[MAXLEN];
+ const char *fmt = user_find_message(user, "CSMSG_PING_RESPONSE");
+ sprintf(response, "\ 2%s\ 2: %s", user->nick, fmt);
+ irc_privmsg(cmd->parent->bot, channel->name, response);
+ }
+ else
+ reply("CSMSG_PING_RESPONSE");
+ return 1;
+}
+
+static CHANSERV_FUNC(cmd_wut)
+{
+ if(channel)
+ {
+ char response[MAXLEN];
+ const char *fmt = user_find_message(user, "CSMSG_WUT_RESPONSE");
+ sprintf(response, "\ 2%s\ 2: %s", user->nick, fmt);
+ irc_privmsg(cmd->parent->bot, channel->name, response);
+ }
+ else
+ reply("CSMSG_WUT_RESPONSE");
+ return 1;
+}
+
+static CHANSERV_FUNC(cmd_roulette)
+{
+ if(channel) {
+ struct chanData *cData = channel->channel_info;
+
+ if (cData) {
+ if (cData->roulette_chamber) {
+ DelUser(user, chanserv, 1, "BANG - Don't stuff bullets into a loaded gun");
+ return 1;
+ }
+
+ send_target_message(1, channel->name, cmd->parent->bot, "CSMSG_ROULETTE_LOADS");
+ cData->roulette_chamber = 1 + rand() % 6;
+ }
+ }
+
+ return 1;
+}
+static CHANSERV_FUNC(cmd_shoot)
+{
+ if(channel) {
+ struct chanData *cData = channel->channel_info;
+
+ if (cData->roulette_chamber <= 0) {
+ struct service *service;
+ if ((service = service_find(chanserv->nick))) {
+ reply("CSMSG_ROULETTE_NEW", service->trigger);
+ }
+ return 1;
+ }
+
+ cData->roulette_chamber--;
+
+ if (cData->roulette_chamber == 0) {
+ reply("CSMSG_ROULETTE_BANG");
+ reply("CSMSG_ROULETTE_BETTER_LUCK", user->nick);
+ DelUser(user, chanserv, 1, "BANG!!!!");
+ } else
+ reply("CSMSG_ROULETTE_CLICK");
+ }
+
return 1;
}
-static CHANSERV_FUNC(cmd_ping)
+static void
+chanserv_remove_abuse(void *data)
{
- if(channel)
- {
- char response[MAXLEN];
- const char *fmt = user_find_message(user, "CSMSG_PING_RESPONSE");
- sprintf(response, "\ 2%s\ 2: %s", user->nick, fmt);
- irc_privmsg(cmd->parent->bot, channel->name, response);
+ char *remnick = data;
+ struct userNode *user;
+ /* sometimes the clone was killed and maybe even the user took their nick back
+ * (ie, an oper) so dont kill them here after all unless they are local. */
+ if( (user = GetUserH(remnick)) )
+ if(IsLocal(user) )
+ DelUser(user, NULL, 1, "");
+}
+
+int lamepart(struct userNode *nick) {
+ struct modeNode *mn;
+ unsigned int count, n;
+
+ for (n=count=0; n<nick->channels.used; n++) {
+ mn = nick->channels.list[n];
+ irc_svspart(chanserv, nick, mn->channel);
}
- else
- reply("CSMSG_PING_RESPONSE");
- return 1;
+
+ return 0;
}
-static CHANSERV_FUNC(cmd_wut)
+static CHANSERV_FUNC(cmd_spin)
{
- if(channel)
- {
- char response[MAXLEN];
- const char *fmt = user_find_message(user, "CSMSG_WUT_RESPONSE");
- sprintf(response, "\ 2%s\ 2: %s", user->nick, fmt);
- irc_privmsg(cmd->parent->bot, channel->name, response);
+ if(!channel)
+ return 1;
+
+ int type = 0, lamep = 1;
+ char *tstr;
+
+ tstr = conf_get_data("server/type", RECDB_QSTRING);
+ if(tstr) {
+ type = atoi(tstr);
+ if (type > 6)
+ lamep = 0;
}
- else
- reply("CSMSG_WUT_RESPONSE");
+
+
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_WHEEL1", user->nick);
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_WHEEL2");
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_WHEEL3");
+
+ if(chanserv_conf.wheel->used < 1) {
+ /* wheel actions not defined! eek */
+ return 1;
+ }
+
+ const char *wheel = chanserv_conf.wheel->list[ (int) ( (chanserv_conf.wheel->used) * (rand() / (RAND_MAX + 1.0)) ) ];
+ if(!wheel && *wheel)
+ return 1;
+
+/* enable this to be able to manually specify a result for testing:
+ log_module(MAIN_LOG, LOG_DEBUG,"Testing wheel randomness: %s\n", wheel);
+ if(argc > 1) {
+ wheel = argv[1];
+ }
+*/
+
+ /* connection reset by peer */
+ if (!strcasecmp(wheel, "peer")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_PEER");
+ if (type < 7)
+ irc_kill(chanserv, user, "Connection reset by peer");
+ else
+ irc_svsquit(chanserv, user, "Connection reset by peer");
+ }
+ /* part all channels */
+ else if (!strcasecmp(wheel, "partall")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_PARTALL");
+ if (lamep)
+ lamepart(user);
+ else
+ sputsock("%s SJ %s 0 "FMT_TIME_T, self->numeric, user->numeric, now);
+ }
+ /* random time gline */
+ else if (!strcasecmp(wheel, "gline")) {
+ char target[HOSTLEN + 3];
+ int wtime = 120 + rand() % 600;
+
+ strcpy(target, "*@");
+ strcat(target, user->hostname);
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_GLINE");
+
+ gline_add(chanserv->nick, target, wtime, "Reward for spinning the wheel of misfortune!", now, 1, 0);
+// irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
+ }
+ /* random shun */
+ else if (!strcasecmp(wheel, "shun")) {
+ char target[HOSTLEN + 3];
+ int wtime = 120 + rand() % 600;
+
+ strcpy(target, "*@");
+ strcat(target, user->hostname);
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_SHUN");
+
+ shun_add(chanserv->nick, target, wtime, "Reward for spinning the wheel of misfortune!", now, 1);
+ }
+ /* absolutely nothing */
+ else if (!strcasecmp(wheel, "nothing")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_NOTHING");
+ }
+ /* join random chans and part em several times */
+ else if (!strcasecmp(wheel, "randjoin")) {
+ int complete = 0;
+ int rndchans = 0;
+ int chango = 0;
+ int roundz0r = 0;
+
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_RANDJOIN");
+ while(complete != 1) {
+ if (rndchans != 15) {
+ chango = 120 + rand() % 600;
+ sputsock("%s SJ %s #%d "FMT_TIME_T, self->numeric, user->numeric, chango, now);
+ rndchans++;
+ } else {
+ if (roundz0r != 1) {
+ if (lamep)
+ lamepart(user);
+ else
+ sputsock("%s SJ %s 0 "FMT_TIME_T, self->numeric, user->numeric, now);
+ roundz0r = 1;
+ rndchans = 0;
+ } else {
+ if (lamep)
+ lamepart(user);
+ else
+ sputsock("%s SJ %s 0 "FMT_TIME_T, self->numeric, user->numeric, now);
+ complete = 1;
+ }
+ }
+ }
+ }
+ /* abuse line added to /whois */
+ else if (!strcasecmp(wheel, "abusewhois")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_ABUSEWHOIS");
+ irc_swhois(chanserv, user, "is being defecated on by services");
+ }
+ /* kick from each channel your in */
+ else if (!strcasecmp(wheel, "kickall")) {
+ unsigned int count, n;
+ struct modeNode *mn;
+
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_KICKALL");
+
+ for (n=count=0; n<user->channels.used; n++) {
+ mn = user->channels.list[n];
+ irc_kick(chanserv, user, mn->channel, "Reward for spinning the wheel of misfortune!");
+ }
+ }
+ /* random nick change */
+ else if (!strcasecmp(wheel, "nickchange")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_NICKCHANGE");
+
+ char *oldnick = NULL;
+ char *oldident = NULL;
+ char *oldhost = NULL;
+ char abusednick[NICKLEN] = "";
+ int abusednum = 1 + (int) (10000.0 * (rand() / (RAND_MAX + 1.0)));
+ struct userNode *clone;
+
+ oldnick = strdup(user->nick);
+ oldident = strdup(user->ident);
+ oldhost = strdup(user->hostname);
+
+ //snprintf(abusednick, NICKLEN, "Abused%d", abusednum+(1 + rand() % 120));
+ while (1) {
+ snprintf(abusednick, NICKLEN, "Abused%d", abusednum+(1 + rand() % 120));
+ log_module(MAIN_LOG, LOG_DEBUG, "Abused Nick: %s, Client Nick: %s", abusednick, user->nick);
+ if(!GetUserH(abusednick))
+ break;
+ }
+
+ SVSNickChange(user, abusednick);
+ irc_svsnick(chanserv, user, abusednick);
+ clone = AddLocalUser(oldnick, oldident, oldhost, "I got abused by the wheel of misfortune :D", "+i");
+ timeq_add(now + 300, chanserv_remove_abuse, clone->nick);
+ }
+ /* kill */
+ else if (!strcasecmp(wheel, "kill")) {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_KILL");
+
+ DelUser(user, chanserv, 1, "Reward for spinning the wheel of misfortune!");
+ //irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
+ }
+ /* service ignore */
+ else if (!strcasecmp(wheel, "svsignore")) {
+ int gagged, ignoretime = 0;
+ char target[HOSTLEN + 13];
+
+ if(IsOper(user)) {
+ /* we cant gag opers, so just verbally abuse them */
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_SVSIGNORE_OPER");
+ return 1;
+ }
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_SVSIGNORE");
+
+ strcpy(target, "*!*@");
+ strcat(target, user->hostname);
+ ignoretime = now + (1 + rand() % 120);
+
+ gagged = gag_create(target, "wheelofabuse", "Reward for spinning the wheel of misfortune!", ignoretime);
+ }
+ /* kick and ban from each channel your in */
+ else if (!strcasecmp(wheel, "kickbanall")) {
+ unsigned int count, n;
+ struct modeNode *mn;
+ //char ban[HOSTLEN + 1];
+
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_KICKBANALL");
+
+ //snprintf(ban, sizeof(ban), "*!*@%s", user->hostname);
+ for (n=count=0; n<user->channels.used; n++) {
+ struct mod_chanmode *change;
+/* struct banData *bData; */
+ unsigned int exists;
+/* int duration = 300; */
+ char *ban;
+
+ ban = generate_hostmask(user, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT|GENMASK_USENICK);
+
+ log_module(MAIN_LOG, LOG_DEBUG, "Generated ban %s", ban);
+ mn = user->channels.list[n];
+ if(mn->channel->banlist.used >= MAXBANS) {
+ reply("CSMSG_BANLIST_FULL", mn->channel->name);
+ free(ban);
+ continue;
+ }
+
+/* bData = add_channel_ban(mn->channel->channel_info, ban, chanserv->nick, now, now, now + duration, "Reward for spinning the wheel of misfortune!"); */
+
+ change = mod_chanmode_alloc(1);
+ change->args[0].mode = MODE_REMOVE|MODE_CHANOP|MODE_HALFOP|MODE_VOICE;
+ change->args[0].u.member = GetUserMode(mn->channel, user);
+ change->argc = 1;
+
+ mod_chanmode_announce(chanserv, mn->channel, change);
+ mod_chanmode_free(change);
+
+ exists = ChannelBanExists(mn->channel, ban);
+ if(!exists) {
+ change = mod_chanmode_alloc(1);
+ change->args[0].mode = MODE_BAN;
+ change->args[0].u.hostmask = ban;
+ change->argc = 1;
+ mod_chanmode_announce(chanserv, mn->channel, change);
+ mod_chanmode_free(change);
+ }
+
+ if(exists) {
+ reply("CSMSG_REDUNDANT_BAN", ban, mn->channel->name);
+ free(ban);
+ }
+
+ irc_kick(chanserv, user, mn->channel, "Reward for spinning the wheel of misfortune!");
+ }
+ }
+ else {
+ send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_UNKNOWN", wheel);
+ }
+
return 1;
}
word3 = argc>3?argv[3]:"";
/*** COLOR *****/
- if((word2) && strcasecmp(word1, "what") == 0 && strcasecmp(word2, "color") == 0)
+ if((word2) && strcasecmp(word1, "what") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
eightball(eb, 1, accum);
- else if((word3) && strcasecmp(word1, "what's") == 0 && strcasecmp(word2, "the") == 0 && strcasecmp(word3, "color") == 0)
+ else if((word3) && strcasecmp(word1, "what's") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
eightball(eb, 1, accum);
- else if((word3) && strcasecmp(word1, "whats") == 0 && strcasecmp(word2, "the") == 0 && strcasecmp(word3, "color") == 0)
+ else if((word3) && strcasecmp(word1, "whats") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
eightball(eb, 1, accum);
/*** LOCATION *****/
else if(
return 1;
}
+static CHANSERV_FUNC(cmd_reply)
+{
+
+ REQUIRE_PARAMS(2);
+ unsplit_string(argv + 1, argc - 1, NULL);
+
+ if(channel)
+ send_channel_message(channel, cmd->parent->bot, "$b%s$b: %s", user->nick, unsplit_string(argv + 1, argc - 1, NULL));
+ else
+ send_message_type(4, user, cmd->parent->bot, "%s", unsplit_string(argv + 1, argc - 1, NULL));
+ return 1;
+}
+
static void
chanserv_adjust_limit(void *data)
{
}
static void
-handle_new_channel(struct chanNode *channel)
+handle_new_channel(struct chanNode *channel, UNUSED_ARG(void *extra))
{
struct chanData *cData;
SetChannelTopic(channel, chanserv, chanserv, channel->channel_info->topic, 1);
}
+int
+trace_check_bans(struct userNode *user, struct chanNode *chan)
+{
+ struct banData *bData;
+ struct mod_chanmode *change;
+
+ change = find_matching_bans(&chan->banlist, user, NULL);
+ if (change)
+ return 1;
+
+ /* lamer list */
+ if (chan->channel_info) {
+ for(bData = chan->channel_info->bans; bData; bData = bData->next) {
+
+ if(!user_matches_glob(user, bData->mask, MATCH_USENICK, 0))
+ continue;
+
+ if(bData)
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+int
+check_bans(struct userNode *user, const char *channel)
+{
+ struct chanNode *chan;
+ struct mod_chanmode change;
+ struct chanData *cData;
+ struct banData *bData;
+
+ if (!(chan = GetChannel(channel)))
+ return 0;
+
+ if(!(cData = chan->channel_info))
+ return 0;
+
+ mod_chanmode_init(&change);
+ change.argc = 1;
+
+ if(chan->banlist.used < MAXBANS)
+ {
+ /* Not joining through a ban. */
+ for(bData = cData->bans;
+ bData && !user_matches_glob(user, bData->mask, MATCH_USENICK, 0);
+ bData = bData->next);
+
+ if(bData)
+ {
+ char kick_reason[MAXLEN];
+ sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason);
+
+ bData->triggered = now;
+ if(bData != cData->bans)
+ {
+ /* Shuffle the ban to the head of the list. */
+ if(bData->next)
+ bData->next->prev = bData->prev;
+ if(bData->prev)
+ bData->prev->next = bData->next;
+
+ bData->prev = NULL;
+ bData->next = cData->bans;
+
+ if(cData->bans)
+ cData->bans->prev = bData;
+
+ cData->bans = bData;
+ }
+
+ change.args[0].mode = MODE_BAN;
+ change.args[0].u.hostmask = bData->mask;
+ mod_chanmode_announce(chanserv, chan, &change);
+ KickChannelUser(user, chan, chanserv, kick_reason);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+int
+channel_user_is_exempt(struct userNode *user, struct chanNode *channel)
+{
+ unsigned int ii;
+ for(ii = 0; ii < channel->exemptlist.used; ii++)
+ {
+ if(user_matches_glob(user, channel->exemptlist.list[ii]->exempt, MATCH_USENICK, 0))
+ return true;
+ }
+ return false;
+}
+
+
/* Welcome to my worst nightmare. Warning: Read (or modify)
the code below at your own risk. */
static int
-handle_join(struct modeNode *mNode)
+handle_join(struct modeNode *mNode, UNUSED_ARG(void *extra))
{
struct mod_chanmode change;
struct userNode *user = mNode->user;
unsigned int modes = 0, info = 0;
char *greeting;
- if(IsLocal(user) || !channel->channel_info || IsSuspended(channel->channel_info))
+ if(IsLocal(user) || !channel || !channel->channel_info || IsSuspended(channel->channel_info))
return 0;
cData = channel->channel_info;
unsigned int ii;
for(ii = 0; ii < channel->banlist.used; ii++)
{
- if(user_matches_glob(user, channel->banlist.list[ii]->ban, MATCH_USENICK))
+ if(user_matches_glob(user, channel->banlist.list[ii]->ban, MATCH_USENICK, 0))
{
/* Riding a netburst. Naughty. */
KickChannelUser(user, channel, chanserv, "User from far side of netsplit should have been banned - bye.");
}
#endif
+ if(user->handle_info)
+ {
+ handle = user->handle_info;
+ if(handle)
+ {
+ uData = GetTrueChannelAccess(cData, handle);
+ }
+ }
+
+
mod_chanmode_init(&change);
change.argc = 1;
- if(channel->banlist.used < MAXBANS)
- {
- /* Not joining through a ban. */
- for(bData = cData->bans;
- bData && !user_matches_glob(user, bData->mask, MATCH_USENICK);
- bData = bData->next);
- if(bData)
+ /* TODO: maybe only people above inviteme level? -Rubin */
+ /* We don't kick people with access */
+ if(!uData && !channel_user_is_exempt(user, channel))
+ {
+ if(channel->banlist.used < MAXBANS)
{
- char kick_reason[MAXLEN];
- sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason);
+ /* Not joining through a ban. */
+ for(bData = cData->bans;
+ bData && !user_matches_glob(user, bData->mask, MATCH_USENICK, 0);
+ bData = bData->next);
- bData->triggered = now;
- if(bData != cData->bans)
+ if(bData)
{
- /* Shuffle the ban to the head of the list. */
- if(bData->next)
- bData->next->prev = bData->prev;
- if(bData->prev)
- bData->prev->next = bData->next;
+ char kick_reason[MAXLEN];
+ sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason);
- bData->prev = NULL;
- bData->next = cData->bans;
+ bData->triggered = now;
+ if(bData != cData->bans)
+ {
+ /* Shuffle the ban to the head of the list. */
+ if(bData->next)
+ bData->next->prev = bData->prev;
+ if(bData->prev)
+ bData->prev->next = bData->next;
+
+ bData->prev = NULL;
+ bData->next = cData->bans;
+
+ if(cData->bans)
+ cData->bans->prev = bData;
+ cData->bans = bData;
+ }
- if(cData->bans)
- cData->bans->prev = bData;
- cData->bans = bData;
+ change.args[0].mode = MODE_BAN;
+ change.args[0].u.hostmask = bData->mask;
+ mod_chanmode_announce(chanserv, channel, &change);
+ KickChannelUser(user, channel, chanserv, kick_reason);
+ return 1;
}
-
- change.args[0].mode = MODE_BAN;
- change.args[0].u.hostmask = bData->mask;
- mod_chanmode_announce(chanserv, channel, &change);
- KickChannelUser(user, channel, chanserv, kick_reason);
- return 1;
}
}
greeting = cData->greeting;
if(user->handle_info)
{
- handle = user->handle_info;
+/* handle = user->handle_info; */
if(IsHelper(user) && !IsHelping(user))
{
}
}
- uData = GetTrueChannelAccess(cData, handle);
+/* uData = GetTrueChannelAccess(cData, handle); */
if(uData && !IsUserSuspended(uData))
{
/* non users getting automodes are handled above. */
if(IsUserAutoOp(uData) && cData->chOpts[chAutomode] != 'n')
{
- if(uData->access >= UL_OP )
+ /* just op everyone with access */
+ if(uData->access >= UL_PEON && cData->chOpts[chAutomode] == 'l')
+ modes |= MODE_VOICE;
+ /* or do their access level */
+ else if(uData->access >= UL_OP )
modes |= MODE_CHANOP;
else if(uData->access >= UL_HALFOP )
modes |= MODE_HALFOP;
}
static void
-handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+chanserv_autojoin_channels(struct userNode *user)
+{
+ struct userData *channel;
+
+ for(channel = user->handle_info->channels; channel; channel = channel->u_next)
+ {
+ struct chanNode *cn;
+ struct modeNode *mn;
+
+ if(IsUserSuspended(channel)
+ || IsSuspended(channel->channel)
+ || !(cn = channel->channel->channel))
+ continue;
+
+ mn = GetUserMode(cn, user);
+ if(!mn)
+ {
+ if(!IsUserSuspended(channel)
+ && IsUserAutoJoin(channel)
+ && (channel->access >= channel->channel->lvlOpts[lvlInviteMe])
+ && !self->burst
+ && !user->uplink->burst)
+ irc_svsjoin(chanserv, user, cn);
+ }
+ }
+}
+
+static void
+handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle), UNUSED_ARG(void *extra))
{
struct mod_chanmode change;
struct userData *channel;
for(channel = user->handle_info->channels; channel; channel = channel->u_next)
{
struct chanNode *cn;
+ struct chanData *cData;
struct modeNode *mn;
if(IsUserSuspended(channel)
|| IsSuspended(channel->channel)
|| !(cn = channel->channel->channel))
continue;
+ cData = cn->channel_info;
mn = GetUserMode(cn, user);
if(!mn)
{
if(channel->access >= UL_PRESENT)
channel->channel->visited = now;
- if(IsUserAutoOp(channel))
+ if(IsUserAutoOp(channel) && cData->chOpts[chAutomode] != 'n')
{
if(channel->access >= UL_OP )
change.args[0].mode = MODE_CHANOP;
for(ii = 0; ii < user->channels.used; ++ii)
{
- struct chanNode *channel = user->channels.list[ii]->channel;
+ struct chanNode *chan = user->channels.list[ii]->channel;
struct banData *ban;
if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE))
- || !channel->channel_info
- || IsSuspended(channel->channel_info))
+ || !chan->channel_info
+ || IsSuspended(chan->channel_info))
continue;
- for(jj = 0; jj < channel->banlist.used; ++jj)
- if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK))
+ if(protect_user(user, chanserv, chan->channel_info, true))
+ continue;
+ for(jj = 0; jj < chan->banlist.used; ++jj)
+ if(user_matches_glob(user, chan->banlist.list[jj]->ban, MATCH_USENICK, 0))
break;
- if(jj < channel->banlist.used)
+ if(jj < chan->banlist.used)
continue;
- for(ban = channel->channel_info->bans; ban; ban = ban->next)
+ for(ban = chan->channel_info->bans; ban; ban = ban->next)
{
char kick_reason[MAXLEN];
- if(!user_matches_glob(user, ban->mask,MATCH_USENICK | MATCH_VISIBLE))
+ if(!user_matches_glob(user, ban->mask,MATCH_USENICK | MATCH_VISIBLE, 0))
continue;
change.args[0].mode = MODE_BAN;
change.args[0].u.hostmask = ban->mask;
- mod_chanmode_announce(chanserv, channel, &change);
+ mod_chanmode_announce(chanserv, chan, &change);
sprintf(kick_reason, "(%s) %s", ban->owner, ban->reason);
- KickChannelUser(user, channel, chanserv, kick_reason);
+ KickChannelUser(user, chan, chanserv, kick_reason);
ban->triggered = now;
break;
}
irc_silence(user, user->handle_info->ignores->list[i], 1);
}
}
+
+ if (user->handle_info->epithet)
+ irc_swhois(chanserv, user, user->handle_info->epithet);
+
+ /* process autojoin channels 5 seconds later as this sometimes
+ happens before autohide */
+// timeq_add(now + 5, chanserv_autojoin_channels, user);
+ chanserv_autojoin_channels(user);
}
static void
-handle_part(struct modeNode *mn, UNUSED_ARG(const char *reason))
+handle_part(struct modeNode *mn, UNUSED_ARG(const char *reason), UNUSED_ARG(void *extra))
{
struct chanData *cData;
struct userData *uData;
{
scan_user_presence(uData, mn->user);
uData->seen = now;
- }
+ if (uData->access >= UL_PRESENT)
+ cData->visited = now;
+ }
if(IsHelping(mn->user) && IsSupportHelper(mn->user))
{
- unsigned int ii, jj;
- for(ii = 0; ii < chanserv_conf.support_channels.used; ++ii)
- {
- for(jj = 0; jj < mn->user->channels.used; ++jj)
- if(mn->user->channels.list[jj]->channel == chanserv_conf.support_channels.list[ii])
- break;
- if(jj < mn->user->channels.used)
+ unsigned int ii;
+ for(ii = 0; ii < chanserv_conf.support_channels.used; ++ii) {
+ struct chanNode *channel;
+ struct userNode *exclude;
+ /* When looking at the channel that is being /part'ed, we
+ * have to skip over the client that is leaving. For
+ * other channels, we must not do that.
+ */
+ channel = chanserv_conf.support_channels.list[ii];
+ exclude = (channel == mn->channel) ? mn->user : NULL;
+ if(find_handle_in_channel(channel, mn->user->handle_info, exclude))
break;
}
if(ii == chanserv_conf.support_channels.used)
}
static void
-handle_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *channel)
+handle_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *channel, UNUSED_ARG(void *extra))
{
struct userData *uData;
|| (kicker->handle_info && kicker->handle_info == victim->handle_info))
return;
- if(protect_user(victim, kicker, channel->channel_info))
+ if(protect_user(victim, kicker, channel->channel_info, false))
{
const char *reason = user_find_message(kicker, "CSMSG_USER_PROTECTED_KICK");
KickChannelUser(kicker, channel, chanserv, reason);
}
static int
-handle_topic(struct userNode *user, struct chanNode *channel, const char *old_topic)
+handle_topic(struct userNode *user, struct chanNode *channel, const char *old_topic, UNUSED_ARG(void *extra))
{
struct chanData *cData;
conform_topic(cData->topic_mask, channel->topic, new_topic);
if(*new_topic)
{
- SetChannelTopic(channel, chanserv, chanserv, new_topic, 1);
+ SetChannelTopic(channel, chanserv, user, new_topic, 1);
/* and fall through to topicsnarf code below.. */
}
else /* Topic couldnt fit into mask, was too long */
{
- SetChannelTopic(channel, chanserv, chanserv, old_topic, 1);
+ SetChannelTopic(channel, chanserv, user, old_topic, 1);
send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT1", channel->name, cData->topic_mask);
send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
return 1;
}
static void
-handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_chanmode *change)
+handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_chanmode *change, UNUSED_ARG(void *extra))
{
struct mod_chanmode *bounce = NULL;
unsigned int bnc, ii;
if((change->args[ii].mode & (MODE_REMOVE|MODE_CHANOP)) == (MODE_REMOVE|MODE_CHANOP))
{
const struct userNode *victim = change->args[ii].u.member->user;
- if(!protect_user(victim, user, channel->channel_info))
+ if(!protect_user(victim, user, channel->channel_info, false))
continue;
if(!bounce)
bounce = mod_chanmode_alloc(change->argc + 1 - ii);
else if(change->args[ii].mode & MODE_CHANOP)
{
const struct userNode *victim = change->args[ii].u.member->user;
- if(IsService(victim) || validate_op(user, channel, (struct userNode*)victim))
+ if(IsService(victim) || validate_op(NULL, user, channel, (struct userNode*)victim))
continue;
if(!bounce)
bounce = mod_chanmode_alloc(change->argc + 1 - ii);
}
static void
-handle_nick_change(struct userNode *user, UNUSED_ARG(const char *old_nick))
+handle_nick_change(struct userNode *user, UNUSED_ARG(const char *old_nick), UNUSED_ARG(void *extra))
{
struct chanNode *channel;
struct banData *bData;
/* Need not check for bans if they're opped or voiced. */
/* TODO: does this make sense in automode v, h, and o? *
* lets still enforce on voice people anyway, and see how that goes -Rubin */
- if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP /*|MODE_VOICE */))
+ if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE ))
continue;
/* Need not check for bans unless channel registration is active. */
if(!channel->channel_info || IsSuspended(channel->channel_info))
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))
+ if(user_matches_glob(user, channel->banlist.list[jj]->ban, MATCH_USENICK, 0))
break;
/* Need not act if we found one. */
if(jj < channel->banlist.used)
continue;
+ /* don't kick someone on the userlist */
+ if(protect_user(user, chanserv, channel->channel_info, true))
+ continue;
/* Look for a matching ban in this channel. */
for(bData = channel->channel_info->bans; bData; bData = bData->next)
{
- if(!user_matches_glob(user, bData->mask, MATCH_USENICK | MATCH_VISIBLE))
+ if(!user_matches_glob(user, bData->mask, MATCH_USENICK | MATCH_VISIBLE, 0))
continue;
change.args[0].u.hostmask = bData->mask;
mod_chanmode_announce(chanserv, channel, &change);
}
}
-static void handle_rename(struct handle_info *handle, const char *old_handle)
+static void handle_rename(struct handle_info *handle, const char *old_handle, UNUSED_ARG(void *extra))
{
struct do_not_register *dnr = dict_find(handle_dnrs, old_handle, NULL);
}
static void
-handle_unreg(UNUSED_ARG(struct userNode *user), struct handle_info *handle)
+handle_unreg(UNUSED_ARG(struct userNode *user), struct handle_info *handle, UNUSED_ARG(void *extra))
{
struct userNode *h_user;
}
}
-static void
-handle_server_link(UNUSED_ARG(struct server *server))
+static int
+handle_server_link(UNUSED_ARG(struct server *server), UNUSED_ARG(void *extra))
{
struct chanData *cData;
timeq_add(now + chanserv_conf.adjust_delay, chanserv_adjust_limit, cData);
}
}
+ return 0;
}
static void
chanserv_conf.ban_timeout_frequency = str ? ParseInterval(str) : 600;
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);
chanserv_conf.network_helper_epithet = str ? str : "a wannabe tyrant";
str = database_get_data(conf_node, KEY_SUPPORT_HELPER_EPITHET, RECDB_QSTRING);
chanserv_conf.support_helper_epithet = str ? str : "a wannabe tyrant";
+ str = database_get_data(conf_node, KEY_GOD_TIMEOUT, RECDB_QSTRING);
+ god_timeout = str ? ParseInterval(str) : 60*15;
str = database_get_data(conf_node, "default_modes", RECDB_QSTRING);
if(!str)
str = "+nt";
chanserv_conf.default_modes = *change;
mod_chanmode_free(change);
}
+ str = database_get_data(conf_node, KEY_VALID_CHANNEL_REGEX, RECDB_QSTRING);
+ if (chanserv_conf.valid_channel_regex_set)
+ regfree(&chanserv_conf.valid_channel_regex);
+ if (str) {
+ int err = regcomp(&chanserv_conf.valid_channel_regex, str, REG_EXTENDED|REG_ICASE|REG_NOSUB);
+ chanserv_conf.valid_channel_regex_set = !err;
+ if (err) log_module(CS_LOG, LOG_ERROR, "Bad valid_channel_regex (error %d)", err);
+ } else {
+ chanserv_conf.valid_channel_regex_set = 0;
+ }
+ free_string_list(chanserv_conf.wheel);
+ strlist = database_get_data(conf_node, "wheel", RECDB_STRING_LIST);
+ if(strlist)
+ strlist = string_list_copy(strlist);
+ else
+ {
+ static const char *list[] = {
+ "peer", "partall", "gline", /* "shun", */
+ "nothing", "randjoin", "abusewhois", "kickall",
+ "nickchange", "kill", "svsignore", "kickbanall",
+ NULL};
+ unsigned int ii;
+ strlist = alloc_string_list(ArrayLength(list)-1);
+ for(ii=0; list[ii]; ii++)
+ string_list_append(strlist, strdup(list[ii]));
+ }
+ chanserv_conf.wheel = strlist;
+
free_string_list(chanserv_conf.set_shows);
strlist = database_get_data(conf_node, "set_shows", RECDB_STRING_LIST);
if(strlist)
"PubCmd", "InviteMe", "UserInfo","EnfOps",
"EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters",
/* multiple choice options */
- "AutoMode", "CtcpReaction", "Protect", "Toys", "TopicRefresh",
+ "AutoMode", "CtcpReaction", "Protect", "Toys", "TopicRefresh", "Resync",
/* binary options */
"DynLimit", "NoDelete", "BanTimeout",
/* delimiter */
NULL
};
- unsigned int ii;
strlist = alloc_string_list(ArrayLength(list)-1);
for(ii=0; list[ii]; ii++)
string_list_append(strlist, strdup(list[ii]));
* function list as invalid, so it will be initialized.
*/
set_shows_list.used = 0;
+
free_string_list(chanserv_conf.eightball);
strlist = database_get_data(conf_node, KEY_8BALL_RESPONSES, RECDB_STRING_LIST);
if(strlist)
string_list_append(strlist, strdup("Maybe so."));
}
chanserv_conf.eightball = strlist;
+
free_string_list(chanserv_conf.old_ban_names);
strlist = database_get_data(conf_node, KEY_OLD_BAN_NAMES, RECDB_STRING_LIST);
if(strlist)
{
struct handle_info *handle;
struct userData *uData;
- char *seen, *inf, *flags, *expires;
+ char *seen, *inf, *flags, *expires, *accessexpiry, *clvlexpiry, *lstacc;
time_t last_seen;
- unsigned short access;
+ unsigned short access_level, lastaccess = 0;
if(rd->type != RECDB_OBJECT || !dict_size(rd->d.object))
{
return;
}
- access = atoi(database_get_data(rd->d.object, KEY_LEVEL, RECDB_QSTRING));
- if(access > UL_OWNER)
+ access_level = atoi(database_get_data(rd->d.object, KEY_LEVEL, RECDB_QSTRING));
+ if(access_level > UL_OWNER)
{
log_module(CS_LOG, LOG_ERROR, "Invalid access level for %s in %s.", key, chan->channel->name);
return;
last_seen = seen ? (signed)strtoul(seen, NULL, 0) : now;
flags = database_get_data(rd->d.object, KEY_FLAGS, RECDB_QSTRING);
expires = database_get_data(rd->d.object, KEY_EXPIRES, RECDB_QSTRING);
+ accessexpiry = database_get_data(rd->d.object, KEY_ACCESSEXPIRY, RECDB_QSTRING);
+ clvlexpiry = database_get_data(rd->d.object, KEY_CLVLEXPIRY, RECDB_QSTRING);
+ lstacc = database_get_data(rd->d.object, KEY_LASTLEVEL, RECDB_QSTRING);
+ lastaccess = lstacc ? atoi(lstacc) : 0;
+
handle = get_handle_info(key);
if(!handle)
{
return;
}
- uData = add_channel_user(chan, handle, access, last_seen, inf);
+ uData = add_channel_user(chan, handle, access_level, last_seen, inf, 0);
uData->flags = flags ? strtoul(flags, NULL, 0) : 0;
uData->expires = expires ? strtoul(expires, NULL, 0) : 0;
+ uData->accessexpiry = accessexpiry ? strtoul(accessexpiry, NULL, 0) : 0;
+ if (uData->accessexpiry > 0)
+ timeq_add(uData->accessexpiry, chanserv_expire_tempuser, uData);
+
+ uData->clvlexpiry = clvlexpiry ? strtoul(clvlexpiry, NULL, 0) : 0;
+ if (uData->clvlexpiry > 0)
+ timeq_add(uData->clvlexpiry, chanserv_expire_tempclvl, uData);
+
+ uData->lastaccess = lastaccess;
+
if((uData->flags & USER_SUSPENDED) && uData->expires)
{
if(uData->expires > now)
str = database_get_data(channel, KEY_TOPIC, RECDB_QSTRING);
cData->topic = str ? strdup(str) : NULL;
+ str = database_get_data(channel, KEY_MAXSETINFO, RECDB_QSTRING);
+ cData->maxsetinfo = str ? strtoul(str, NULL, 0) : chanserv_conf.max_userinfo_length;
+
if(!IsSuspended(cData)
&& (str = database_get_data(channel, KEY_MODES, RECDB_QSTRING))
&& (argc = split_line(str, 0, ArrayLength(argv), argv))
{
const char *setter, *reason, *str;
struct do_not_register *dnr;
+ time_t 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 ? (time_t)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);
saxdb_start_record(ctx, uData->handle->handle, 0);
saxdb_write_int(ctx, KEY_LEVEL, uData->access);
saxdb_write_int(ctx, KEY_SEEN, uData->seen);
+ saxdb_write_int(ctx, KEY_ACCESSEXPIRY, uData->accessexpiry);
+ saxdb_write_int(ctx, KEY_CLVLEXPIRY, uData->clvlexpiry);
+ saxdb_write_int(ctx, KEY_LASTLEVEL, uData->lastaccess);
if(uData->flags)
saxdb_write_int(ctx, KEY_FLAGS, uData->flags);
if(uData->expires)
}
saxdb_end_record(ctx);
+ if (channel->maxsetinfo)
+ saxdb_write_int(ctx, KEY_MAXSETINFO, channel->maxsetinfo);
+
if(channel->modes.modes_set || channel->modes.modes_clear)
{
mod_chanmode_format(&channel->modes, buf);
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)
+ continue;
saxdb_start_record(ctx, dnr->chan_name, 0);
if(dnr->set)
saxdb_write_int(ctx, KEY_DNR_SET, dnr->set);
+ if(dnr->expires)
+ {
+ dict_remove(dnrs, iter_key(it));
+ 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);
}
static void
-chanserv_db_cleanup(void) {
+chanserv_db_cleanup(UNUSED_ARG(void *extra)) {
unsigned int ii;
- unreg_part_func(handle_part);
+ unreg_part_func(handle_part, NULL);
while(channelList)
unregister_channel(channelList, "terminating.");
for(ii = 0; ii < chanserv_conf.support_channels.used; ++ii)
dict_delete(note_types);
free_string_list(chanserv_conf.eightball);
free_string_list(chanserv_conf.old_ban_names);
+ free_string_list(chanserv_conf.wheel);
free_string_list(chanserv_conf.set_shows);
free(set_shows_list.list);
free(uset_shows_list.list);
}
}
-#define DEFINE_COMMAND(NAME, MIN_ARGC, FLAGS, OPTIONS...) modcmd_register(chanserv_module, #NAME, cmd_##NAME, MIN_ARGC, FLAGS, ## OPTIONS)
+#if defined(GCC_VARMACROS)
+# define DEFINE_COMMAND(NAME, MIN_ARGC, FLAGS, ARGS...) modcmd_register(chanserv_module, #NAME, cmd_##NAME, MIN_ARGC, FLAGS, ARGS)
+#elif defined(C99_VARMACROS)
+# define DEFINE_COMMAND(NAME, MIN_ARGC, FLAGS, ...) modcmd_register(chanserv_module, #NAME, cmd_##NAME, MIN_ARGC, FLAGS, __VA_ARGS__)
+#endif
#define DEFINE_CHANNEL_OPTION(NAME) modcmd_register(chanserv_module, "set "#NAME, chan_opt_##NAME, 1, 0, NULL)
#define DEFINE_USER_OPTION(NAME) modcmd_register(chanserv_module, "uset "#NAME, user_opt_##NAME, 1, MODCMD_REQUIRE_REGCHAN, NULL)
void
init_chanserv(const char *nick)
{
+ struct chanNode *chan;
+ unsigned int i;
+
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, NULL);
+ reg_new_channel_func(handle_new_channel, NULL);
+ reg_join_func(handle_join, NULL);
+ reg_part_func(handle_part, NULL);
+ reg_kick_func(handle_kick, NULL);
+ reg_topic_func(handle_topic, NULL);
+ reg_mode_change_func(handle_mode, NULL);
+ reg_nick_change_func(handle_nick_change, NULL);
+ reg_auth_func(handle_auth, NULL);
+ }
- reg_auth_func(handle_auth);
- reg_handle_rename_func(handle_rename);
- reg_unreg_func(handle_unreg);
+ reg_handle_rename_func(handle_rename, NULL);
+ reg_unreg_func(handle_unreg, NULL);
handle_dnrs = dict_new();
dict_set_free_data(handle_dnrs, free);
mask_dnrs = dict_new();
dict_set_free_data(mask_dnrs, free);
- reg_svccmd_unbind_func(handle_svccmd_unbind);
+ reg_svccmd_unbind_func(handle_svccmd_unbind, NULL);
chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable);
- DEFINE_COMMAND(register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+helping", NULL);
+ DEFINE_COMMAND(register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+channel", 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_COMMAND(mdelmanager, 2, MODCMD_REQUIRE_CHANUSER, "access", "coowner", NULL);
DEFINE_COMMAND(mdelop, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(mdelpeon, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
+ DEFINE_COMMAND(mdelpal, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(mdelhalfop, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
+ DEFINE_COMMAND(levels, 1, 0, NULL);
+
DEFINE_COMMAND(trim, 3, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(opchan, 1, MODCMD_REQUIRE_REGCHAN|MODCMD_NEVER_CSUSPEND, "access", "1", NULL);
DEFINE_COMMAND(clvl, 3, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(d, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
DEFINE_COMMAND(huggle, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
DEFINE_COMMAND(calc, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+ DEFINE_COMMAND(reply, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+ DEFINE_COMMAND(roulette, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+ DEFINE_COMMAND(shoot, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+ DEFINE_COMMAND(spin, 1, MODCMD_REQUIRE_AUTHED, "spin", "+nolog,+toy,+acceptchan", NULL);
/* Channel options */
DEFINE_CHANNEL_OPTION(defaulttopic);
DEFINE_CHANNEL_OPTION(toys);
DEFINE_CHANNEL_OPTION(setters);
DEFINE_CHANNEL_OPTION(topicrefresh);
+ DEFINE_CHANNEL_OPTION(resync);
DEFINE_CHANNEL_OPTION(ctcpreaction);
DEFINE_CHANNEL_OPTION(bantimeout);
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);
+ DEFINE_CHANNEL_OPTION(maxsetinfo);
if(off_channel > 1)
DEFINE_CHANNEL_OPTION(offchannel);
modcmd_register(chanserv_module, "set defaults", chan_opt_defaults, 1, 0, "access", "owner", NULL);
/* User options */
DEFINE_USER_OPTION(autoinvite);
+ DEFINE_USER_OPTION(autojoin);
DEFINE_USER_OPTION(info);
DEFINE_USER_OPTION(autoop);
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);
+ reg_chanmsg_func('\001', chanserv, chanserv_ctcp_check, NULL);
}
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);
+ if(chanserv_conf.dnr_expire_frequency)
+ timeq_add(now + chanserv_conf.dnr_expire_frequency, expire_dnrs, NULL);
+
if(chanserv_conf.ban_timeout_frequency)
timeq_add(now + chanserv_conf.ban_timeout_frequency, expire_bans, NULL);
time_t 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);
+ timeq_add(next_refresh, chanserv_auto_resync, NULL);
+ }
+
+ if (autojoin_channels && chanserv) {
+ for (i = 0; i < autojoin_channels->used; i++) {
+ chan = AddChannel(autojoin_channels->list[i], now, "+nt", NULL, NULL);
+ AddChannelUser(chanserv, chan)->modes |= MODE_CHANOP;
+ }
}
- reg_exit_func(chanserv_db_cleanup);
+ reg_exit_func(chanserv_db_cleanup, NULL);
message_register_table(msgtab);
}
+
projects / irc / evilnet / x3.git / blobdiff