changed Makefile; build all commands as an own file

[NeonServV5.git] / cmd_neonserv_addban.c

diff --git a/cmd_neonserv_addban.c b/cmd_neonserv_addban.c
index 91202d947c0669ee441f663ce838bc9ff6096960..b799c4b0a99af4660e686f1b60155bde481561e2 100644 (file)
--- a/cmd_neonserv_addban.c
+++ b/cmd_neonserv_addban.c
@@ -1,19 +1,22 @@
 
+#include "cmd_neonserv.h"
+
 /*
 * argv[0]    nick|*auth|*!*@mask
 * argv[1-*]  reason
 */
 static USERLIST_CALLBACK(neonserv_cmd_addban_userlist_lookup);
-static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *mas, char *reason);
+static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *mas, char *reason);
 
 struct neonserv_cmd_addban_cache {
     struct ClientSocket *client, *textclient;
     struct UserNode *user;
+    struct Event *event;
     char *mask;
     char *reason;
 };
 
-static CMD_BIND(neonserv_cmd_addban) {
+CMD_BIND(neonserv_cmd_addban) {
     struct neonserv_cmd_addban_cache *cache = malloc(sizeof(*cache));
     if (!cache) {
         perror("malloc() failed");
@@ -22,6 +25,7 @@ static CMD_BIND(neonserv_cmd_addban) {
     cache->client = client;
     cache->textclient = getTextBot();
     cache->user = user;
+    cache->event = event;
     cache->mask = strdup(argv[0]);
     if(argc > 1) {
         cache->reason = strdup(merge_argv(argv, 1, argc));
@@ -32,20 +36,19 @@ static CMD_BIND(neonserv_cmd_addban) {
 
 static USERLIST_CALLBACK(neonserv_cmd_addban_userlist_lookup) {
     struct neonserv_cmd_addban_cache *cache = data;
-    neonserv_cmd_addban_async1(cache->client, cache->textclient, cache->user, chan, cache->mask, (cache->reason ? cache->reason : "Bye."));
+    neonserv_cmd_addban_async1(cache->client, cache->textclient, cache->user, chan, cache->event, cache->mask, (cache->reason ? cache->reason : "Bye."));
     free(cache->mask);
     if(cache->reason)
         free(cache->reason);
     free(cache);
 }
 
-static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *mask, char *reason) {
+static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *mask, char *reason) {
     int match_count = 0;
     char hostmask_buffer[NICKLEN+USERLEN+HOSTLEN+3];
     char usermask[NICKLEN+USERLEN+HOSTLEN+3];
     struct UserNode *cuser;
     struct ChanUser *chanuser;
-    check_mysql();
     mask = make_banmask(mask, hostmask_buffer);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         cuser = chanuser->user;
@@ -68,6 +71,21 @@ static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct Clien
     }
     MYSQL_RES *res;
     MYSQL_ROW row;
+    //check if the provided mask is already banned by another ban
+    char *ban = getBanAffectingMask(chan, mask);
+    if(ban != NULL) {
+        reply(textclient, user, "NS_BAN_ALREADY_ADDED", mask, chan->name);
+        return;
+    }
+    //check if the provided mask affects any existing bans
+    printf_mysql_query("SELECT `ban_mask`, `ban_id` FROM `bans` WHERE `ban_channel` = '%d'", chan->channel_id);
+    res = mysql_use();
+    while ((row = mysql_fetch_row(res)) != NULL) {
+        if(!match(mask, row[0])) {
+            //remove the ban
+            printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[1]);
+        }
+    }
     printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
     int userid;
     res = mysql_use();
@@ -76,6 +94,15 @@ static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct Clien
     else
         return;
     //add the ban
-    printf_mysql_query("INSERT INTO `bans` (`ban_channel`, `ban_mask`, `ban_triggered`, `ban_owner`, `ban_reason`) VALUES ('%d', '%s', '%u', '%d', '%s')", chan->channel_id, escape_string(mask), (unsigned int) time(0), userid, escape_string(reason));
-    reply(getTextBot(), user, "NS_ADDBAN_DONE", mask, chan->name, match_count);
+    printf_mysql_query("INSERT INTO `bans` (`ban_channel`, `ban_mask`, `ban_triggered`, `ban_owner`, `ban_reason`) VALUES ('%d', '%s', UNIX_TIMESTAMP(), '%d', '%s')", chan->channel_id, escape_string(mask), userid, escape_string(reason));
+    putsock(client, "MODE %s +b %s", chan->name, mask);
+    for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+        cuser = chanuser->user;
+        sprintf(usermask, "%s!%s@%s", cuser->nick, cuser->ident, cuser->host);
+        if(!match(mask, usermask)) {
+            putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+        }
+    }
+    reply(textclient, user, "NS_ADDBAN_DONE", mask, chan->name, match_count);
+    logEvent(event);
 }