* Added bot int into cache_t

svn: 1693

src/mod/irc.mod/cmdsirc.c

@@ -1224,7 +1224,7 @@ static void do_invite(int idx, char *par, bool op)
       return;
     }
 
-    cache_invite(chan, nick, NULL, NULL, op);
+    cache_invite(chan, nick, NULL, NULL, op, 0);
     dprintf(idx, "Inviting %s to %s.\n", nick, chan->dname);
     next:;
     if (!all)

src/mod/irc.mod/irc.c

@@ -204,13 +204,15 @@ static void cache_debug(void)
   }
 }
 
-static void cache_invite(struct chanset_t *chan, char *nick, char *host, char *handle, bool op)
+static void cache_invite(struct chanset_t *chan, char *nick, char *host, char *handle, bool op, bool bot)
 {
   cache_t *cache = NULL;
 
   if ((cache = cache_find(nick)) == NULL)
     cache = cache_new(nick);
 
+  cache->bot = bot;
+
   /* if we find they have a host but it doesnt match the new host, wipe it */
   if (host && cache->uhost[0] && egg_strcasecmp(cache->uhost, host))
     cache->uhost[0] = 0;

src/mod/irc.mod/irc.h

@@ -39,6 +39,7 @@ typedef struct cache_b {
 //  bool invite;			/* INVITE ON USERHOST */
 //  bool ban;			/* BAN ON USERHOST */
 //  bool invited;			/* INVITED - CLEARED */
+  bool bot;
   char nick[NICKLEN];
   char handle[NICKLEN];
   char uhost[UHOSTLEN];
@@ -48,7 +49,7 @@ static void cache_chan_del(char *, char *);
 //static cache_chan_t *cache_chan_find(cache_t *, char *, char *);
 static void cache_chan_find(cache_t *, cache_chan_t *, char *, char *);
 static cache_chan_t *cache_chan_add(cache_t *, char *);
-static void cache_invite(struct chanset_t *, char *, char *, char *, bool);
+static void cache_invite(struct chanset_t *, char *, char *, char *, bool, bool);
 static cache_t *cache_find(char *);
 static cache_t *cache_new(char *);
 static void cache_del(char *, cache_t *);

src/mod/irc.mod/msgcmds.c

@@ -165,7 +165,7 @@ static int msg_invite(char *nick, char *host, struct userrec *u, char *par)
       for (chan = chanset; chan; chan = chan->next) {
 	get_user_flagrec(u, &fr, chan->dname);
         if (chk_op(fr, chan) && (chan->channel.mode & CHANINV)) {
-          cache_invite(chan, nick, host, u->handle, 0);
+          cache_invite(chan, nick, host, u->handle, 0, 0);
         }
       }
       putlog(LOG_CMDS, "*", "(%s!%s) !%s! INVITE ALL", nick, host, u->handle);
@@ -183,7 +183,7 @@ static int msg_invite(char *nick, char *host, struct userrec *u, char *par)
     /* We need to check access here also (dw 991002) */
     get_user_flagrec(u, &fr, par);
     if (chk_op(fr, chan)) {
-      cache_invite(chan, nick, host, u->handle, 0);
+      cache_invite(chan, nick, host, u->handle, 0, 0);
       putlog(LOG_CMDS, "*", "(%s!%s) !%s! INVITE %s", nick, host, u->handle, par);
       return BIND_RET_BREAK;
     }
@@ -721,7 +721,7 @@ static int msgc_invite(char *nick, char *host, struct userrec *u, char *chname,
       if ((!(chan->channel.mode & CHANINV) && force) || (chan->channel.mode & CHANINV)) {
         get_user_flagrec(u, &fr, chan->dname);
         if (chk_op(fr, chan)) {
-          cache_invite(chan, nick, host, u->handle, 0);
+          cache_invite(chan, nick, host, u->handle, 0, 0);
         }
         return BIND_RET_BREAK;
       }
@@ -732,7 +732,7 @@ static int msgc_invite(char *nick, char *host, struct userrec *u, char *chname,
         if ((!(chan->channel.mode & CHANINV) && force) || (chan->channel.mode & CHANINV)) {
           get_user_flagrec(u, &fr, chan->dname);
           if (chk_op(fr, chan)) {
-            cache_invite(chan, nick, host, u->handle, 0);
+            cache_invite(chan, nick, host, u->handle, 0, 0);
           }
         }
       }