From 1b356e5a8900b727588ce72a64e22a300e828016 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 24 Jul 2020 05:04:11 +0100
Subject: Move the property string from cmd_modules to Module & show on load.

---
 src/modulemanager.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/modulemanager.cpp')

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 084d10172..db4e5d8ce 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -70,26 +70,24 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 			newmod->ModuleSourceFile = filename;
 			newmod->ModuleDLLManager = newhandle;
 			Modules[filename] = newmod;
-			const char* version = newhandle->GetVersion();
-			if (!version)
-				version = "unknown";
-			if (defer)
-			{
-				ServerInstance->Logs.Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",
-					filename.c_str(), version);
-			}
-			else
-			{
-				ConfigStatus confstatus;
 
+			if (!defer)
+			{
 				AttachAll(newmod);
 				AddServices(newservices);
+
+				ConfigStatus confstatus;
 				newmod->init();
 				newmod->ReadConfig(confstatus);
-
-				ServerInstance->Logs.Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s",
-					filename.c_str(), version, (!(newmod->properties & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 			}
+
+			const char* version = newhandle->GetVersion();
+			if (!version)
+				version = "unknown";
+
+			ServerInstance->Logs.Log("MODULE", LOG_DEFAULT, "New module introduced: %s (version %s, properties %s)",
+				filename.c_str(), version, newmod->GetPropertyString().c_str());
+
 		}
 		else
 		{
-- 
cgit v1.3.1-10-gc9f91