* Only +y bots should autoop

svn: 972

doc/UPDATES

@@ -24,8 +24,8 @@ This is a summary of ChangeLog basically.
 19.Limits were not being set.
 20.No longer chmodding on CYGWIN
 21.The AES core should be slightly faster now.
-22.Added channel flag +autoop (users only, +private accounted for).
-23.Added user flag for autoop (+O).
+22.Added channel flag +autoop (+o users only, +private accounted for). (+y bots op)
+23.Added user flag for autoop (+O). (+y bots op)
 24.Fixed a problem with my chmod() function.
 
 1.1.5

src/mod/irc.mod/chan.c

@@ -922,7 +922,7 @@ static void check_this_member(struct chanset_t *chan, char *nick, struct flag_re
          (!loading && userlist && channel_bitch(chan) && !chk_op(*fr, chan)) ) ) {
       /* if (target_priority(chan, m, 1)) */
         add_mode(chan, '-', 'o', m->nick);
-    } else if (!chan_hasop(m) && chk_autoop(*fr, chan)) {
+    } else if (!chan_hasop(m) && dovoice(chan) && chk_autoop(*fr, chan)) {
       do_op(m->nick, chan, 1, 0);
     }
     if (dovoice(chan)) {
@@ -2203,7 +2203,7 @@ static int gotjoin(char *from, char *chname)
 	    m->flags |= SENTKICK;
 	  }
 	}
-        if (!chan_hasop(m) && chk_autoop(fr, chan)) {
+        if (!chan_hasop(m) && dovoice(chan) && chk_autoop(fr, chan)) {
           do_op(m->nick, chan, 1, 0);
         }
       }