From f2ed0057961f26500bca6c243e43392f4170033a Mon Sep 17 00:00:00 2001
From: "F16Gaming (Laptop)" <adam.hellberg95@gmail.com>
Date: Wed, 9 May 2012 14:43:20 +0200
Subject: [PATCH] Updated AddonComm to only use one (registered) prefix.

The *actual* prefix is inside the message and is parsed by the Receive method.

**UNTESTED CHANGES**
---
 AddonComm.lua |   32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/AddonComm.lua b/AddonComm.lua
index e22dff2..cb103a8 100644
--- a/AddonComm.lua
+++ b/AddonComm.lua
@@ -43,16 +43,21 @@ C.AddonComm = {
 	GuildChecked = false,
 	GroupRunning = false,
 	GuildRunning = false,
+	Prefix = "COMMAND",
 	Type = {
-		VersionUpdate = "COMM_VU",
-		GroupUpdate = "COMM_GU",
-		GroupAdd = "COMM_GA",
-		GroupRequest = "COMM_GR",
-		GuildUpdate = "COMM_UG",
-		GuildAdd = "COMM_AG",
-		GuildRequest = "COMM_RG"
+		VersionUpdate	= "VU",
+		GroupUpdate		= "GU",
+		GroupAdd		= "GA",
+		GroupRequest	= "GR",
+		GuildUpdate		= "UG",
+		GuildAdd		= "AG",
+		GuildRequest	= "RG"
+	},
+	Pattern = {
+		Message = "{(%w+)}(.*)"
 	},
 	Format = {
+		Message = "{%s}%s",
 		VersionUpdate = "%s"
 	},
 	GroupMembers = {},
@@ -92,12 +97,18 @@ end
 
 function AC:Init()
 	--self:LoadSavedVars()
+	--[[
 	for _,v in pairs(self.Type) do
 		if not RegisterAddonMessagePrefix(v) then
 			log:Error(L("AC_ERR_PREFIX"):format(tostring(v)))
 			error(L("AC_ERR_PREFIX"):format(tostring(v)))
 		end
 	end
+	]]
+	if not RegisterAddonMessagePrefix(self.Prefix) then
+		log:Error(L("AC_ERR_PREFIX"):format(tostring(self.Prefix)))
+		error(L("AC_ERR_PREFIX"):format(tostring(self.Prefix)))
+	end
 end
 
 function AC:LoadSavedVars()
@@ -106,6 +117,9 @@ end
 
 function AC:Receive(msgType, msg, channel, sender)
 	if sender == UnitName("player") or not msg then return end
+	if msgType ~= self.Prefix then return end
+	log:Debug("[AddonComm] " .. msg)
+	msgType, msg = msg:match(self.Pattern.Message)
 	if msgType == self.Type.VersionUpdate then
 		local ver = tonumber(msg)
 		if type(ver) ~= "number" then return end
@@ -204,9 +218,9 @@ function AC:Send(msgType, msg, channel, target)
 			return
 		end
 	end
-	SendAddonMessage(msgType, msg, channel, target)
+	SendAddonMessage(self.Prefix, self.Format.Message:format(msgType, msg), channel, target)
 	if msgType ~= self.Type.VersionUpdate and channel ~= "WHISPER" then
-		SendAddonMessage(self.Type.VersionUpdate, self.Format.VersionUpdate:format(C.VersionNum), channel)
+		SendAddonMessage(self.Prefix, self.Format.Message:format(self.Type.VersionUpdate, self.Format.VersionUpdate:format(C.VersionNum)), channel)
 	end
 end
 
-- 
1.7.9.5