Make log system use newer format strings

Also allow log messages to be translatable

7 files changed, 29 insertions, 33 deletions

diff --git a/modules/botserv/assign.cpp b/modules/botserv/assign.cpp
index eca103e9f..db368c75e 100644
--- a/modules/botserv/assign.cpp
+++ b/modules/botserv/assign.cpp
@@ -80,7 +80,7 @@ class CommandBSAssign : public Command
 		}
 
 		bool override = !access.HasPriv("ASSIGN");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "for " << bi->nick;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to assign {0}"), bi->nick);
 
 		bi->Assign(source.GetUser(), ci);
 		source.Reply(_("Bot \002{0}\002 has been assigned to \002{1}\002."), bi->nick, ci->GetName());
@@ -147,7 +147,7 @@ class CommandBSUnassign : public Command
 		}
 
 		bool override = !access.HasPriv("ASSIGN");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "for " << ci->GetBot()->nick;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to unassign {0}"), ci->GetBot()->nick);
 
 		ServiceBot *bi = ci->GetBot();
 		bi->UnAssign(source.GetUser(), ci);
@@ -192,7 +192,7 @@ class CommandBSSetNoBot : public Command
 
 		if (value.equals_ci("ON"))
 		{
-			Log(LOG_ADMIN, source, this, ci) << "to enable nobot";
+			logger.Command(LogType::ADMIN, source, ci, _("{source} used {command} on {channel} to enable nobot"));
 
 			ci->SetS<bool>("BS_NOBOT", true);
 			if (ci->GetBot())
@@ -201,7 +201,7 @@ class CommandBSSetNoBot : public Command
 		}
 		else if (value.equals_ci("OFF"))
 		{
-			Log(LOG_ADMIN, source, this, ci) << "to disable nobot";
+			logger.Command(LogType::ADMIN, source, ci, _("{source} used {command} on {channel} to disable nobot"));
 
 			ci->UnsetS<bool>("BS_NOBOT");
 			source.Reply(_("No-bot mode is now \002off\002 for \002{0}\002."), ci->GetName());
diff --git a/modules/botserv/autoassign.cpp b/modules/botserv/autoassign.cpp
index 3bb6dce64..861d97f6f 100644
--- a/modules/botserv/autoassign.cpp
+++ b/modules/botserv/autoassign.cpp
@@ -37,7 +37,7 @@ class BSAutoAssign : public Module
 		ServiceBot *bi = ServiceBot::Find(bot, true);
 		if (bi == NULL)
 		{
-			Log(this) << "bs_autoassign is configured to assign bot " << bot << ", but it does not exist?";
+			logger.Log("bs_autoassign is configured to assign bot {0}, but it does not exist?", bot);
 			return;
 		}
 
diff --git a/modules/botserv/badwords.cpp b/modules/botserv/badwords.cpp
index 754e202a7..071414ac4 100644
--- a/modules/botserv/badwords.cpp
+++ b/modules/botserv/badwords.cpp
@@ -144,9 +144,9 @@ class CommandBSBadwords : public Command
 	void DoList(CommandSource &source, ChanServ::Channel *ci, const Anope::string &word)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "LIST";
-		ListFormatter list(source.GetAccount());
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to list badwords"));
 
+		ListFormatter list(source.GetAccount());
 		list.AddColumn(_("Number")).AddColumn(_("Word")).AddColumn(_("Type"));
 
 		if (!badwords->GetBadWordCount(ci))
@@ -244,7 +244,7 @@ class CommandBSBadwords : public Command
 			}
 
 		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "ADD " << realword;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to add {0}"), realword);
 		badwords->AddBadWord(ci, realword, bwtype);
 
 		source.Reply(_("\002{0}\002 added to \002{1}\002 bad words list."), realword, ci->GetName());
@@ -271,7 +271,8 @@ class CommandBSBadwords : public Command
 					if (!num || num > badwords->GetBadWordCount(ci))
 						return;
 
-					Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "DEL " << badwords->GetBadWord(ci, num - 1)->GetWord();
+					logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to remove {0}"), badwords->GetBadWord(ci, num - 1)->GetWord());
+
 					++deleted;
 					badwords->EraseBadWord(ci, num - 1);
 				},
@@ -304,7 +305,7 @@ class CommandBSBadwords : public Command
 				return;
 			}
 
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "DEL " << bw->GetWord();
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to remove {3}"), bw->GetWord());
 
 			source.Reply(_("\002{0}\002 deleted from \002{1}\002 bad words list."), bw->GetWord(), ci->GetName());
 
@@ -315,7 +316,7 @@ class CommandBSBadwords : public Command
 	void DoClear(CommandSource &source, ChanServ::Channel *ci)
 	{
 		bool override = !source.AccessFor(ci).HasPriv("BADWORDS");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "CLEAR";
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to clear the badwords list"));
 
 		badwords->ClearBadWords(ci);
 		source.Reply(_("Bad words list is now empty."));
diff --git a/modules/botserv/bot.cpp b/modules/botserv/bot.cpp
index 082bd6337..4eb5d2069 100644
--- a/modules/botserv/bot.cpp
+++ b/modules/botserv/bot.cpp
@@ -103,7 +103,7 @@ class CommandBSBot : public Command
 		bi->bi = botinfo;
 		botinfo->bot = bi;
 
-		Log(LOG_ADMIN, source, this) << "ADD " << bi->GetMask() << " " << bi->realname;
+		logger.Command(LogType::ADMIN, source, _("{source} used {command} to add bot {0} {1}"), bi->GetMask(), bi->realname);
 
 		source.Reply(_("\002{0}!{1}@{2}\002 (\002{3}\002) added to the bot list."), bi->nick, bi->GetIdent(), bi->host, bi->realname);
 
@@ -266,8 +266,10 @@ class CommandBSBot : public Command
 		if (!user.empty())
 			bi->OnKill();
 
+		logger.Command(LogType::ADMIN, source, _("{source} used {command} to change bot {0} to {1} {2}"),
+				oldnick, bi->GetMask(), bi->realname);
+
 		source.Reply(_("Bot \002{0}\002 has been changed to \002{1}!{2}@{3}\002 (\002{4}\002)."), oldnick, bi->nick, bi->GetIdent(), bi->host, bi->realname);
-		Log(LOG_ADMIN, source, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname;
 
 		EventManager::Get()->Dispatch(&Event::BotChange::OnBotChange, bi);
 	}
@@ -297,7 +299,7 @@ class CommandBSBot : public Command
 
 		EventManager::Get()->Dispatch(&Event::BotDelete::OnBotDelete, bi);
 
-		Log(LOG_ADMIN, source, this) << "DEL " << bi->nick;
+		logger.Command(LogType::ADMIN, source, _("{source} used {command} to delete bot {0}"), bi->nick);
 
 		source.Reply(_("Bot \002{0}\002 has been deleted."), bi->nick);
 		delete bi;
diff --git a/modules/botserv/control.cpp b/modules/botserv/control.cpp
index 448a28baf..1785e65e9 100644
--- a/modules/botserv/control.cpp
+++ b/modules/botserv/control.cpp
@@ -75,7 +75,7 @@ class CommandBSSay : public Command
 		ci->GetBot()->lastmsg = Anope::CurTime;
 
 		bool override = !source.AccessFor(ci).HasPriv("SAY");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to say: " << text;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to say: {0}"), text);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
@@ -145,7 +145,7 @@ class CommandBSAct : public Command
 		ci->GetBot()->lastmsg = Anope::CurTime;
 
 		bool override = !source.AccessFor(ci).HasPriv("SAY");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to say: " << message;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} to say: {0}"), message);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
diff --git a/modules/botserv/kick.cpp b/modules/botserv/kick.cpp
index a32656f62..745525fa3 100644
--- a/modules/botserv/kick.cpp
+++ b/modules/botserv/kick.cpp
@@ -637,12 +637,12 @@ class CommandBSKickBase : public Command
 				source.Reply(_("Bot will now kick for \002{0}\002."), optname);
 
 			bool override = !source.AccessFor(ci).HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable the " << optname << " kicker";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to enable the {0} kicker"), optname);
 		}
 		else if (param.equals_ci("OFF"))
 		{
 			bool override = !source.AccessFor(ci).HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable the " << optname << " kicker";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to disable the {0} kicker"), optname);
 
 			(kd->*setter)(false);
 			(kd->*ttbsetter)(0);
@@ -1099,7 +1099,7 @@ class CommandBSSetDontKickOps : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickops";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to enable dontkickops"));
 
 			kd->SetDontKickOps(true);
 			source.Reply(_("Bot \002won't kick ops\002 on channel \002{0}\002."), ci->GetName());
@@ -1107,7 +1107,7 @@ class CommandBSSetDontKickOps : public Command
 		else if (params[1].equals_ci("OFF"))
 		{
 			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickops";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to disable dontkickops"));
 
 			kd->SetDontKickOps(false);
 			source.Reply(_("Bot \002will kick ops\002 on channel \002{0}\002."), ci->GetName());
@@ -1165,7 +1165,7 @@ class CommandBSSetDontKickVoices : public Command
 		if (params[1].equals_ci("ON"))
 		{
 			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to enable dontkickvoices";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to enable dontkickvoices"));
 
 			kd->SetDontKickVoices(true);
 			source.Reply(_("Bot \002won't kick voices\002 on channel %s."), ci->GetName().c_str());
@@ -1173,7 +1173,7 @@ class CommandBSSetDontKickVoices : public Command
 		else if (params[1].equals_ci("OFF"))
 		{
 			bool override = !access.HasPriv("SET");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to disable dontkickvoices";
+			logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to disable dontkickvoices"));
 
 			kd->SetDontKickVoices(false);
 			source.Reply(_("Bot \002will kick voices\002 on channel %s."), ci->GetName().c_str());
@@ -1200,15 +1200,8 @@ struct BanData
 	struct Data
 	{
 		Anope::string mask;
-		time_t last_use;
-		int16_t ttb[TTB_SIZE];
-
-		Data()
-		{
-			last_use = 0;
-			for (int i = 0; i < TTB_SIZE; ++i)
-				this->ttb[i] = 0;
-		}
+		time_t last_use = 0;
+		int16_t ttb[TTB_SIZE] = { 0 };
 	};
 
  private:
@@ -1269,7 +1262,7 @@ class BanDataPurger : public Timer
 
 	void Tick(time_t) override
 	{
-		Log(LOG_DEBUG) << "bs_main: Running bandata purger";
+		this->GetOwner()->logger.Debug("Running bandata purger");
 
 		for (channel_map::iterator it = ChannelList.begin(), it_end = ChannelList.end(); it != it_end; ++it)
 		{
diff --git a/modules/botserv/set.cpp b/modules/botserv/set.cpp
index 6ab429d97..6845281cb 100644
--- a/modules/botserv/set.cpp
+++ b/modules/botserv/set.cpp
@@ -140,7 +140,7 @@ class CommandBSSetBanExpire : public Command
 		ci->SetBanExpire(t);
 
 		bool override = !access.HasPriv("SET");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to change banexpire to " << arg;
+		logger.Command(override ? LogType::OVERRIDE : LogType::COMMAND, source, ci, _("{source} used {command} on {channel} to change banexpire to {0}"), arg);
 
 		if (!t)
 			source.Reply(_("Bot bans will no longer automatically expire."));