{ "OSMSG_KICKALL_DONE", "I have cleared out %s." },
{ "OSMSG_LEAVING", "Leaving $b%s$b." },
{ "OSMSG_MARK_INVALID", "Sorry, marks must contain only letters, numbers, and dashes ('-')." },
+ { "OSMSG_MARK_NOTMARKED", "Action not mark but mark supplied. (Did you mean marked?)" },
{ "OSMSG_MODE_SET", "I have set the modes for $b%s$b." },
{ "OSMSG_OP_DONE", "Opped the requested lusers." },
{ "OSMSG_OPALL_DONE", "Opped everyone on $b%s$b." },
{ "OSMSG_HOP_DONE", "Halfopped the requested lusers." },
{ "OSMSG_HOPALL_DONE", "Halfopped everyone on $b%s$b." },
{ "OMSG_BAD_SVSNICK", "$b%s$b is an invalid nickname." },
+ { "OSMSG_BAD_SVSCMDTARGET", "$b%s$b is an invalid target for %s." },
{ "OSMSG_WHOIS_IDENT", "%s (%s@%s) from %d.%d.%d.%d" },
{ "OSMSG_WHOIS_NICK", "Nick : %s" },
{ "OSMSG_WHOIS_HIDECHANS", "Channel list omitted for your sanity." },
{ "OSMSG_WHOIS_VERSION", "Version : %s" },
{ "OSMSG_WHOIS_SSLFP", "SSL f/print : %s" },
- { "OSMSG_WHOIS_MARK", "Mark : %s" },
+ { "OSMSG_WHOIS_MARK", "Mark : %s" },
+ { "OSMSG_WHOIS_MARKS", "Marks : %s" },
{ "OSMSG_WHOIS_NO_NOTICE", "No_notices : %s" },
{ "OSMSG_UNBAN_DONE", "Ban(s) removed from channel %s." },
{ "OSMSG_CHANNEL_VOICED", "All users on %s voiced." },
unsigned int disp_limit;
};
-static discrim_t opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel);
+static discrim_t opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel, const char *action);
static unsigned int opserv_discrim_search(discrim_t discrim, discrim_search_func dsf, void *data);
static int gag_helper_func(struct userNode *match, void *extra);
static int ungag_helper_func(struct userNode *match, void *extra);
struct shun *shun;
reason = unsplit_string(argv+3, argc-3, NULL);
- if (!is_shun(argv[1]) && !IsChannelName(argv[1]) && (argv[1][0] != '&')) {
+ if (!is_shun(argv[1])) {
reply("MSG_INVALID_SHUN", argv[1]);
return 0;
}
return 0;
}
+ if (IsLocal(target)) {
+ reply("OSMSG_BAD_SVSCMDTARGET", argv[1], "SVSJOIN");
+ return 0;
+ }
+
if (!(channel = GetChannel(argv[2]))) {
channel = AddChannel(argv[2], now, NULL, NULL, NULL);
}
reply("MSG_NICK_UNKNOWN", argv[1]);
return 0;
}
+
+ if (IsLocal(target)) {
+ reply("OSMSG_BAD_SVSCMDTARGET", argv[1], "SVSNICK");
+ return 0;
+ }
+
if(!is_valid_nick(argv[2])) {
reply("OMSG_BAD_SVSNICK", argv[2]);
return 0;
return 0;
}
+ if (IsLocal(target)) {
+ reply("OSMSG_BAD_SVSCMDTARGET", argv[1], "SVSPART");
+ return 0;
+ }
+
if (!GetUserMode(target_channel, target)) {
reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, target_channel->name);
return 0;
if(target->mark) {
reply("OSMSG_WHOIS_MARK", target->mark);
}
+ if(target->marks) {
+ char markbuf[MAXLEN] = "";
+ unsigned int ii = 0;
+
+ string_list_sort(user->marks);
+
+ for (ii=0; ii<user->marks->used; ii++)
+ {
+ if (markbuf[0] && strlen(markbuf) + strlen(user->marks->list[ii]) + 4 > 70) {
+ reply("OSMSG_WHOIS_MARKS", markbuf);
+ memset(&markbuf, 0, MAXLEN);
+ }
+
+ if (markbuf[0])
+ strcat(markbuf, ", ");
+ strcat(markbuf, user->marks->list[ii]);
+ }
+
+ if (markbuf[0])
+ reply("OSMSG_WHOIS_MARKS", markbuf);
+ }
+
reply("OSMSG_WHOIS_NO_NOTICE", target->no_notice ? "YES":"NO");
if (target->modes) {
}
static struct opserv_user_alert *
-opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim, int last, int expire)
+opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim, int last, int expire, const char *action)
{
unsigned int wordc;
char *wordv[MAXNUMPARAMS], *discrim_copy;
alert->last = last;
discrim_copy = strdup(text_discrim); /* save a copy of the discrim */
wordc = split_line(discrim_copy, false, ArrayLength(wordv), wordv);
- alert->discrim = opserv_discrim_create(req, opserv, wordc, wordv, 0);
+ alert->discrim = opserv_discrim_create(req, opserv, wordc, wordv, 0, action);
alert->expire = expire;
/* Check for missing required criteria or broken records */
if (!alert->discrim || (reaction==REACT_SVSJOIN && !alert->discrim->chantarget) ||
log_module(OS_LOG, LOG_ERROR, "Invalid reaction %s for alert %s.", react, key);
return 0;
}
- alert = opserv_add_user_alert(opserv, key, reaction, discrim, last, expire);
+ alert = opserv_add_user_alert(opserv, key, reaction, discrim, last, expire, react);
if (!alert) {
log_module(OS_LOG, LOG_ERROR, "Unable to create alert %s from database.", key);
return 0;
}
static discrim_t
-opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel)
+opserv_discrim_create(struct userNode *user, struct userNode *bot, unsigned int argc, char *argv[], int allow_channel, const char *action)
{
unsigned int i, j;
discrim_t discrim;
goto fail;
}
} else if (irccasecmp(argv[i], "mark") == 0) {
+ if (irccasecmp(action, "mark")) {
+ send_message(user, bot, "OSMSG_MARK_NOTMARKED");
+ goto fail;
+ }
if(!is_valid_mark(argv[i+1])) {
send_message(user, bot, "OSMSG_MARK_INVALID");
goto fail;
{
unsigned int level, i;
char *scmp=NULL, *dcmp=NULL;
+ int markmatched = 0;
+
+ if (discrim->mask_mark)
+ {
+ unsigned int ii = 0;
+
+ if (user->mark && match_ircglob(user->mark, discrim->mask_mark))
+ markmatched = 1;
+
+ if (user->marks)
+ for (ii=0; ii<user->marks->used; ii++)
+ if (match_ircglob(user->marks->list[ii], discrim->mask_mark))
+ markmatched = 1;
+ }
if ((user->timestamp < discrim->min_ts)
|| (user->timestamp > discrim->max_ts)
|| (discrim->info_space == 0 && user->info[0] == ' ')
|| (discrim->info_space == 1 && user->info[0] != ' ')
|| (discrim->server && !match_ircglob(user->uplink->name, discrim->server))
- || (discrim->mask_mark && (!user->mark || !match_ircglob(user->mark, discrim->mask_mark)))
+ || (discrim->mask_mark && !markmatched)
|| (discrim->accountmask && (!user->handle_info || !match_ircglob(user->handle_info->handle, discrim->accountmask)))
|| (discrim->ip_mask_bits && !irc_check_mask(&user->ip, &discrim->ip_mask, discrim->ip_mask_bits))
)
das.dict = NULL;
das.source = user;
das.destination = cmd->parent->bot;
- das.discrim = opserv_discrim_create(user, cmd->parent->bot, argc-2, argv+2, 1);
+ das.discrim = opserv_discrim_create(user, cmd->parent->bot, argc-2, argv+2, 1, argv[1]);
if (!das.discrim)
return 0;
expire = now + ParseInterval(argv[4]);
if (!svccmd_can_invoke(user, opserv_service->bot, subcmd, channel, SVCCMD_NOISY)
- || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + (expire ? 5 : 3), argc - (expire ? 5 : 3), NULL), 0, expire)) {
+ || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + (expire ? 5 : 3), argc - (expire ? 5 : 3), NULL), 0, expire, argv[2])) {
reply("OSMSG_ALERT_ADD_FAILED");
return 0;
}
projects / irc / evilnet / x3.git / blobdiff