projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for independent "zero-bots" (bots without an own source file)
[NeonServV5.git]
/
src
/
bot_NeonServ.c
diff --git
a/src/bot_NeonServ.c
b/src/bot_NeonServ.c
index 4a5de6955fdea3251bc3cfa4180d787b24d711f0..613487aa300a6e75039965cc068f74865489ebb5 100644
(file)
--- a/
src/bot_NeonServ.c
+++ b/
src/bot_NeonServ.c
@@
-36,6
+36,7
@@
#include "cmd_neonserv.h"
#define BOTID 1
#include "cmd_neonserv.h"
#define BOTID 1
+#define BOTALIAS "NeonServ"
static const struct default_language_entry msgtab[] = {
{"NS_USER_UNKNOWN", "User with nick $b%s$b does not exist."}, /* {ARGS: "TestUser"} */
static const struct default_language_entry msgtab[] = {
{"NS_USER_UNKNOWN", "User with nick $b%s$b does not exist."}, /* {ARGS: "TestUser"} */
@@
-89,6
+90,7
@@
static const struct default_language_entry msgtab[] = {
{"NS_SUSPEND_NOT", "$b%s$b is not suspended." }, /* {ARGS: "TestUser"} */
{"NS_SUSPEND_DONE", "$b%s$b's access to $b%s$b has been suspended." }, /* {ARGS: "TestUser", "#TestChan"} */
{"NS_SUSPEND_RESTORED", "$b%s$b's access to $b%s$b has been restored." }, /* {ARGS: "TestUser", "#TestChan"} */
{"NS_SUSPEND_NOT", "$b%s$b is not suspended." }, /* {ARGS: "TestUser"} */
{"NS_SUSPEND_DONE", "$b%s$b's access to $b%s$b has been suspended." }, /* {ARGS: "TestUser", "#TestChan"} */
{"NS_SUSPEND_RESTORED", "$b%s$b's access to $b%s$b has been restored." }, /* {ARGS: "TestUser", "#TestChan"} */
+ {"NS_DELME_OWNER", "You cannot delete your owner access in $b%s$b."}, /* {ARGS: "#TestChan"} */
{"NS_DELME_KEY", "To really remove yourself, you must use 'deleteme %s'."}, /* {ARGS: "abc123"} */
{"NS_DELME_DONE", "Your $b%d$b access has been deleted from $b%s$b."}, /* {ARGS: 123, "#TestChan"} */
{"NS_MYACCESS_SELF_ONLY", "You may only see the list of infolines for yourself (by using $bmyaccess$b with no arguments)."},
{"NS_DELME_KEY", "To really remove yourself, you must use 'deleteme %s'."}, /* {ARGS: "abc123"} */
{"NS_DELME_DONE", "Your $b%d$b access has been deleted from $b%s$b."}, /* {ARGS: 123, "#TestChan"} */
{"NS_MYACCESS_SELF_ONLY", "You may only see the list of infolines for yourself (by using $bmyaccess$b with no arguments)."},
@@
-332,6
+334,12
@@
static const struct default_language_entry msgtab[] = {
{"NS_DNR_EXPIRES", "Expires"},
{"NS_DNR_REASON", "Reason"},
{"NS_STAFF_LOGGEDIN", "Logged in as"},
{"NS_DNR_EXPIRES", "Expires"},
{"NS_DNR_REASON", "Reason"},
{"NS_STAFF_LOGGEDIN", "Logged in as"},
+ {"NS_BOTS_NICK", "Nick"},
+ {"NS_BOTS_SERVER", "Server:Port(:Pass)"},
+ {"NS_BOTS_CLASS", "Bot Class"},
+ {"NS_BOTS_FLAGS", "Flags"},
+ {"NS_BOTS_CHANNELS", "Channels"},
+ {"NS_BOTS_TRIGGER", "Trigger"},
{NULL, NULL}
};
{NULL, NULL}
};
@@
-382,7
+390,7
@@
static void neonserv_bot_ready(struct ClientSocket *client) {
}
}
}
}
-static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
+static void neonserv_trigger_callback(
int clientid,
struct ChanNode *chan, char *trigger) {
MYSQL_RES *res;
MYSQL_ROW row;
loadChannelSettings(chan);
MYSQL_RES *res;
MYSQL_ROW row;
loadChannelSettings(chan);
@@
-397,22
+405,18
@@
static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
}
static void start_bots() {
}
static void start_bots() {
- struct UserNode *user;
struct ClientSocket *client;
MYSQL_RES *res, *res2;
MYSQL_ROW row;
struct ClientSocket *client;
MYSQL_RES *res, *res2;
MYSQL_ROW row;
- printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+ printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`
, `ssl`, `bind`
FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
res = mysql_use();
while ((row = mysql_fetch_row(res)) != NULL) {
res = mysql_use();
while ((row = mysql_fetch_row(res)) != NULL) {
- user = addUser(row[0]);
- strcpy(user->ident, row[1]);
- strcpy(user->realname, row[2]);
- user->flags |= USERFLAG_ISBOT;
- client = create_socket(row[3], atoi(row[4]), row[5], user);
+ client = create_socket(row[3], atoi(row[4]), row[10], row[5], row[0], row[1], row[2]);
client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
+ client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0);
client->botid = BOTID;
client->clientid = atoi(row[7]);
connect_socket(client);
client->botid = BOTID;
client->clientid = atoi(row[7]);
connect_socket(client);
@@
-438,6
+442,7
@@
static void start_bots() {
void init_NeonServ() {
void init_NeonServ() {
+ set_bot_alias(BOTID, BOTALIAS);
start_bots();
//register events
start_bots();
//register events
@@
-467,3
+472,4
@@
void free_NeonServ() {
}
#undef BOTID
}
#undef BOTID
+#undef BOTALIAS