Move some of the modules in extras/ that arent really extra out of extras. Mark our modules as VENDOR and allow modules to have multple types.

10 files changed, 10 insertions, 20 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 1f15e3c06..bebca302b 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -542,7 +542,7 @@ class ProtoBahamut : public Module
 	}
 
  public:
-	ProtoBahamut(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoBahamut(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_join(this),
 		message_kick(this), message_kill(this), message_motd(this), message_part(this),
@@ -552,7 +552,6 @@ class ProtoBahamut : public Module
 		message_burst(this), message_mode(this, "MODE"), message_svsmode(this, "SVSMODE"),
 		message_nick(this), message_server(this), message_sjoin(this), message_topic(this)
 	{
-		this->SetAuthor("Anope");
 
 		this->AddModes();
 
diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp
index 07acda4f2..f4efbea50 100644
--- a/modules/protocol/charybdis.cpp
+++ b/modules/protocol/charybdis.cpp
@@ -382,7 +382,7 @@ class ProtoCharybdis : public Module
 	}
 
  public:
-	ProtoCharybdis(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoCharybdis(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_kick(this), message_kill(this),
 		message_mode(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this),
@@ -401,7 +401,6 @@ class ProtoCharybdis : public Module
 		message_encap(this), message_euid(this), message_pass(this), message_server(this)
 
 	{
-		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnChannelCreate, I_OnMLock, I_OnUnMLock };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 3247787f1..4953a37cd 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -592,7 +592,7 @@ class ProtoHybrid : public Module
 	}
 
 public:
-	ProtoHybrid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoHybrid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_kick(this), message_kill(this),
 		message_mode(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this),
@@ -603,7 +603,6 @@ public:
 		message_nick(this), message_pass(this), message_pong(this), message_server(this), message_sid(this),
 		message_sjoin(this), message_svsmode(this), message_tburst(this), message_tmode(this), message_uid(this)
 	{
-		this->SetAuthor("Anope");
 		this->AddModes();
 
 		ModuleManager::Attach(I_OnUserNickChange, this);
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 845183642..82eb8e31c 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -859,7 +859,7 @@ class ProtoInspIRCd : public Module
 	}
 
  public:
-	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this),
 		message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this),
@@ -871,7 +871,6 @@ class ProtoInspIRCd : public Module
 		message_fmode(this), message_ftopic(this), message_idle(this), message_mode(this),
 		message_nick(this), message_opertype(this), message_rsquit(this), message_server(this)
 	{
-		this->SetAuthor("Anope");
 
 		Servers::Capab.insert("NOQUIT");
 
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index d006f3f01..094f514cc 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -1203,7 +1203,7 @@ class ProtoInspIRCd : public Module
 	IRCDMessageUID message_uid;
 
  public:
-	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this),
 		message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this),
@@ -1214,7 +1214,6 @@ class ProtoInspIRCd : public Module
 		message_idle(this), message_metadata(this), message_mode(this), message_nick(this), message_opertype(this), message_rsquit(this),
 		message_setident(this), message_server(this), message_time(this), message_uid(this)
 	{
-		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnUserNickChange };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 2fb067bc2..6d51c7932 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -661,7 +661,7 @@ class ProtoInspIRCd : public Module
 	}
 
  public:
-	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this),
 		message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this),
@@ -684,7 +684,6 @@ class ProtoInspIRCd : public Module
 
 		message_capab(this), message_encap(this), message_fident(this)
 	{
-		this->SetAuthor("Anope");
 
 		if (ModuleManager::LoadModule("inspircd12", User::Find(creator)) != MOD_ERR_OK)
 			throw ModuleException("Unable to load inspircd12");
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 137251872..4f6d75642 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -641,7 +641,7 @@ class ProtongIRCd : public Module
 	}
 
  public:
-	ProtongIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtongIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_capab(this), message_error(this), message_kick(this), message_kill(this), message_motd(this),
 		message_part(this), message_ping(this), message_privmsg(this), message_squery(this, "SQUERY"),
@@ -651,7 +651,6 @@ class ProtongIRCd : public Module
 		message_mode(this), message_nick(this), message_njoin(this), message_pong(this), message_server(this),
 		message_topic(this)
 	{
-		this->SetAuthor("Anope");
 
 		Servers::Capab.insert("QS");
 
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index c22c43192..9af7351ff 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -353,7 +353,7 @@ class ProtoPlexus : public Module
 	}
 
  public:
-	ProtoPlexus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoPlexus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_kick(this), message_kill(this),
 		message_mode(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this),
@@ -367,7 +367,6 @@ class ProtoPlexus : public Module
 
 		message_encap(this), message_pass(this), message_server(this), message_uid(this)
 	{
-		this->SetAuthor("Anope");
 
 		if (ModuleManager::LoadModule("hybrid", User::Find(creator)) != MOD_ERR_OK)
 			throw ModuleException("Unable to load hybrid");
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 129752c06..1ac129065 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -228,7 +228,7 @@ class ProtoRatbox : public Module
 	}
 
  public:
-	ProtoRatbox(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoRatbox(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_kick(this), message_kill(this),
 		message_mode(this), message_motd(this), message_part(this), message_ping(this), message_privmsg(this),
@@ -242,7 +242,6 @@ class ProtoRatbox : public Module
 
 		message_encap(this), message_pass(this), message_server(this), message_tburst(this), message_uid(this)
 	{
-		this->SetAuthor("Anope");
 
 		if (ModuleManager::LoadModule("hybrid", User::Find(creator)) != MOD_ERR_OK)
 			throw ModuleException("Unable to load hybrid");
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 25094a24d..d14927ee1 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -1196,7 +1196,7 @@ class ProtoUnreal : public Module
 	}
 
  public:
-	ProtoUnreal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL),
+	ProtoUnreal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_error(this), message_join(this), message_kick(this), message_kill(this),
 		message_motd(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this),
@@ -1208,7 +1208,6 @@ class ProtoUnreal : public Module
 		message_sasl(this), message_sdesc(this), message_sethost(this), message_setident(this), message_setname(this), message_server(this),
 		message_sjoin(this), message_topic(this), message_umode2(this)
 	{
-		this->SetAuthor("Anope");
 
 		this->AddModes();