-/* WHOHandler.c - NeonServ v5.3
+/* WHOHandler.c - NeonServ v5.4
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
#include "ModeNode.h"
#include "ClientSocket.h"
#include "IPNode.h"
+#include "modules.h"
#define WHOQUEUETYPE_ISONQUEUE 0x01
#define WHOQUEUETYPE_USERLIST 0x02
struct UserNode *user;
struct WHOQueueEntry *next;
void *callback[MAXCALLBACKS];
+ int module_id[MAXCALLBACKS];
void *data[MAXCALLBACKS];
};
DESYNCHRONIZE(whohandler_sync);
}
-void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *data) {
+void get_userlist(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data) {
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(isUserOnChan(bot->user, chan))
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
callback(bot, chan, data);
}
-void _get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t callback, void *data, int force) {
+void _get_userlist_with_invisible(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data, int force) {
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(isUserOnChan(bot->user, chan))
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
callback(bot, chan, data);
}
-void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data) {
+void get_userauth(struct UserNode *user, int module_id, userauth_callback_t callback, void *data) {
//check if we have already an active WHO for this user
struct ClientSocket *bot, *whobot = NULL;
struct WHOQueueEntry *entry;
for(i = 1; i < MAXCALLBACKS; i++) {
if(!entry->callback[i]) {
entry->callback[i] = callback;
+ entry->module_id[i] = module_id;
entry->data[i] = data;
return;
}
entry->user = user;
user->flags |= USERFLAG_IS_ON_WHO_QUEUE;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
struct UserNode *user = getUserByNick(argv[5]);
struct ChanUser *chanuser;
- if((chanuserflags & CHANUSERFLAG_INVISIBLE)) {
- if(!user) {
- user = createTempUser(argv[5]);
- user->flags |= USERFLAG_ISTMPUSER;
- }
+ if((chanuserflags & CHANUSERFLAG_INVISIBLE) && (!user || (user && !isBot(user)))) {
+ user = createTempUser(argv[5]); //always add a temponary user to prevent cache problems when the user joins right now (while it's stored in our cache as being invisible)
+ user->flags |= USERFLAG_ISTMPUSER;
chan->flags |= CHANFLAG_HAVE_INVISIBLES;
chanuser = addInvisibleChanUser(chan, user);
chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
for(i = 0; i < MAXCALLBACKS; i++) {
userauth_callback_t *callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->user->nick, entry->user, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->user->nick, entry->user, entry->data[i]);
}
}
}
for(i = 0; i < MAXCALLBACKS; i++) {
callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->chan, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->chan, entry->data[i]);
}
if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
//remove all invisible users again
for(i = 0; i < MAXCALLBACKS; i++) {
callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->user->nick, NULL, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->user->nick, NULL, entry->data[i]);
}
}
entry->user->flags &= ~USERFLAG_IS_ON_WHO_QUEUE;