Преглед изворни кода

* Bans aren't checked on join anymore if the channel is +take

svn: 2047
Bryan Drewery пре 21 година
родитељ
комит
f84c2d2395
2 измењених фајлова са 3 додато и 1 уклоњено
  1. 1 0
      doc/UPDATES
  2. 2 1
      src/mod/irc.mod/irc.c

+ 1 - 0
doc/UPDATES

@@ -99,6 +99,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Use /tmp/ as the default tempdir until tempdir is read from config
 * Use /tmp/ as the default tempdir until tempdir is read from config
 * Detection system run by localhub will kill all other running bots with DIE/SUICIDE now.
 * Detection system run by localhub will kill all other running bots with DIE/SUICIDE now.
 * During update, bot uplinks aren't permanently changed now.
 * During update, bot uplinks aren't permanently changed now.
+* Bans aren't checked on join anymore if the channel is +take
 
 
 1.2.2
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.

+ 2 - 1
src/mod/irc.mod/irc.c

@@ -1062,7 +1062,8 @@ reset_chan_info(struct chanset_t *chan)
     clear_channel(chan, 1);
     clear_channel(chan, 1);
     chan->status |= CHAN_PEND;
     chan->status |= CHAN_PEND;
     chan->status &= ~(CHAN_ACTIVE | CHAN_ASKEDMODES | CHAN_JOINING);
     chan->status &= ~(CHAN_ACTIVE | CHAN_ASKEDMODES | CHAN_JOINING);
-    if (!(chan->status & CHAN_ASKEDBANS)) {
+    /* don't bother checking bans if it's +take */
+    if (!(chan->status & CHAN_ASKEDBANS) && !channel_take(chan)) {
       chan->status |= CHAN_ASKEDBANS;
       chan->status |= CHAN_ASKEDBANS;
       dprintf(DP_MODE, "MODE %s +b\n", chan->name);
       dprintf(DP_MODE, "MODE %s +b\n", chan->name);
     }
     }