Reverting to hooking slash commands instead of event.

This commit is contained in:
Andrew Tomaka 2011-06-02 04:37:29 -04:00
commit 46a0d47d35

View file

@ -13,9 +13,14 @@ function core:OnInitialize()
end end
function core:OnEnable() function core:OnEnable()
self:RawHook(SlashCmdList,'JOIN','JoinChannel',true);
self:RawHook(SlashCmdList,'LEAVE','LeaveChannel',true);
self:Hook('ToggleChatChannel','ToggleChatChannel',true); self:Hook('ToggleChatChannel','ToggleChatChannel',true);
self:RegisterEvent('CHANNEL_UI_UPDATE','RejoinChannels'); self:RegisterEvent('CHANNEL_UI_UPDATE','RejoinChannels');
if(core.firstrun) then
self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','SetupChatSaver');
end
end end
function core:SlashCommand() function core:SlashCommand()
@ -23,25 +28,12 @@ function core:SlashCommand()
end end
function core:RejoinChannels(...) function core:RejoinChannels(...)
print('RejoinChannels');
if(core.firstrun) then
print('setup cat server');
core:SetupChatSaver();
end
local currentChannels = {}; local currentChannels = {};
for i = 1,select('#',GetChannelList()) do for i = 1,select('#',GetChannelList()) do
currentChannels[select(i,GetChannelList())] = true currentChannels[select(i,GetChannelList())] = true
end end
local sortedChannels = {};
for channel,_ in pairs(ChatSaverDB) do 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 if(currentChannels[channel] == nil) then
JoinPermanentChannel(channel); -- does not place in chat frame properly JoinPermanentChannel(channel); -- does not place in chat frame properly
for index,_ in pairs(ChatSaverDB[channel].frames) do for index,_ in pairs(ChatSaverDB[channel].frames) do
@ -51,11 +43,9 @@ function core:RejoinChannels(...)
end end
self:UnregisterEvent('CHANNEL_UI_UPDATE'); self:UnregisterEvent('CHANNEL_UI_UPDATE');
self:RegisterEvent('CHAT_MSG_CHANNEL_NOTICE','ProcessChannelChanges');
end end
function core:SetupChatSaver() function core:SetupChatSaver(...)
print('SetupChatSaver()');
for frame = 1,NUM_CHAT_WINDOWS do for frame = 1,NUM_CHAT_WINDOWS do
local chatWindowChannels = { GetChatWindowChannels(frame) }; local chatWindowChannels = { GetChatWindowChannels(frame) };
for i = 1,#chatWindowChannels,2 do for i = 1,#chatWindowChannels,2 do
@ -72,36 +62,32 @@ function core:SetupChatSaver()
end end
end end
end end
self:UnregisterEvent('CHAT_MSG_CHANNEL_NOTICE');
end end
function core:ProcessChannelChanges(_,message,_,_,_,_,_,_,index,name,...) function core:JoinChannel(msg)
print('ProcessChannelChanges()'); self.hooks[SlashCmdList].JOIN(msg);
--no. on rejoins and change stored frames
if(message == 'YOU_JOINED') then local name = gsub(msg, "%s*([^%s]+).*", "%1");
local zone = 1;
for frame = 1,NUM_CHAT_WINDOWS do
local chatWindowChannels = { GetChatWindowChannels(frame) };
for i = 1,#chatWindowChannels,2 do
if(chatWindowChannels[i] == name) then
zone = chatWindowChannels[i + 1];
break;
end
end
end
if(zone == 0) then if(strlen(name) > 0 and string.match(name,"%a+")) then
print('Saving channel ',name); ChatSaverDB[name] = {};
ChatSaverDB[name] = {}; ChatSaverDB[name]['frames'] = {};
ChatSaverDB[name]['frames'] = {}; ChatSaverDB[name]['index'] = GetChannelName(name);
ChatSaverDB[name]['index'] = index; ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true;
ChatSaverDB[name]['frames'][DEFAULT_CHAT_FRAME:GetID()] = true;
end
elseif(message == 'YOU_LEFT') then
print('Removing channel ',name);
--ChatSaverDB[name] = nil;
end end
end 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
function core:ToggleChatChannel(checked,channel) function core:ToggleChatChannel(checked,channel)
if(ChatSaverDB[channel] == nil) then if(ChatSaverDB[channel] == nil) then
return; return;