Add a field to channel structure to track the number of internal clients in the channel. This will make it easier to determine if removing a user will cause the channel to become empty (since, in practice, services users will often part channels when the last normal user leaves)

Author: Ryan Schoppmeyer

Diff for: include/channels.h

@@ -25,6 +25,7 @@ struct channel_
   char **extmodes; /* non-standard simple modes with param eg +j */
 
   unsigned int nummembers;
+  unsigned int numsvcmembers;
 
   time_t ts;
 

Diff for: libathemecore/channels.c

@@ -174,6 +174,7 @@ void channel_delete(channel_t *c)
 		cnt.chanuser--;
 	}
 	c->nummembers = 0;
+	c->numsvcmembers = 0;
 
 	hook_call_channel_delete(c);
 
@@ -400,6 +401,8 @@ chanuser_t *chanuser_add(channel_t *chan, const char *nick)
 	cu->modes = flags;
 
 	chan->nummembers++;
+	if (is_internal_client(u))
+		chan->numsvcmembers++;
 
 	mowgli_node_add(cu, &cu->cnode, &chan->members);
 	mowgli_node_add(cu, &cu->unode, &u->channels);
@@ -459,6 +462,9 @@ void chanuser_delete(channel_t *chan, user_t *user)
 	chan->nummembers--;
 	cnt.chanuser--;
 
+	if (is_internal_client(user))
+		chan->numsvcmembers--;
+
 	if (chan->nummembers == 0 && !(chan->modes & ircd->perm_mode))
 	{
 		/* empty channels die */