added possibility to change default trigger (even for registered channels)

[NeonServV5.git] / src / bot_NeonServ.c

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index a55e9addd6facb7e0dbcdb2d85e04fb474bfcd61..58dced3a3a428d8d302f9892c9e8a7b0a9167b92 100644 (file)
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -1,4 +1,4 @@
-/* bot_NeonServ.c - NeonServ v5.2
+/* bot_NeonServ.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -356,6 +356,11 @@ static const struct default_language_entry msgtab[] = {
     {"NS_SETBOT_PRIORITY_INVALID", "`%s` is an invalid priority value."}, /* {ARGS: "-1"} */
     {"NS_SETBOT_TRIGGER_INVALID", "`%s` is an invalid bot trigger."}, /* {ARGS: "tooLongTrigger"} */
     {"NS_SETBOT_TRIGGER_NOTE", "Please note: This Setting will only affect new channels."},
+    {"NS_ADDBOT_EXISTING", "A bot with nick %s does already exist."}, /* {ARGS: "NeonServ"} */
+    {"NS_ADDBOT_DONE", "Added %s with BotID $b%d$b."}, /* {ARGS: "NeonServ", 2} */
+    {"NS_DELBOT_NOT_FOUND", "Bot with BotID / nick $b%s$b not found."}, /* {ARGS: "NeonServ"} */
+    {"NS_DELBOT_DONE", "Bot deleted."},
+    {"NS_RECONNECT_DONE", "Reconnected bot."},
     {NULL, NULL}
 };
 
@@ -414,10 +419,13 @@ static void neonserv_trigger_callback(int clientid, struct ChanNode *chan, char
         strcpy(trigger, "+");
         return;
     }
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    strcpy(trigger, ((row && strlen(row[0])) ? row[0] : "+"));
+    if(row[0] && *row[0])
+        strcpy(trigger, row[0]);
+    else
+        strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "~"));
 }
 
 static void start_bots() {