Add files to be tracked after Mercurial import.

ChatSaver.lua

@@ -1,80 +1,136 @@
 ChatSaver = LibStub('AceAddon-3.0'):NewAddon('ChatSaver','AceConsole-3.0','AceHook-3.0','AceEvent-3.0');
 local core = ChatSaver;
 
-core.verified = false;
-
 function core:OnInitialize()	
-	self:RawHook(SlashCmdList,'JOIN','JoinChannel',true);
-	self:RawHook(SlashCmdList,'LEAVE','LeaveChannel',true);
-	self:Hook('ToggleChatChannel','ToggleChatChannel',true);
-	
-	self:RegisterChatCommand('cs','SlashCommand');
-	
-	if(ChatSaverDB == nil) then ChatSaverDB = {}; end
+	if(ChatSaverDB == nil) then 
+		core.firstrun = true;
+		ChatSaverDB = {}; 
+	else
+		core.firstrun = false;
+	end
 end
 
 function core:OnEnable()
-	self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','RejoinChannels');
+	self:Hook('ToggleChatChannel','ToggleChatChannel',true);
+	
+	self:RegisterEvent('CHANNEL_UI_UPDATE','RejoinChannels');
+	if(core.firstrun) then
+		self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','SetupChatSaver');
+	end
 end
 
-function core:SlashCommand()
-	core.verified = false
-	core:RejoinChannels();
+--[[ 
+--	CHANNEL FUNCTIONS 
+--	Because GetChannelName() and GetChannelDisplayInfo() are less
+--  than good.	
+]] --
+
+function core:GetChannelInfo(id)
+	local channelNumber,channelName = GetChannelName(id);
+	local channelTable = core:GetChannelTable();
+
+	if(channelName == nil) then
+		id = channelTable[id];
+		
+		if(id ~= nil) then
+			channelNumber,channelName = GetChannelName(id);
+		end
+	end
+	
+	return channelNumber,channelName,core:GetChannelCategory(channelNumber);
 end
 
-function core:RejoinChannels(event,message,...)
-	if(message == 'YOU_LEFT' or core.verified == true) then
-		return;
-	end
-	
-	local channelList = {};
-	for i = 1, select("#",GetChannelList()), 2 do
-		local index,channel = select(i,GetChannelList());
-		channelList[index] = channel;
-	end
-	
-	for channel,information in pairs(ChatSaverDB) do
-		local found = false;
-		for jIndex,jChannel in pairs(channelList) do
-			if(jChannel == channel) then 
-				found = true;
+function core:GetChannelTable()
+	local channelList = { GetChannelList() };
+	local channelTable = {};
+	for i = 1,#channelList,2 do
+		channelTable[channelList[i]] = channelList[i + 1];
+		channelTable[channelList[i + 1]] = channelList[i];
+		if(type(channelList[i + 1]) == 'string') then
+			channelTable[channelList[i + 1]:lower()] = channelList[i];
 		end
 	end
 
-		if(found == false) then
-			JoinPermanentChannel(channel);
-			for index,shown in pairs(ChatSaverDB[channel].frames) do
-				if(shown) then
-					_G['ChatFrame'..index].channelList[table.getn(_G['ChatFrame'..index].channelList) + 1] = channel;
-				end
-			end
-		end
-	end
-	
-	core.verified = true;
+	return channelTable;
 end
 
-function core:JoinChannel(msg)
-	self.hooks[SlashCmdList].JOIN(msg);
+function core:GetChannelCategory(number)
+	for i = 1,GetNumDisplayChannels(),1 do
+		local _,_,_,channelNumber,_,_,category = GetChannelDisplayInfo(i);
 		
-	local name = gsub(msg, "%s*([^%s]+).*", "%1");
+		if(channelNumber == number) then
+			return category;
+		end
+	end
+end
 
-	if(strlen(name) > 0 and string.match(name,"%a+")) then
+--[[ EVENT FUNCTIONS ]] --
+
+function core:ProcessChannelChange(_,message,_,_,_,_,_,_,index,name)
+	if message == 'YOU_JOINED' then
+		local number,_,category = core:GetChannelInfo(name)
+                
+		if category == 'CHANNEL_CATEGORY_CUSTOM' then
+			if ChatSaverDB[name] == nil then
+				ChatSaverDB[name] = {}
+				ChatSaverDB[name]['frames'] = {}
+				ChatSaverDB[name]['index'] = number
+				ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true
+			end
+		end
+	elseif message == 'YOU_LEFT' then
+		ChatSaverDB[name] = nil
+	end
+end
+
+function core:RejoinChannels(...)
+	local currentChannels = {};
+	for i = 1,select('#',GetChannelList()) do
+		currentChannels[select(i,GetChannelList())] = true
+	end
+	
+	local sortedChannels = {};
+	for channel,_ in pairs(ChatSaverDB) do
+		table.insert(sortedChannels,channel);
+	end
+	table.sort(sortedChannels,function(a,b) return ChatSaverDB[a].index < ChatSaverDB[b].index end);
+	
+	for _,channel in pairs(sortedChannels) do
+		if(currentChannels[channel] == nil) then
+			JoinPermanentChannel(channel); -- does not place in chat frame properly
+			for index,_ in pairs(ChatSaverDB[channel].frames) do
+				ChatFrame_AddChannel(_G['ChatFrame'..index],channel);
+			end
+		end
+	end
+	
+	self:UnregisterEvent('CHANNEL_UI_UPDATE');
+	self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','ProcessChannelChange')
+end
+
+function core:SetupChatSaver(...)
+	for frame = 1,NUM_CHAT_WINDOWS do 
+		local chatWindowChannels = { GetChatWindowChannels(frame) };
+		for i = 1,#chatWindowChannels,2 do
+			local number,name,category = core:GetChannelInfo(chatWindowChannels[i]);
+
+			if(category == 'CHANNEL_CATEGORY_CUSTOM') then
+				if(ChatSaverDB[name] == nil) then
 					ChatSaverDB[name] = {};
 					ChatSaverDB[name]['frames'] = {};
-		ChatSaverDB[name]['index'] = GetChannelName(name);
-		ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true;
+					ChatSaverDB[name]['index'] = number;
 				end
+			
+				ChatSaverDB[name]['frames'][frame] = true;
+			end
+		end
+	end
+	
+	self:UnregisterEvent('CHAT_MSG_CHANNEL_NOTICE');
+	self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','ProcessChannelChange')
 end
 
-function core:LeaveChannel(msg)
-	self.hooks[SlashCmdList].LEAVE(msg);
-	
-	local number = gsub(msg, "%s*([^%s]+).*", "%1");
-	local _,name = GetChannelName(number);
-	
-	ChatSaverDB[name] = nil;
-end
+--[[ HOOKED FUNCTIONS ]] --
 
 function core:ToggleChatChannel(checked,channel)
 	if(ChatSaverDB[channel] == nil) then 
@@ -84,6 +140,6 @@ function core:ToggleChatChannel(checked,channel)
 	if(checked) then
 		ChatSaverDB[channel]['frames'][FCF_GetCurrentChatFrameID()] = true;
 	else
-		ChatSaverDB[channel]['frames'][FCF_GetCurrentChatFrameID()] = false;
+		ChatSaverDB[channel]['frames'][FCF_GetCurrentChatFrameID()] = nil;
 	end
 end

ChatSaver.toc

@@ -1,17 +1,15 @@
-## Interface: 40000
+## Interface: 42000
 ## Title: ChatSaver
-## Version: 1.0
+## Version: @project-version@
 ## Author: Gaffer
 ## Notes: Saves chat channels and restores them if World of Warcraft loses them.
-## Dependencies: 
-## OptionalDeps: 
 ## DefaultState: enabled 
 ## SavedVariablesPerCharacter: ChatSaverDB
 
 Libs\LibStub\LibStub.lua
 Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
 Libs\AceAddon-3.0\AceAddon-3.0.xml
-Libs\AceAddon-3.0\AceConsole-3.0.xml
+Libs\AceConsole-3.0\AceConsole-3.0.xml
 Libs\AceEvent-3.0\AceEvent-3.0.xml
 Libs\AceHook-3.0\AceHook-3.0.xml