added cmd_move

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index 6063b8aed30116d3bf6d0f2f1e093e35245a3c29..e9a46779f975bc7234faff73764871bec73a0c98 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -207,6 +207,9 @@ static const struct default_language_entry msgtab[] = {
     {"NS_CSUSPEND_DONE", "Channel $b%s$b has been temporarily suspended."}, /* {ARGS: "#TestChan"} */
     {"NS_CUNSUSPEND_NOT", "$b%s$b is not suspended."}, /* {ARGS: "#TestChan"} */
     {"NS_CUNSUSPEND_DONE", "Channel $b%s$b has been restored."}, /* {ARGS: "#TestChan"} */
+    {"NS_MOVE_SUSPENDED", "Moving cannot be performed if the source channel is suspended."},
+    {"NS_MOVE_SELF", "Moving cannot be performed if the source and target channels are the same."},
+    {"NS_MOVE_DONE", "Channel $b%s$b has been moved to $b%s$b."}, /* {ARGS: "#TestChan", "#NewTestChan"} */
     {NULL, NULL}
 };
 
@@ -283,7 +286,7 @@ INCLUDE ALL CMD's HERE
 #include "cmd_neonserv_cunsuspend.c"
 //#include "cmd_neonserv_unvisited.c"
 //#include "cmd_neonserv_merge.c"
-//#include "cmd_neonserv_move.c"
+#include "cmd_neonserv_move.c"
 //#include "cmd_neonserv_dnrsearch.c"
 //#include "cmd_neonserv_search.c"
 #include "cmd_neonserv_trace.c"
@@ -461,6 +464,7 @@ void init_NeonServ() {
     register_command(BOTID, "reloadlang",   neonserv_cmd_reloadlang,1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG,                                   NULL,                   500);
     register_command(BOTID, "csuspend",     neonserv_cmd_csuspend,  1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG,              NULL,                   100);
     register_command(BOTID, "cunsuspend",   neonserv_cmd_cunsuspend,1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG,              NULL,                   100);
+    register_command(BOTID, "move",         neonserv_cmd_move,      2, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG,              NULL,                   300);
     
     start_bots();
     bind_bot_ready(neonserv_bot_ready);

diff --git a/cmd_neonserv_move.c b/cmd_neonserv_move.c
new file mode 100644 (file)
index 0000000..e9fc54b
--- /dev/null
+++ b/cmd_neonserv_move.c
@@ -0,0 +1,58 @@
+
+/*
+* argv[0] - channel
+* argv[1] - new channel
+*/
+static CMD_BIND(neonserv_cmd_move) {
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    char *channel = argv[0];
+    char *new_channel = argv[1];
+    if(!is_valid_chan(new_channel)) {
+        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", new_channel);
+        return;
+    }
+    if(!stricmp(channel, new_channel)) {
+        reply(getTextBot(), user, "NS_MOVE_SELF");
+        return;
+    }
+    printf_mysql_query("SELECT `channel_id` FROM `bot_channels` LEFT JOIN `channels` ON `channel_id` = `chanid` WHERE `channel_name` = '%s'", escape_string(new_channel));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        reply(getTextBot(), user, "NS_REGISTER_ALREADY", new_channel, client->user->nick);
+        return;
+    }
+    int chanid;
+    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(channel));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        chanid = atoi(row[0]);
+    } else {
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        return;
+    }
+    printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chanid, client->botid);
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) == NULL) {
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        return;
+    }
+    if(!strcmp(row[2], "1")) {
+        reply(getTextBot(), user, "NS_MOVE_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) {
+        putsock(bot, "PART %s :Channel moved to %s.", channel, new_channel);
+        putsock(bot, "JOIN %s", new_channel);
+    }
+    printf_mysql_query("DELETE FROM `channels` WHERE `channel_name` = '%s'", escape_string(new_channel));
+    printf_mysql_query("UPDATE `channels` SET `channel_name` = '%s' WHERE `id` = '%s'", escape_string(new_channel), row[1]);
+    reply(getTextBot(), user, "NS_MOVE_DONE", channel, new_channel);
+    logEvent(event);
+}