+#include "cmd_neonserv.h"
+
/*
* argv[0] nick[,*auth[,*!*@mask[...]]]
* argv[1-*] reason
*/
static USERLIST_CALLBACK(neonserv_cmd_kick_userlist_lookup);
-static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason);
+static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *nicks, char *reason);
struct neonserv_cmd_kick_cache {
struct ClientSocket *client, *textclient;
struct UserNode *user;
+ struct Event *event;
char *nicks;
char *reason;
};
-static CMD_BIND(neonserv_cmd_kick) {
+CMD_BIND(neonserv_cmd_kick) {
struct neonserv_cmd_kick_cache *cache = malloc(sizeof(*cache));
if (!cache) {
perror("malloc() failed");
cache->client = client;
cache->textclient = getTextBot();
cache->user = user;
+ cache->event = event;
cache->nicks = strdup(argv[0]);
if(argc > 1) {
cache->reason = strdup(merge_argv(argv, 1, argc));
} else
cache->reason = NULL;
- get_userlist(chan, neonserv_cmd_kick_userlist_lookup, cache);
+ get_userlist_with_invisible(chan, neonserv_cmd_kick_userlist_lookup, cache);
}
static USERLIST_CALLBACK(neonserv_cmd_kick_userlist_lookup) {
struct neonserv_cmd_kick_cache *cache = data;
- neonserv_cmd_kick_async1(cache->client, cache->textclient, cache->user, chan, cache->nicks, (cache->reason ? cache->reason : "Bye."));
+ neonserv_cmd_kick_async1(cache->client, cache->textclient, cache->user, chan, cache->event, cache->nicks, (cache->reason ? cache->reason : "Bye."));
free(cache->nicks);
if(cache->reason)
free(cache->reason);
free(cache);
}
-static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nicks, char *reason) {
+static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *nicks, char *reason) {
int i, kicked_users = 0, provided_nicks = 0;
char *nick, *nextnick;
struct UserNode *cuser;
}
} else {
provided_nicks++;
- cuser = searchUserByNick(nick);
+ cuser = NULL;
+ for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+ if(!stricmp(chanuser->user->nick, nick)) {
+ cuser = chanuser->user;
+ }
+ }
if(!cuser) continue;
- chanuser = getChanUser(cuser, chan);
- if(!chanuser) continue;
if(isNetworkService(cuser)) {
reply(textclient, user, "NS_SERVICE_IMMUNE", cuser->nick);
continue;
reply(getTextBot(), user, "NS_KICK_DONE", kicked_users, chan->name);
else
reply(getTextBot(), user, "NS_KICK_FAIL", client->user->nick);
+ if(kicked_users)
+ logEvent(event);
}