#include "IRCEvents.h"
#include "ClientSocket.h"
#include "WHOHandler.h"
+#include "lang.h"
+#include "DBHelper.h"
+#include "BanNode.h"
+#include "ModeNode.h"
struct irc_cmd *irc_commands = NULL;
if (*line == ':') {
//the rest is a single parameter
argv[argc++] = line + 1;
+ break;
}
argv[argc++] = line;
if (argc >= MAXNUMPARAMS)
if(!irc_cmd) {
event_raw(client, from, cmd, argv, argc);
} else if(!ret) {
- fprintf(stderr,"PARSE ERROR: %s", cmd);
+ fprintf(stderr,"PARSE ERROR: %s\n", cmd);
}
}
static USERLIST_CALLBACK(got_channel_userlist) {
struct ChanUser *chanuser = data;
event_join(chanuser);
- putsock(client, "PRIVMSG %s :[BOT JOIN] Users on this Channel:", chan->name);
- for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
- putsock(client, "PRIVMSG %s : %s!%s@%s [%s] rights: %d", chan->name, chanuser->user->nick, chanuser->user->ident, chanuser->user->host, ((chanuser->user->flags & USERFLAG_ISAUTHED) ? chanuser->user->auth : "*"), chanuser->flags);
- }
}
static IRC_CMD(raw_001) {
client->flags |= SOCKET_FLAG_READY;
- putsock(client, "JOIN #pktest");
+ event_bot_ready(client);
return 1;
}
struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot
get_userlist(chan, got_channel_userlist, chanuser);
putsock(client, "MODE %s", chan->name);
+ putsock(client, "MODE %s +b", chan->name);
} else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
struct ChanUser *chanuser = addChanUser(chan, user);
event_join(chanuser);
}
static IRC_CMD(raw_part) {
- if(from == NULL || argc < 2) return 0;
+ if(from == NULL || argc < 1) return 0;
struct UserNode *user = getUserByMask(from);
if(user == NULL) return 0;
struct ChanNode *chan = getChanByName(argv[0]);
if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
struct ChanUser *chanuser = getChanUser(user, chan);
delChanUser(chanuser, 0); //we need to free the chanuser manually!
- event_part(chanuser, argv[1]);
+ event_part(chanuser, (argc > 1 ? argv[1] : NULL));
free(chanuser);
if(chan->chanbot == user) {
//check if theres another bot in the channel - otherwise free it
}
static IRC_CMD(raw_quit) {
- if(from == NULL || argc < 2) return 0;
+ if(from == NULL || argc < 1) return 0;
struct UserNode *user = getUserByMask(from);
if(user == NULL) return 0;
delUser(user, 0); //a little bit crazy, but we want to delete the user on the channel's userlists - but not the users channel list
- event_quit(user, argv[1]);
+ event_quit(user, argv[0]);
if(user->flags & USERFLAG_ISBOT) {
//check if there are other bots in the users channel - otherwise free them
struct ChanUser *chanuser, *next;
}
if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
//remove the user
- delUser(user, 1);
+ delUser(target, 1);
}
return 1;
}
static IRC_CMD(raw_nick) {
if(from == NULL || argc == 0) return 0;
struct UserNode *user = getUserByMask(from);
+ if(user == NULL) return 0;
event_nick(user, argv[0]);
renameUser(user, argv[0]);
return 1;
if(from == NULL || argc < 3) return 0;
struct ChanNode *chan = getChanByName(argv[1]);
if(chan == NULL) return 0;
- parseModes(chan, argv[2], argv+3, argc-3);
+ parseModes(chan->modes, argv[2], argv+3, argc-3);
return 1;
}
static IRC_CMD(raw_invite) {
if(from == NULL || argc < 2) return 0;
struct UserNode *user = getUserByMask(from);
- event_invite(user, argv[1]);
+ if(user == NULL) {
+ user = createTempUser(from);
+ user->flags |= USERFLAG_ISTMPUSER;
+ }
+ event_invite(client, user, argv[1]);
return 1;
}
if(!chan) return 0;
if(chan->chanbot != client->user) return 1;
event_mode(user, chan, argv[1], argv+2, argc-2);
- parseModes(chan, argv[1], argv+2, argc-2);
+ parseModes(chan->modes, argv[1], argv+2, argc-2);
} else {
//UserMode
}
return 1;
}
-void parser_init() {
+static IRC_CMD(raw_367) {
+ //Watchcat #pktest pk911!*@* TestBot!~bot@pktest.user.WebGamesNet 1315863279
+ struct ChanNode *chan = getChanByName(argv[1]);
+ if(!chan) return 0;
+ struct BanNode *ban;
+ while((ban = getMatchingChannelBan(chan, argv[2]))) {
+ removeChannelBan(ban);
+ }
+ addChannelBan(chan, argv[2]);
+ return 1;
+}
+
+void init_parser() {
//all the raws we receive...
register_irc_function("001", raw_001);
register_irc_function("324", raw_324);
+ register_irc_function("367", raw_367);
register_irc_function("INVITE", raw_invite);
register_irc_function("NOTICE", raw_notice);
register_irc_function("TOPIC", raw_topic);
register_irc_function("PING", raw_ping);
register_irc_function("PRIVMSG", raw_privmsg);
}
+
+void free_parser() {
+ struct irc_cmd *cmd, *next;
+ for(cmd = irc_commands; cmd; cmd = next) {
+ next = cmd->next;
+ free(cmd);
+ }
+}
+
+void reply(struct ClientSocket *client, struct UserNode *user, const char *text, ...) {
+ const char *reply_format = get_language_string(user, text);
+ if(reply_format == NULL)
+ reply_format = text;
+ loadUserSettings(user);
+ char formatBuf[MAXLEN];
+ sprintf(formatBuf, "%s %s :%s", ((user->flags & USERFLAG_REPLY_PRIVMSG) ? "PRIVMSG" : "NOTICE"), user->nick, reply_format);
+ va_list arg_list;
+ char sendBuf[MAXLEN];
+ int pos;
+ if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
+ sendBuf[0] = '\0';
+ va_start(arg_list, text);
+ pos = vsnprintf(sendBuf, MAXLEN - 2, formatBuf, arg_list);
+ va_end(arg_list);
+ if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
+ sendBuf[pos] = '\n';
+ sendBuf[pos+1] = '\0';
+ write_socket(client, sendBuf, pos+1);
+}
+
+char* merge_argv(char **argv, int start, int end) {
+ return merge_argv_char(argv, start, end, ' ');
+}
+
+char* merge_argv_char(char **argv, int start, int end, char seperator) {
+ int i;
+ char *p = NULL;
+ for(i = start; i < end; i++) {
+ p = argv[i];
+ while(*p) p++;
+ *p = seperator;
+ }
+ if(p) *p = '\0';
+ return argv[start];
+}
projects / NeonServV5.git / blobdiff