moved inviteme all to an own command called invitemeall
authorpk910 <philipp@zoelle1.de>
Sun, 23 Sep 2012 22:01:03 +0000 (00:01 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 23 Sep 2012 22:01:03 +0000 (00:01 +0200)
Makefile.am
src/modules/NeonServ.mod/cmd_neonserv.c
src/modules/NeonServ.mod/cmd_neonserv.h
src/modules/NeonServ.mod/cmd_neonserv_inviteme.c
src/modules/NeonServ.mod/cmd_neonserv_invitemeall.c [new file with mode: 0644]

index 02a219c4c6a8f20b2ba248377436fb18ad7a7b61..df5f18017770bcfffee2a7ac08a4ab5d122ce124 100644 (file)
@@ -97,6 +97,7 @@ libNeonServ_la_SOURCES = src/modules/NeonServ.mod/bot_NeonServ.c \
       src/modules/NeonServ.mod/cmd_neonserv_help.c \
       src/modules/NeonServ.mod/cmd_neonserv_invite.c \
       src/modules/NeonServ.mod/cmd_neonserv_inviteme.c \
+      src/modules/NeonServ.mod/cmd_neonserv_invitemeall.c \
       src/modules/NeonServ.mod/cmd_neonserv_kick.c \
       src/modules/NeonServ.mod/cmd_neonserv_kickban.c \
       src/modules/NeonServ.mod/cmd_neonserv_mdeluser.c \
index 79a4119f1b77d45de65873b125f8e9584e0f7c9a..62750a483217c79b460d1aaebfac8860163c78d8 100644 (file)
@@ -75,6 +75,7 @@ void register_commands() {
     USER_COMMAND("unbanme",      neonserv_cmd_unbanme,   0, "#channel_canban",      CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     USER_COMMAND("invite",       neonserv_cmd_invite,    1, "#channel_canop",       CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     USER_COMMAND("inviteme",     neonserv_cmd_inviteme,  0, "#channel_getinvite",   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
+    USER_COMMAND("invitemeall",  neonserv_cmd_invitemeall,0,NULL,                   CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     USER_COMMAND("help",         neonserv_cmd_help,      0, NULL,                   0);
     USER_COMMAND("events",       neonserv_cmd_events,    0, "1",                    CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
     USER_COMMAND("info",         neonserv_cmd_info,      0, NULL,                   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_NO_CROSSCHAN);
index 097a1f2b7b428e2131fd01ff1b77c544823b366d..da09147c1e66a35ad004dac685f6343e3183d2bd 100644 (file)
@@ -78,6 +78,7 @@ CMD_BIND(neonserv_cmd_help);
 CMD_BIND(neonserv_cmd_info);
 CMD_BIND(neonserv_cmd_invite);
 CMD_BIND(neonserv_cmd_inviteme);
+CMD_BIND(neonserv_cmd_invitemeall);
 CMD_BIND(neonserv_cmd_kick);
 CMD_BIND(neonserv_cmd_kickban);
 CMD_BIND(neonserv_cmd_listrank);
index f7f2a82794ec22723e7c6c7c51d9e0d6dcdb3751..bbe7a3070b221fbd9c0915fe293c8269365890d4 100644 (file)
 */
 
 CMD_BIND(neonserv_cmd_inviteme) {
-    if(argc && !stricmp(argv[0], "all")) {
-        //invite to all channels where autoinvite is enabled
-        MYSQL_RES *res, *res2;
-        MYSQL_ROW chanuserrow, defaultrow = NULL;
-        printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags`, `channel_name`, `channel_getinvite` FROM `chanusers` LEFT JOIN `channels` ON `chanuser_cid` = `channel_id` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `user_user` = '%s' AND `chanuser_flags` >= '%d'", escape_string(user->auth), DB_CHANUSER_AUTOINVITE);
-        res = mysql_use();
-        struct ChanUser *bchanuser;
-        struct ClientSocket *bot;
-        while((chanuserrow = mysql_fetch_row(res)) != NULL) {
-            int userflags = atoi(chanuserrow[1]);
-            if(!(userflags & DB_CHANUSER_AUTOINVITE)) continue;
-            if(!(chan = getChanByName(chanuserrow[2]))) continue; //no bot is in the channel
-            if((bchanuser = getChanUser(client->user, chan)) && (bchanuser->flags & CHANUSERFLAG_OPPED))
-                bot = client;
-            else {
-                bot = getBotForChannel(chan);
-            }
-            if(getChanUser(user, chan)) continue; //user is already in the channel
-            if(chanuserrow[3] == NULL && defaultrow == NULL) {
-                printf_mysql_query("SELECT `channel_getinvite` FROM `channels` WHERE `channel_name` = 'defaults'");
-                res2 = mysql_use();
-                defaultrow = mysql_fetch_row(res2);
-            }
-            if(atoi(chanuserrow[0]) >= atoi((chanuserrow[3] ? chanuserrow[3] : defaultrow[0]))) {
-                putsock(bot, "INVITE %s %s", user->nick, chan->name);
-                reply(textclient, user, "NS_INVITEME_DONE", chan->name);
-            }
-        }
-    } else {
-        if(getChanUser(user, chan)) {
-            reply(textclient, user, "NS_INVITEME_ON_CHAN", chan->name);
-            /* BUG
-             This check does not work if the user is invisible (CHMODE +D/+d)
-             to fix this we'd need to request the full userlist...
-             this is really senseless to invite a simple user so we simply mark this bug as unsolvable.
-            */
-            return;
-        }
-        putsock(client, "INVITE %s %s", user->nick, chan->name);
-        reply(textclient, user, "NS_INVITEME_DONE", chan->name);
+    if(getChanUser(user, chan)) {
+        reply(textclient, user, "NS_INVITEME_ON_CHAN", chan->name);
+        /* BUG
+         This check does not work if the user is invisible (CHMODE +D/+d)
+         to fix this we'd need to request the full userlist...
+         this is really senseless to invite a simple user so we simply mark this bug as unsolvable.
+        */
+        return;
     }
+    putsock(client, "INVITE %s %s", user->nick, chan->name);
+    reply(textclient, user, "NS_INVITEME_DONE", chan->name);
 }
diff --git a/src/modules/NeonServ.mod/cmd_neonserv_invitemeall.c b/src/modules/NeonServ.mod/cmd_neonserv_invitemeall.c
new file mode 100644 (file)
index 0000000..9f5b56d
--- /dev/null
@@ -0,0 +1,52 @@
+/* cmd_neonserv_invitemeall.c - NeonServ v5.6
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
+ * 
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
+
+#include "cmd_neonserv.h"
+
+/*
+* no arguments
+*/
+
+CMD_BIND(neonserv_cmd_invitemeall) {
+    //invite to all channels where autoinvite is enabled
+    MYSQL_RES *res, *res2;
+    MYSQL_ROW chanuserrow, defaultrow = NULL;
+    printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags`, `channel_name`, `channel_getinvite` FROM `chanusers` LEFT JOIN `channels` ON `chanuser_cid` = `channel_id` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `user_user` = '%s' AND `chanuser_flags` >= '%d'", escape_string(user->auth), DB_CHANUSER_AUTOINVITE);
+    res = mysql_use();
+    struct ChanUser *bchanuser;
+    struct ClientSocket *bot;
+    while((chanuserrow = mysql_fetch_row(res)) != NULL) {
+        int userflags = atoi(chanuserrow[1]);
+        if(!(userflags & DB_CHANUSER_AUTOINVITE)) continue;
+        if(!(chan = getChanByName(chanuserrow[2]))) continue; //no bot is in the channel
+        if((bchanuser = getChanUser(client->user, chan)) && (bchanuser->flags & CHANUSERFLAG_OPPED))
+            bot = client;
+        else {
+            bot = getBotForChannel(chan);
+        }
+        if(getChanUser(user, chan)) continue; //user is already in the channel
+        if(chanuserrow[3] == NULL && defaultrow == NULL) {
+            printf_mysql_query("SELECT `channel_getinvite` FROM `channels` WHERE `channel_name` = 'defaults'");
+            res2 = mysql_use();
+            defaultrow = mysql_fetch_row(res2);
+        }
+        if(atoi(chanuserrow[0]) >= atoi((chanuserrow[3] ? chanuserrow[3] : defaultrow[0]))) {
+            putsock(bot, "INVITE %s %s", user->nick, chan->name);
+            reply(textclient, user, "NS_INVITEME_DONE", chan->name);
+        }
+    }
+}