build: Clean up workspaces code a bit.

[irc/quakenet/newserv.git] / localuser / localuser.c

diff --git a/localuser/localuser.c b/localuser/localuser.c
index a0be41b988ff37df991056d3039694c1e2fe4344..35c13ebe840cfcc57131a794f942df9969006ac1 100644 (file)
--- a/localuser/localuser.c
+++ b/localuser/localuser.c
@@ -114,6 +114,7 @@ nick *registerlocaluserflags(char *nickname, char *ident, char *host, char *real
   newuser->timestamp=getnettime();
   newuser->shident=NULL;
   newuser->sethost=NULL;
+  newuser->away=NULL;
   newuser->marker=0;
   memset(newuser->exts, 0, MAXNICKEXTS * sizeof(void *));
 
@@ -147,6 +148,9 @@ nick *registerlocaluserflags(char *nickname, char *ident, char *host, char *real
     }
   }
 
+  newuser->cloak_count = 0;
+  newuser->cloak_extra = NULL;
+
   if (connected) {
     /* Check for nick collision */
     if ((np=getnickbynick(nickname))!=NULL) {
@@ -177,7 +181,9 @@ int renamelocaluser(nick *np, char *newnick) {
   nick *np2;
   char ipbuf[25];
   time_t timestamp=getnettime();
-  
+  void *harg[2];
+  char oldnick[NICKLEN+1];
+
   if (!np)
     return -1;
   
@@ -187,13 +193,18 @@ int renamelocaluser(nick *np, char *newnick) {
   if (homeserver(np->numeric)!=mylongnum) 
     return -1;
 
+  strncpy(oldnick,np->nick,NICKLEN);
+  oldnick[NICKLEN]='\0';
+  harg[0]=(void *)np;
+  harg[1]=(void *)oldnick;
+
   if ((np2=getnickbynick(newnick))) {
     if (np2==np) {
       /* Case only name change */
       strncpy(np->nick,newnick,NICKLEN);
       np->nick[NICKLEN]='\0';
-      irc_send("%s N %s %d",iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),np->nick,np->timestamp);
-      triggerhook(HOOK_NICK_RENAME,np);     
+      irc_send("%s N %s %jd",iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),np->nick,(intmax_t)np->timestamp);
+      triggerhook(HOOK_NICK_RENAME,harg);     
       return 0;
     } else {
       /* Kill other user and drop through */
@@ -207,8 +218,8 @@ int renamelocaluser(nick *np, char *newnick) {
   strncpy(np->nick,newnick,NICKLEN);
   np->nick[NICKLEN]='\0';
   addnicktohash(np);
-  irc_send("%s N %s %d",longtonumeric(np->numeric,5),np->nick,np->timestamp);
-  triggerhook(HOOK_NICK_RENAME,np);
+  irc_send("%s N %s %jd",longtonumeric(np->numeric,5),np->nick,(intmax_t)np->timestamp);
+  triggerhook(HOOK_NICK_RENAME,harg);
   
   return 0;
 }
@@ -513,6 +524,8 @@ void sethostuser(nick *target, char *ident, char *host) {
 void _killuser(nick *source, nick *target, char *reason) {
   char senderstr[6];
   char sourcestring[HOSTLEN+NICKLEN+3];
+  char reasonstr[512];
+  void *args[2];
 
   if (!source) {
     /* If we have a null nick, use the server.. */
@@ -523,7 +536,15 @@ void _killuser(nick *source, nick *target, char *reason) {
     sprintf(sourcestring,"%s!%s",source->host->name->content, source->nick);
   }
 
-  irc_send("%s D %s :%s (%s)",senderstr,longtonumeric(target->numeric,5),sourcestring,reason);
+  snprintf(reasonstr,512,"%s (%s)",sourcestring,reason);
+  reasonstr[511]='\0';
+
+  irc_send("%s D %s :%s",senderstr,longtonumeric(target->numeric,5),reasonstr);
+  
+  args[0]=target;
+  args[1]=reasonstr;
+  triggerhook(HOOK_NICK_KILL, args);
+
   deletenick(target);
 }
 
@@ -562,7 +583,7 @@ void checkpendingkills(int hooknum, void *arg) {
 }
 
 void sendaccountmessage(nick *np) {
-  if (connected) {
+  if (connected && IsAccount(np)) {
     if (np->auth) {
       if (np->auth->flags) {
         irc_send("%s AC %s %s %ld %lu %"PRIu64,mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid, np->auth->flags);
@@ -620,8 +641,25 @@ void localusersetaccountflags(authname *anp, u_int64_t accountflags) {
   arg[1] = &oldflags;
   anp->flags = accountflags;
 
-  for(np=anp->nicks;np;np=np->next)
+  for(np=anp->nicks;np;np=np->nextbyauthname)
     sendaccountmessage(np);
 
   triggerhook(HOOK_AUTH_FLAGSUPDATED, arg);
 }
+
+void localuseraddcloaktarget(nick *np, nick *target) {
+  char snumeric[10], tnumeric[10];
+
+  strcpy(snumeric, longtonumeric(np->numeric,5));
+  strcpy(tnumeric, longtonumeric(target->numeric,5));
+
+  irc_send("%s CA %s", snumeric, tnumeric);
+
+  addcloaktarget(np, target);
+}
+
+void localuserclearcloaktargets(nick *np) {
+  irc_send("%s CU", longtonumeric(np->numeric,5));
+  clearcloaktargets(np);
+}
+