changed Makefile; build all commands as an own file

[NeonServV5.git] / cmd_neonserv_deop.c

diff --git a/cmd_neonserv_deop.c b/cmd_neonserv_deop.c
index 993a0114a3577fe397f7f0da816166e69787cf78..d0ee75eb6057931d087528c55b38005b490a39b2 100644 (file)
--- a/cmd_neonserv_deop.c
+++ b/cmd_neonserv_deop.c
@@ -1,23 +1,21 @@
 
+#include "cmd_neonserv.h"
+
 /*
 * argv[0-*]    nicks
 */
 static USERLIST_CALLBACK(neonserv_cmd_deop_userlist_lookup);
-static void neonserv_cmd_deop_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char **argv, int argc);
+static void neonserv_cmd_deop_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char **argv, int argc);
 
 struct neonserv_cmd_deop_cache {
     struct ClientSocket *client, *textclient;
     struct UserNode *user;
+    struct Event *event;
     char **argv;
     int argc;
 };
 
-static CMD_BIND(neonserv_cmd_deop) {
-    check_mysql();
-    if(!checkChannelAccess(user, chan, "channel_canop", 1, 0)) {
-        reply(getTextBot(), user, "NS_ACCESS_DENIED");
-        return;
-    }
+CMD_BIND(neonserv_cmd_deop) {
     struct neonserv_cmd_deop_cache *cache = malloc(sizeof(*cache));
     if (!cache) {
         perror("malloc() failed");
@@ -26,6 +24,7 @@ static CMD_BIND(neonserv_cmd_deop) {
     cache->client = client;
     cache->textclient = getTextBot();
     cache->user = user;
+    cache->event = event;
     cache->argv = calloc(argc, sizeof(char*));
     int i;
     for(i = 0; i < argc; i++) {
@@ -36,8 +35,8 @@ static CMD_BIND(neonserv_cmd_deop) {
 }
 
 static USERLIST_CALLBACK(neonserv_cmd_deop_userlist_lookup) {
-    struct neonserv_cmd_kick_cache *cache = data;
-    neonserv_cmd_deop_async1(cache->client, cache->textclient, cache->user, chan, cache->argv, cache->argc);
+    struct neonserv_cmd_deop_cache *cache = data;
+    neonserv_cmd_deop_async1(cache->client, cache->textclient, cache->user, chan, cache->event, cache->argv, cache->argc);
     int i;
     for(i = 0; i < cache->argc; i++) {
         free(cache->argv[i]);
@@ -45,7 +44,7 @@ static USERLIST_CALLBACK(neonserv_cmd_deop_userlist_lookup) {
     free(cache);
 }
 
-static void neonserv_cmd_deop_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char **argv, int argc) {
+static void neonserv_cmd_deop_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char **argv, int argc) {
     int i, done_users = 0;
     struct UserNode *cuser;
     struct ChanUser *chanuser;
@@ -73,4 +72,6 @@ static void neonserv_cmd_deop_async1(struct ClientSocket *client, struct ClientS
         reply(textclient, user, "NS_DEOP_DONE", chan->name);
     else
         reply(textclient, user, "NS_DEOP_FAIL", client->user->nick);
+    if(done_users)
+        logEvent(event);
 }