* Consider +voicebitch when voicing non-users in +voice

src/mod/irc.mod/chan.c

@@ -2725,7 +2725,7 @@ static int gotjoin(char *from, char *chname)
                 m->delay = now + chan->auto_delay;
                 m->flags |= SENTVOICE;
               }
-            } else if (!m->user && channel_voice(chan) && voice_ok(m, chan)) {
+            } else if (!m->user && channel_voice(chan) && !channel_voicebitch(chan) && voice_ok(m, chan)) {
               m->delay = now + chan->auto_delay;
               m->flags |= SENTVOICE;
             }

src/mod/irc.mod/irc.c

@@ -1588,7 +1588,7 @@ check_expired_chanstuff(struct chanset_t *chan)
                   add_mode(chan, '+', 'v', m->nick);
                 }
               }
-            } else if (!m->user && channel_voice(chan) && voice_ok(m, chan)) {
+            } else if (!m->user && channel_voice(chan) && !channel_voicebitch(chan) && voice_ok(m, chan)) {
               add_mode(chan, '+', 'v', m->nick);
             }
           }