BUILD : 1.7.4 (257) BUGS : N/A NOTES : Bots will join a channel even if the first user to join is being ignored

git-svn-id: svn://svn.anope.org/anope/trunk@257 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@164 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 20 insertions, 12 deletions

diff --git a/Changes b/Changes
index e9bce0a1b..d09b49bb6 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
 Provided by Anope Dev. <dev@anope.org> - 2004
 07/05 A Warning when LocalAddress conflicts with RemoteServer.            [#118]
 06/18 A Added proper Bahamut1.8 support.                                  [ #55]
+07/12 F Bots will join a channel even for ignored users                   [ #00]
 07/05 F Global now joins LogChan on startup with hybrid.                  [ #97]
 07/04 F Fixed a bug with m_time.                                          [ #00]
 06/30 F Fixed bug which caused failure in anope crontab script.           [ #00]
diff --git a/channels.c b/channels.c
index dce7e5460..9fff738b4 100644
--- a/channels.c
+++ b/channels.c
@@ -1297,22 +1297,25 @@ static void chan_adduser2(User * user, Channel * c)
                             c->ci->memos.memocount, c->ci->name);
             }
         }
-
         /* Added channelname to entrymsg - 30.03.2004, Certus */
         if (c->ci && c->ci->entry_message)
             notice_user(whosends(c->ci), user, "[%s] %s", c->name,
                         c->ci->entry_message);
+    }
 
-        if (s_BotServ && c->ci && c->ci->bi) {
-            if (c->usercount == BSMinUsers)
-                bot_join(c->ci);
-            if (c->usercount >= BSMinUsers && (c->ci->botflags & BS_GREET)
-                && user->na && user->na->nc->greet
-                && check_access(user, c->ci, CA_GREET)) {
-                send_cmd(c->ci->bi->nick, "PRIVMSG %s :[%s] %s", c->name,
-                         user->na->nick, user->na->nc->greet);
-                c->ci->bi->lastmsg = time(NULL);
-            }
+    /**
+     * We let the bot join even if it was an ignored user, as if we dont, and the ignored user dosnt just leave, the bot will never
+     * make it into the channel, leaving the channel botless even for legit users - Rob
+     **/
+    if (s_BotServ && c->ci && c->ci->bi) {
+        if (c->usercount == BSMinUsers)
+            bot_join(c->ci);
+        if (c->usercount >= BSMinUsers && (c->ci->botflags & BS_GREET)
+            && user->na && user->na->nc->greet
+            && check_access(user, c->ci, CA_GREET)) {
+            send_cmd(c->ci->bi->nick, "PRIVMSG %s :[%s] %s", c->name,
+                     user->na->nick, user->na->nc->greet);
+            c->ci->bi->lastmsg = time(NULL);
         }
     }
 }
diff --git a/version.log b/version.log
index bac048a26..f3fda7235 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="4"
-VERSION_BUILD="230"
+VERSION_BUILD="257"
 
 # $Log$
 #
+# BUILD : 1.7.4 (257)
+# BUGS  : N/A
+# NOTES : Bots will join a channel even if the first user to join is being ignored
+#
 # BUILD : 1.7.4 (230)
 # BUGS  : 97
 # NOTES : Fixed the need of hybrid to have Global in LogChan on startup