X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonSpam.mod%2Fbot_NeonSpam.c;h=de645c2470edf4ea752fc579b6c1762c107660de;hb=ee3a72eb4a412a0a504d070db1b41c6907f7604d;hp=8d349ec8cb8b81757053981ed03b8d0e3d70b5d5;hpb=689da1db7e2517c187ce76c6c553e20d630a7f36;p=NeonServV5.git diff --git a/src/modules/NeonSpam.mod/bot_NeonSpam.c b/src/modules/NeonSpam.mod/bot_NeonSpam.c index 8d349ec..de645c2 100644 --- a/src/modules/NeonSpam.mod/bot_NeonSpam.c +++ b/src/modules/NeonSpam.mod/bot_NeonSpam.c @@ -15,6 +15,7 @@ * along with this program. If not, see . */ #include "../module.h" +#include "../botid.h" #include "bot_NeonSpam.h" #include "../../modcmd.h" @@ -38,7 +39,7 @@ #include "../../bots.h" #include "cmd_neonspam.h" -#define BOTID 2 +#define BOTID NEONSPAM_BOTID #define BOTALIAS "NeonSpam" static const struct default_language_entry msgtab[] = { @@ -62,6 +63,19 @@ static const struct default_language_entry msgtab[] = { {"SS_SET_OPTION_DigitReaction_0", "Kick"}, {"SS_SET_OPTION_DigitReaction_1", "KickBan"}, {"SS_SET_OPTION_DigitReaction_2", "Timed Ban"}, + {"SS_SET_OPTION_BadwordReaction_0", "Kick"}, + {"SS_SET_OPTION_BadwordReaction_1", "KickBan"}, + {"SS_SET_OPTION_BadwordReaction_2", "Timed Ban"}, + {"SS_BADWORD_ADDED", "Badword '%s' added. (ID: %d)"}, /* {ARGS: "NeonServ is bad", 1} */ + {"SS_BADWORD_ID_UNKNOWN", "Badword ID %d was not found in %s."}, /* {ARGS: 1, "#channel"} */ + {"SS_BADWORD_DELETED", "Badword '%s' deleted. (ID: %d)"}, /* {ARGS: "NeonServ is bad", 1} */ + {"SS_BADWORDS_REACTION_0", "Kick"}, + {"SS_BADWORDS_REACTION_1", "KickBan"}, + {"SS_BADWORDS_REACTION_2", "Timed Ban"}, + {"SS_BADWORDS_ID", "Id"}, + {"SS_BADWORDS_PATTERN", "Pattern"}, + {"SS_BADWORDS_SCAN", "Scan"}, + {"SS_BADWORDS_REACTION", "Reaction"}, {NULL, NULL} }; @@ -83,6 +97,7 @@ static struct NeonSpamJoinNode *getNeonSpamJoinNode(struct ChanUser *chanuser); #define SPAMSERV_MSG_BOTNET "BotNet detected." #define SPAMSERV_MSG_CAPS "Using too many chars in UPPER CASE" #define SPAMSERV_MSG_DIGIT "Using too many numeric chars" +#define SPAMSERV_MSG_BADWORD "Your message contained a forbidden word." //EVENTS #include "event_neonspam_join.c" @@ -117,9 +132,12 @@ static void neonspam_bot_ready(struct ClientSocket *client) { MYSQL_RES *res; MYSQL_ROW row; - printf_mysql_query("SELECT `automodes` FROM `bots` WHERE `id` = '%d'", client->clientid); + printf_mysql_query("SELECT `automodes`, `oper_user`, `oper_pass` FROM `bots` WHERE `id` = '%d'", client->clientid); res = mysql_use(); if ((row = mysql_fetch_row(res)) != NULL) { + if(row[1] && row[2]) { + putsock(client, "OPER %s %s", row[1], row[2]); + } putsock(client, "MODE %s +%s", client->user->nick, row[0]); } @@ -165,6 +183,7 @@ static void start_bots(int type) { client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0); client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0); client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0); + client->flags |= SOCKET_FLAG_REQUEST_INVITE; client->botid = BOTID; client->clientid = atoi(row[7]); connect_socket(client); @@ -234,11 +253,12 @@ int loadNeonSpamSettings(struct ChanNode *chan) { MYSQL_RES *res; MYSQL_ROW row, defaults = NULL; loadChannelSettings(chan); - printf_mysql_query("SELECT `channel_scanner`, `channel_spam_limit`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_except`, `channel_caps_percent`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_except` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); + printf_mysql_query("SELECT `channel_scanner`, `channel_spam_limit`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_except`, `channel_caps_percent`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_except`, `channel_badword_except` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); res = mysql_use(); - row = mysql_fetch_row(res); + if(!(row = mysql_fetch_row(res))) + return 0; if(!row[0] || !row[1] || !row[2] || !row[3] || !row[4] || !row[5] || !row[6] || !row[7] || !row[8] || !row[9] || !row[10] || !row[11] || !row[12]) { - printf_mysql_query("SELECT `channel_scanner`, `channel_spam_limit`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_except`, `channel_caps_percent`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_except` FROM `channels` WHERE `channel_name` = 'defaults'"); + printf_mysql_query("SELECT `channel_scanner`, `channel_spam_limit`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_except`, `channel_caps_percent`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_except`, `channel_badword_except` FROM `channels` WHERE `channel_name` = 'defaults'"); res = mysql_use(); defaults = mysql_fetch_row(res); } @@ -255,11 +275,29 @@ int loadNeonSpamSettings(struct ChanNode *chan) { settings->exceptlevel[SPAMSETTINGS_CAPSEXCINDEX] = atoi(row[10] ? row[10] : defaults[10]); settings->percent[SPAMSETTINGS_DIGITPERCENTINDEX] = atoi(row[11] ? row[11] : defaults[11]); settings->exceptlevel[SPAMSETTINGS_DIGITEXCINDEX] = atoi(row[12] ? row[12] : defaults[12]); + settings->exceptlevel[SPAMSETTINGS_BADWORDEXCINDEX] = atoi(row[13] ? row[13] : defaults[13]); settings->join_nodes = NULL; settings->lastmsg_time = 0; int i; for(i = 0; i < BOTNETSCAN_USERS; i++) settings->botnicks[i] = NULL; + settings->badwords = NULL; + printf_mysql_query("SELECT `badword_match`, `badword_reaction`, `badword_reaction_time`, `badword_id`, `badword_scan_ops`, `badword_scan_voice`, `badword_exceptlevel`, `badword_use_default`, `badword_use_default_reaction` FROM `spamserv_badwords` WHERE `badword_cid` = '%d'", chan->channel_id); + res = mysql_use(); + while((row = mysql_fetch_row(res))) { + struct NeonSpamBadword *badword = malloc(sizeof(*badword)); + badword->id = atoi(row[3]); + badword->badword = strdup(row[0]); + badword->use_defaults = atoi(row[7]); + badword->exceptlevel = atoi(row[6]); + badword->scan_ops = atoi(row[4]); + badword->scan_voice = atoi(row[5]); + badword->use_default_reaction = atoi(row[8]); + badword->reaction = atoi(row[1]); + badword->reaction_time = atoi(row[2]); + badword->next = settings->badwords; + settings->badwords = badword; + } chan->spam_settings = settings; return 1; } @@ -270,6 +308,12 @@ void freeNeonSpamSettings(struct NeonSpamSettings *settings) { nextjoinnode = joinnode->next; freeJoinNode(joinnode); } + struct NeonSpamBadword *badword, *nextbadword; + for(badword = settings->badwords; badword; badword = nextbadword) { + nextbadword = badword->next; + free(badword->badword); + free(badword); + } free(settings); } @@ -330,6 +374,36 @@ static int neonspam_event_freechan(struct ChanNode *chan) { return 1; } +static void neonspam_event_invite(struct ClientSocket *client, struct UserNode *user, char *channel) { + if(client->botid != BOTID) + return; + MYSQL_RES *res; + MYSQL_ROW row; + printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` LEFT JOIN `channels` ON `chanid` = `channel_id` WHERE `channel_name` = '%s' AND `botclass` = '%d'", escape_string(channel), client->botid); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) == NULL) { + reply(client, user, "NS_INVITE_FAIL", channel, client->user->nick); + return; + } + if(!strcmp(row[2], "1")) { + reply(client, user, "MODCMD_CHAN_SUSPENDED"); + return; + } + int botid = atoi(row[0]); + struct ClientSocket *bot; + for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { + if(bot->clientid == botid) + break; + } + if(bot) { + struct ChanNode *chan = getChanByName(channel); + if(chan && isUserOnChan(bot->user, chan)) { + reply(client, user, "NS_INVITE_ON_CHAN", bot->user->nick, chan->name); + } else + putsock(bot, "JOIN %s", channel); + } +} + void init_NeonSpam(int type) { set_bot_alias(BOTID, BOTALIAS); @@ -344,7 +418,8 @@ void init_NeonSpam(int type) { bind_privctcp(general_event_privctcp, module_id); bind_kick(neonspam_event_kick, module_id); bind_freechan(neonspam_event_freechan, module_id); - + bind_invite(neonspam_event_invite, module_id); + set_trigger_callback(BOTID, module_id, neonspam_trigger_callback); register_default_language_table(msgtab);