moved debug outputs and added getModeString

diff --git a/ChanNode.c b/ChanNode.c
index 5bca72ea2bf361cf9ca57ae8ecae8b248e63d5e2..56c2edc2d33338af45e00d2089a6d75a6720de9a 100644 (file)
--- a/ChanNode.c
+++ b/ChanNode.c
@@ -320,4 +320,30 @@ void parseModes(struct ChanNode* chan, char *modeStr, char **argv, int argc) {
     #undef MODE_VALUE_INDEX
 }
 
+void getModeString(struct ChanNode* chan, char *modesStr) {
+    #define MODE_TYPE (mode[2] & CHANNEL_MODE_TYPE)
+    #define MODE_VALUE (mode[2] & CHANNEL_MODE_VALUE)
+    #define MODE_VALUE_INDEX (mode[2] & CHANNEL_MODE_VALUE_INDEX_MASK) >> CHANNEL_MODE_VALUE_INDEX_SHIFT
+    char paramStr[MAXLEN];
+    modesStr[0] = '+';
+    unsigned int *mode, flag = 1;
+    int modePos = 1;
+    int paramPos = 0;
+    for (mode = valid_modes; mode[1]; mode += 3) {
+        if(chan->modes & mode[0]) {
+            modesStr[modePos++] = (char) mode[1];
+            if(MODE_TYPE != CHANNEL_MODE_TYPE_D) {
+                if(MODE_VALUE == CHANNEL_MODE_VALUE_STRING)
+                    paramPos += sprintf(paramStr + paramPos, " %s", chan->mode_str_args[MODE_VALUE_INDEX]);
+                else if(MODE_VALUE == CHANNEL_MODE_VALUE_INTEGER)
+                    paramPos += sprintf(paramStr + paramPos, " %d", chan->mode_int_args[MODE_VALUE_INDEX]);
+            }
+        }
+    }
+    paramStr[paramPos] = '\0';
+    strcpy(modesStr + modePos, paramStr);
+    #undef MODE_TYPE
+    #undef MODE_VALUE
+    #undef MODE_VALUE_INDEX
+}
 

diff --git a/ChanNode.h b/ChanNode.h
index 9c6ae869253c7933e445f47c5951c6f3739bd02d..dce8c384171c22e025026e33aa10db77232f8a31 100644 (file)
--- a/ChanNode.h
+++ b/ChanNode.h
@@ -29,5 +29,6 @@ void checkChannelVisibility(struct ChanNode* chan);
 int isModeSet(struct ChanNode* chan, char modeChar);
 void* getModeValue(struct ChanNode* chan, char modeChar);
 void parseModes(struct ChanNode* chan, char *modeStr, char **argv, int argc);
+void getModeString(struct ChanNode* chan, char *modesStr);
 
 #endif
\ No newline at end of file

diff --git a/IRCEvents.c b/IRCEvents.c
index e71b5caad8c603d61730b06afa0375b1330f542d..215a8f74d3037c1edf64e5a0d0406c7b2c6e2a07 100644 (file)
--- a/IRCEvents.c
+++ b/IRCEvents.c
@@ -3,6 +3,7 @@
 #include "UserNode.h"
 #include "ChanNode.h"
 #include "ChanUser.h"
+#include "ClientSocket.h"
 
 int event_join(struct ChanUser *chanuser) {
     return 1;
@@ -33,6 +34,19 @@ int event_mode(struct UserNode *user, struct ChanNode *chan, char *modes, char *
 }
 
 int event_chanmsg(struct UserNode *user, struct ChanNode *chan, char *message) {
+    struct ClientSocket *client = getBots(SOCKET_FLAG_READY, NULL);
+    if(!strcmp(message, "users")) {
+        struct ChanUser *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);
+        }
+    }
+    if(!strcmp(message, "modes")) {
+        char modeBuf[MAXLEN];
+        getModeString(chan, modeBuf);
+        putsock(client, "PRIVMSG %s :Modes: %s", chan->name, modeBuf);
+    }
     return 1;
 }
 

diff --git a/IRCParser.c b/IRCParser.c
index 8f1834c8a4668f3b153d685c972d84afdd4d47d1..b13f5eb80a16afcde32daea5f62e98dc81da4702 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -88,10 +88,6 @@ static void parse_raw(struct ClientSocket *client, char *from, char *cmd, char *
 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) {