added some missing language strings and a internal channel reminder

diff --git a/database.sql b/database.sql
index 5c35810c87bf11d8a9d09a1c9af3c62a5f626577..9f3ee1c39b023b01abb3925d0dd06b2dcd7d56bf 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -393,6 +393,7 @@ CREATE TABLE IF NOT EXISTS `helpserv_settings` (
   `helpserv_support` varchar(256) NOT NULL,
   `helpserv_public` varchar(256) DEFAULT NULL,
   `helpserv_intern` varchar(256) DEFAULT NULL,
+  `helpserv_intern_announce` TINYINT(1) NOT NULL,
   PRIMARY KEY (`helpserv_botid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 

diff --git a/database.upgrade.sql b/database.upgrade.sql
index 8b2fa16521082fe17e8ea23f0bfdb41ebbee3930..fcbb93685347553a7cf3f40d69cd3a98624eff9a 100644 (file)
--- a/database.upgrade.sql
+++ b/database.upgrade.sql
@@ -123,3 +123,7 @@ CREATE TABLE IF NOT EXISTS `helpserv_settings` (
 ALTER TABLE `helpserv_requests` ADD `botid` INT( 11 ) NOT NULL AFTER `id`;
 
 -- version: 12
+
+ALTER TABLE `helpserv_settings` ADD `helpserv_intern_announce` TINYINT( 1 ) NOT NULL;
+
+-- version: 13

diff --git a/src/bot_NeonHelp.c b/src/bot_NeonHelp.c
index 19a0e9fd4a4d2711b2de7cd004557c89967251c5..4a8e5a45af896d3b8543cba194df7ebdd54891d3 100644 (file)
--- a/src/bot_NeonHelp.c
+++ b/src/bot_NeonHelp.c
@@ -50,6 +50,16 @@ static const struct default_language_entry msgtab[] = {
     {"NH_NEXT_JOIN", "Please /join %s now."}, /* {ARGS: "#test-support"} */
     {"NH_DELETED", "Your request ID#%d has been deleted."}, /* {ARGS: 5} */
     {"NH_DELETED_STAFF", "Request deleted: #%d (%s)"}, /* {ARGS: 5, "pk910"} */
+    {"NH_REMIND_OPEN_REQUESTS_1", "There is %d unhandled request!"}, /* {ARGS: 1} */
+    {"NH_REMIND_OPEN_REQUESTS_2", "There are %d unhandled requests!"}, /* {ARGS: 4} */
+    {"NH_REQUESTS_HEADER_ID", "ID"},
+    {"NH_REQUESTS_HEADER_STATUS", "State"},
+    {"NH_REQUESTS_HEADER_NICK", "Nick"},
+    {"NH_REQUESTS_HEADER_TIME", "Time"},
+    {"NH_REQUESTS_HEADER_REQUEST", "Question"},
+    {"NH_REQUESTS_STATE_ACTIVE", "active"},
+    {"NH_REQUESTS_STATE_PENDING", "pending"},
+    {"NH_REQUESTS_STATE_ERROR", "ERROR"},
     {NULL, NULL}
 };
 
@@ -166,10 +176,12 @@ static USERAUTH_CALLBACK(neonhelp_event_privmsg_nick_lookup) {
     free(cache);
 }
 
+static TIMEQ_CALLBACK(neonhelp_remind_open_requests);
+
 static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, char *message) {
     MYSQL_RES *res;
     MYSQL_ROW row, row2;
-    printf_mysql_query("SELECT `helpserv_support`, `helpserv_public`, `helpserv_intern` FROM `helpserv_settings` WHERE `helpserv_botid` = '%d'", client->clientid);
+    printf_mysql_query("SELECT `helpserv_support`, `helpserv_public`, `helpserv_intern`, `helpserv_intern_announce` FROM `helpserv_settings` WHERE `helpserv_botid` = '%d'", client->clientid);
     res = mysql_use();
     if (!(row = mysql_fetch_row(res))) return;
     //check if the user is a supporter (access in the support channel)
@@ -237,6 +249,16 @@ static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct Use
     helpnode->user = user;
     helpnode->logchan = getChanByName(row[0]);
     helpnode->status = 0;
+    helpnode->announce = (row[2] && strcmp(row[3], "0") ? 1 : 0);
+    if(helpnode->announce) {
+        char nameBuf[30];
+        sprintf(nameBuf, "neonhelp_%d", client->clientid);
+        if(!timeq_name_exists(nameBuf)) {
+            int *cidptr = malloc(sizeof(int));
+            *cidptr = client->clientid;
+            timeq_add_name(nameBuf, 300, neonhelp_remind_open_requests, cidptr);
+        }
+    }
     printf_mysql_query("INSERT INTO `helpserv_requests` (`botid`, `host`, `hand`, `nick`, `status`, `supporter`, `time`, `text`) VALUES ('%d', '%s@%s', '%s', '%s', '0', '-1', UNIX_TIMESTAMP(), '%s')", client->clientid, escape_string(user->ident), escape_string(user->host), ((user->flags & USERFLAG_ISAUTHED) ? escape_string(user->auth) : "*"), escape_string(user->nick), escape_string(message));
     helpnode->suppid = (int) mysql_insert_id(mysql_conn);
     helpnode->log = NULL;
@@ -274,6 +296,48 @@ static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct Use
     }
 }
 
+static TIMEQ_CALLBACK(neonhelp_remind_open_requests) {
+    int clientid = *((int*)data);
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `helpserv_support`, `helpserv_public`, `helpserv_intern`, `helpserv_intern_announce` FROM `helpserv_settings` WHERE `helpserv_botid` = '%d'", clientid);
+    res = mysql_use();
+    if (!(row = mysql_fetch_row(res)) || !row[2]) {
+        free(data);
+        return;
+    }
+    struct ClientSocket *client;
+    for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
+        if(client->clientid == clientid)
+            break;
+    }
+    if(!client) {
+        free(data);
+        return;
+    }
+    //count open requests
+    int requests = 0;
+    struct NeonHelpNode *helpnode;
+    if(client->flags & SOCKET_HAVE_HELPNODE) {
+        for(helpnode = client->botclass_helpnode; helpnode; helpnode = helpnode->next) {
+            if(helpnode->status == 0) {
+                requests++;
+            }
+        }
+    }
+    if(requests) {
+        char nameBuf[30];
+        sprintf(nameBuf, "neonhelp_%d", client->clientid);
+        if(!timeq_name_exists(nameBuf)) {
+            timeq_add_name(nameBuf, 300, neonhelp_remind_open_requests, data);
+        }
+        char replybuf[MAXLEN];
+        build_language_string(NULL, replybuf, (requests == 1 ? "NH_REMIND_OPEN_REQUESTS_1" : "NH_REMIND_OPEN_REQUESTS_2"), requests);
+        putsock(client, "PRIVMSG %s :%s", row[2], replybuf);
+    } else
+        free(data);
+}
+
 static void neonhelp_event_chanmsg(struct UserNode *user, struct ChanNode *chan, char *message) {
     char logline[MAXLEN];
     sprintf(logline, "<%s> %s", user->nick, message);

diff --git a/src/bot_NeonHelp.h b/src/bot_NeonHelp.h
index a29086c8bf445a2a60031000a3af1a246f86fda9..2cbf6947e6fead5b2fe748785aa2242f38cb3ec0 100644 (file)
--- a/src/bot_NeonHelp.h
+++ b/src/bot_NeonHelp.h
@@ -31,7 +31,8 @@ struct ChanNode;
 struct NeonHelpNode {
     struct UserNode *user;
     int suppid;
-    char status;
+    char status:6;
+    char announce:2;
     struct NeonHelpNode *next;
     struct ChanNode *logchan;
     char **log;

diff --git a/src/cmd_neonhelp_requests.c b/src/cmd_neonhelp_requests.c
index 5c23f8c26c77811ea06d86148cdf79c7bcaea98e..89d83ac9f4a111fb81d6cf9cc455bd0d3cca8c71 100644 (file)
--- a/src/cmd_neonhelp_requests.c
+++ b/src/cmd_neonhelp_requests.c
@@ -57,7 +57,7 @@ CMD_BIND(neonhelp_cmd_requests) {
         return;
     }
     struct Table *table;
-    printf_mysql_query("SELECT `id`, `time`, `text` FROM `helpserv_requests` WHERE `botid` = '%d' ORDER BY `time` DESC", client->clientid);
+    printf_mysql_query("SELECT `id`, `time`, `text` FROM `helpserv_requests` WHERE `botid` = '%d' AND `status` != 2 ORDER BY `time` DESC", client->clientid);
     res = mysql_use();
     table = table_init(5, mysql_num_rows(res) + 1, 0);
     char *content[5];

diff --git a/src/mysqlConn.c b/src/mysqlConn.c
index 1275f59d97cd980fe65b9abe9738c9aa822f28a7..a651b1682bb9fcdefbbf5f6b2c73f72d645e4a44 100644 (file)
--- a/src/mysqlConn.c
+++ b/src/mysqlConn.c
@@ -16,7 +16,7 @@
  */
 
 #include "mysqlConn.h"
-#define DATABASE_VERSION "12"
+#define DATABASE_VERSION "13"
 
 struct used_result {
     MYSQL_RES *result;