Merge branch 'ducch-171-closed-exempt' into next

* ducch-171-closed-exempt:
  * Consider ops when checking 'closed-exempt voice'

src/mod/irc.mod/chan.c

@@ -460,7 +460,7 @@ static void priority_do(struct chanset_t * chan, bool opsonly, int action, bool
             } else if ((action == PRIO_KICK) && !chan_sentkick(m) &&
                 // Check closed-exempt
                 !((chan_hasop(m) && chan->closed_exempt_mode == CHAN_FLAG_OP) ||
-                  (chan_hasvoice(m) && chan->closed_exempt_mode == CHAN_FLAG_VOICE))) {
+                  ((chan_hasvoice(m) || chan_hasop(m)) && chan->closed_exempt_mode == CHAN_FLAG_VOICE))) {
               ++actions;
               ++sent;
               if (chan->closed_ban)