Fixed a lot of small problems

5 files changed, 10 insertions, 11 deletions

diff --git a/include/bots.h b/include/bots.h
index 7cdf417f1..2ae6fdbc0 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -77,15 +77,15 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>
 
 	/** Join this bot to a channel
 	 * @param c The channel
-	 * @param update_ts Assume we're updating the TS for this channel
+	 * @param status The status the bot should have on the channel
 	 */
-	void Join(Channel *c, bool update_ts = false);
+	void Join(Channel *c, ChannelStatus *status = NULL);
 
 	/** Join this bot to a channel
 	 * @param chname The channel name
-	 * @param update_ts Assume we're updating the TS for this channel
+	 * @param status The status the bot should have on the channel
 	 */
-	void Join(const Anope::string &chname, bool update_ts = false);
+	void Join(const Anope::string &chname, ChannelStatus *status = NULL);
 
 	/** Part this bot from a channel
 	 * @param c The channel
diff --git a/include/config.h b/include/config.h
index cbe36d4f7..ef71933ec 100644
--- a/include/config.h
+++ b/include/config.h
@@ -549,7 +549,7 @@ class CoreExport ServerConfig
 	/* Default botmodes on channels, defaults to ao */
 	Anope::string BotModes;
 	/* THe actual modes */
-	std::vector<ChannelModeStatus *> BotModeList;
+	ChannelStatus BotModeList;
 	/* How many times to try and reconnect to the uplink before giving up */
 	unsigned MaxRetries;
 	/* How long to wait between connection attempts */
diff --git a/include/extern.h b/include/extern.h
index d37fc10ee..1e88fbbc7 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -339,7 +339,7 @@ E User *finduser(const Anope::string &nick);
 
 E User *do_nick(const Anope::string &source, const Anope::string &nick, const Anope::string &username, const Anope::string &host, const Anope::string &server, const Anope::string &realname, time_t ts, const Anope::string &ip, const Anope::string &vhost, const Anope::string &uid, const Anope::string &modes);
 
-E void do_umode(const Anope::string &, const Anope::string &user, const Anope::string &modes);
+E void do_umode(const Anope::string &user, const Anope::string &modes);
 E void do_kill(User *user, const Anope::string &reason);
 
 E bool matches_list(Channel *c, User *user, ChannelModeName mode);
diff --git a/include/modules.h b/include/modules.h
index c407e2c21..4253b3799 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -423,10 +423,10 @@ class CoreExport Module : public Extensible
 	virtual void OnBotNoFantasyAccess(const Anope::string &command, User *u, ChannelInfo *ci, const Anope::string &params) { }
 
 	/** Called after a bot joins a channel
-	 * @param ci The channael
+	 * @param c The channel
 	 * @param bi The bot
 	 */
-	virtual void OnBotJoin(ChannelInfo *ci, BotInfo *bi) { }
+	virtual void OnBotJoin(Channel *c, BotInfo *bi) { }
 
 	/** Called when a bot places a ban
 	 * @param u User being banned
diff --git a/include/services.h b/include/services.h
index 82d491cc4..646dbfbfe 100644
--- a/include/services.h
+++ b/include/services.h
@@ -991,8 +991,7 @@ class CoreExport IRCDProto
 	virtual void SendQuit(const User *u, const char *fmt, ...);
 	virtual void SendPing(const Anope::string &servname, const Anope::string &who);
 	virtual void SendPong(const Anope::string &servname, const Anope::string &who);
-	virtual void SendJoin(const BotInfo *, const Anope::string &, time_t) = 0;
-	virtual void SendJoin(BotInfo *, const ChannelContainer *);
+	virtual void SendJoin(BotInfo *, Channel *, const ChannelStatus *) = 0;
 	virtual void SendSQLineDel(const XLine *x) = 0;
 	virtual void SendInvite(const BotInfo *bi, const Anope::string &chan, const Anope::string &nick);
 	virtual void SendPart(const BotInfo *bi, const Channel *chan, const char *fmt, ...);
@@ -1041,7 +1040,7 @@ class CoreExport IRCDProto
 	/** Send a channel creation message to the uplink.
 	 * On most TS6 IRCds this is a SJOIN with no nick
 	 */
-	virtual void SendChannel(Channel *c, const Anope::string &modes) { }
+	virtual void SendChannel(Channel *c) { }
 };
 
 class CoreExport IRCdMessage