From 4e3af265dad57a27af4051cb574fb90539d287d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 16 Aug 2015 02:17:50 +0200
Subject: GH-1164 make sure the censor filter never contains empty keys

---
 logic/minecraft/MinecraftInstance.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'logic/minecraft/MinecraftInstance.cpp')

diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp
index 13e696b9..d576ef4f 100644
--- a/logic/minecraft/MinecraftInstance.cpp
+++ b/logic/minecraft/MinecraftInstance.cpp
@@ -204,6 +204,39 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
 	return env;
 }
 
+QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSessionPtr session)
+{
+	if(!session)
+	{
+		return QMap<QString, QString>();
+	}
+	auto & sessionRef = *session.get();
+	QMap<QString, QString> filter;
+	auto addToFilter = [&filter](QString key, QString value)
+	{
+		if(key.trimmed().size())
+		{
+			filter[key] = value;
+		}
+	};
+	if (sessionRef.session != "-")
+	{
+		addToFilter(sessionRef.session, tr("<SESSION ID>"));
+	}
+	addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>"));
+	addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>"));
+	addToFilter(sessionRef.uuid, tr("<PROFILE ID>"));
+	addToFilter(sessionRef.player_name, tr("<PROFILE NAME>"));
+
+	auto i = sessionRef.u.properties.begin();
+	while (i != sessionRef.u.properties.end())
+	{
+		addToFilter(i.value(), "<" + i.key().toUpper() + ">");
+		++i;
+	}
+	return filter;
+}
+
 MessageLevel::Enum MinecraftInstance::guessLevel(const QString &line, MessageLevel::Enum level)
 {
 	QRegularExpression re("\\[(?<timestamp>[0-9:]+)\\] \\[[^/]+/(?<level>[^\\]]+)\\]");
-- 
cgit v1.2.3