-/* event_neonserv_join.c - NeonServ v5.3
+/* event_neonserv_join.c - NeonServ v5.4
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
struct neonserv_event_join_cache {
struct ClientSocket *client;
struct ChanUser *chanuser;
- int was_registering;
};
static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup);
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering);
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser);
static TIMEQ_CALLBACK(neonserv_event_join_dynlimit);
static void neonserv_event_join(struct ChanUser *chanuser) {
if(!client) return; //we can't "see" this event
if(chanuser->user == client->user) {
requestOp(client->user, chanuser->chan);
+ module_neonbackup_recover_chan(chanuser->chan);
return;
}
if(chanuser->user->flags & USERFLAG_ISBOT) return;
}
cache->client = client;
cache->chanuser = chanuser;
- cache->was_registering = (user->flags & USERFLAG_WAS_REGISTRING);
- get_userauth(user, neonserv_event_join_nick_lookup, cache);
+ get_userauth(user, module_id, neonserv_event_join_nick_lookup, cache);
} else
- neonserv_event_join_async1(client, chanuser, (user->flags & USERFLAG_WAS_REGISTRING));
+ neonserv_event_join_async1(client, chanuser);
}
static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup) {
struct neonserv_event_join_cache *cache = data;
- if(user) {
- neonserv_event_join_async1(cache->client, cache->chanuser, cache->was_registering);
- }
+ if(user)
+ neonserv_event_join_async1(cache->client, cache->chanuser);
free(cache);
}
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering) {
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser) {
struct ClientSocket *textclient = ((client->flags & SOCKET_FLAG_PREFERRED) ? client : get_prefered_bot(client->botid));
struct ChanNode *chan = chanuser->chan;
struct UserNode *user = chanuser->user;
if(a)
b = a+2;
} while(a);
- if(greetingPos && (!was_registering || *row[2]))
+ if(greetingPos && *row[2])
reply(textclient, user, "[%s] %s", chan->name, greeting);
//USER RIGHTS
if(!(userflags & DB_CHANUSER_NOAUTOOP)) {
sprintf(nameBuf, "dynlimit_%s", chan->name);
if(!timeq_name_exists(nameBuf)) {
//neonserv_event_join_dynlimit
- timeq_add_name(nameBuf, 30, neonserv_event_join_dynlimit, strdup(chan->name));
+ timeq_add_name(nameBuf, 30, module_id, neonserv_event_join_dynlimit, strdup(chan->name));
}
}
//AUTOINVITE
char *chanName = data;
struct ChanNode *chan = getChanByName(chanName);
free(chanName);
+ if(!chan) return;
struct ClientSocket *client = getBotForChannel(chan);
if(!client) return;
loadChannelSettings(chan);