diff --git a/Interface/AddOns/LookingForGroup/CHANGES.txt b/Interface/AddOns/LookingForGroup/CHANGES.txt index b98158fb..f7df7b91 100755 --- a/Interface/AddOns/LookingForGroup/CHANGES.txt +++ b/Interface/AddOns/LookingForGroup/CHANGES.txt @@ -1,8 +1,9 @@ ------------------------------------------------------------------------ -r270 | euloanty@live.com | 2017-07-24 10:07:12 -0500 (Mon, 24 Jul 2017) | 1 line +r277 | euloanty@live.com | 2017-07-25 06:55:35 -0500 (Tue, 25 Jul 2017) | 1 line Changed paths: + M /trunk/Options/options/Core.lua M /trunk/WQ/Core.lua -fix a bug which potential causes background search conflict with WQ +world quest adds auto leave party feature ------------------------------------------------------------------------ diff --git a/Interface/AddOns/LookingForGroup/LookingForGroup.toc b/Interface/AddOns/LookingForGroup/LookingForGroup.toc index 5fb7d35c..0365a0ca 100755 --- a/Interface/AddOns/LookingForGroup/LookingForGroup.toc +++ b/Interface/AddOns/LookingForGroup/LookingForGroup.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup -## Version: 271 +## Version: 278 ## SavedVariables: LookingForGroupDB #@no-lib-strip@ diff --git a/Interface/AddOns/LookingForGroup_AV/LookingForGroup_AV.toc b/Interface/AddOns/LookingForGroup_AV/LookingForGroup_AV.toc index 4eadbc9d..a807ec5d 100755 --- a/Interface/AddOns/LookingForGroup_AV/LookingForGroup_AV.toc +++ b/Interface/AddOns/LookingForGroup_AV/LookingForGroup_AV.toc @@ -2,7 +2,7 @@ ## Author: cqwrteur ## Title: LookingForGroup Alterac Valley ## Dependencies: LookingForGroup -## Version: 271 +## Version: 278 ## SavedVariablesPerCharacter: LookingForGroup_AVCharacterDB ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_CR/LookingForGroup_CR.toc b/Interface/AddOns/LookingForGroup_CR/LookingForGroup_CR.toc index 45ad6ddc..3ea52a29 100755 --- a/Interface/AddOns/LookingForGroup_CR/LookingForGroup_CR.toc +++ b/Interface/AddOns/LookingForGroup_CR/LookingForGroup_CR.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Cross Realm -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_Core/Core.lua b/Interface/AddOns/LookingForGroup_Core/Core.lua index f8a6a74c..f203101f 100755 --- a/Interface/AddOns/LookingForGroup_Core/Core.lua +++ b/Interface/AddOns/LookingForGroup_Core/Core.lua @@ -190,11 +190,12 @@ function LookingForGroup_Core.GetSearchResultInfo(resultID) concat_tb[#concat_tb+1] = "\n" concat_tb[#concat_tb+1] = leaderName end - if voiceChat and voiceChat~="" then - concat_tb[#concat_tb+1] = "\n" - concat_tb[#concat_tb+1] = LFG_LIST_VOICE_CHAT - concat_tb[#concat_tb+1] = " " - concat_tb[#concat_tb+1] = voiceChat + if voiceChat and voiceChat ~= "" then + table_insert(concat_tb,"\n") + table_insert(concat_tb,LFG_LIST_VOICE_CHAT) + table_insert(concat_tb," |c0000ff00") + table_insert(concat_tb,voiceChat) + table_insert(concat_tb,"|r") end if autoaccept then concat_tb[#concat_tb+1] = "\n" @@ -312,11 +313,12 @@ function LookingForGroup_Core.GetQuestSearchResultInfo(resultID) concat_tb[#concat_tb+1] = "\n" concat_tb[#concat_tb+1] = leaderName end - if voiceChat and voiceChat~="" then - concat_tb[#concat_tb+1] = "\n" - concat_tb[#concat_tb+1] = LFG_LIST_VOICE_CHAT_INSTR - concat_tb[#concat_tb+1] = " " - concat_tb[#concat_tb+1] = voiceChat + if voiceChat and voiceChat ~= "" then + table_insert(concat_tb,"\n") + table_insert(concat_tb,LFG_LIST_VOICE_CHAT) + table_insert(concat_tb," |c0000ff00") + table_insert(concat_tb,voiceChat) + table_insert(concat_tb,"|r") end if autoaccept then concat_tb[#concat_tb+1] = "\n" @@ -402,7 +404,16 @@ function LookingForGroup_Core.GetActiveEntryInfo() table_insert(concat_tb,"/") table_insert(concat_tb,damager) table_insert(concat_tb,")|r") - if questID == nil and comment ~= nil and comment ~= "" then + + if voiceChat and voiceChat ~= "" then + table_insert(concat_tb,"\n") + table_insert(concat_tb,LFG_LIST_VOICE_CHAT) + table_insert(concat_tb," |c0000ff00") + table_insert(concat_tb,voiceChat) + table_insert(concat_tb,"|r") + end + + if questID == nil and comment and comment ~= "" then table_insert(concat_tb,"\n\n|cff8080cc") table_insert(concat_tb,comment) table_insert(concat_tb,"|r") diff --git a/Interface/AddOns/LookingForGroup_Core/LookingForGroup_Core.toc b/Interface/AddOns/LookingForGroup_Core/LookingForGroup_Core.toc index dc761974..23051e25 100755 --- a/Interface/AddOns/LookingForGroup_Core/LookingForGroup_Core.toc +++ b/Interface/AddOns/LookingForGroup_Core/LookingForGroup_Core.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Core -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_Event/LookingForGroup_Event.toc b/Interface/AddOns/LookingForGroup_Event/LookingForGroup_Event.toc index 52fa1178..4e4c7f23 100755 --- a/Interface/AddOns/LookingForGroup_Event/LookingForGroup_Event.toc +++ b/Interface/AddOns/LookingForGroup_Event/LookingForGroup_Event.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Event -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_Hook/LookingForGroup_Hook.toc b/Interface/AddOns/LookingForGroup_Hook/LookingForGroup_Hook.toc index 43d0114c..364b540d 100755 --- a/Interface/AddOns/LookingForGroup_Hook/LookingForGroup_Hook.toc +++ b/Interface/AddOns/LookingForGroup_Hook/LookingForGroup_Hook.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Hook -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_Icon/LookingForGroup_Icon.toc b/Interface/AddOns/LookingForGroup_Icon/LookingForGroup_Icon.toc index 8cf5218c..c35b80fa 100755 --- a/Interface/AddOns/LookingForGroup_Icon/LookingForGroup_Icon.toc +++ b/Interface/AddOns/LookingForGroup_Icon/LookingForGroup_Icon.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Icon -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 ## SavedVariablesPerCharacter: LookingForGroup_IconCharacterDB diff --git a/Interface/AddOns/LookingForGroup_Options/Core.lua b/Interface/AddOns/LookingForGroup_Options/Core.lua index d8a810a5..03ce077b 100755 --- a/Interface/AddOns/LookingForGroup_Options/Core.lua +++ b/Interface/AddOns/LookingForGroup_Options/Core.lua @@ -27,7 +27,6 @@ function LookingForGroup_Options:OnInitialize() start_a_group_voice_chat = "", start_a_group_auto_accept = false, start_a_group_private = false, - find_a_group_role = true, find_a_group_filter = "", find_a_group_encounters = {}, background_music = "sound\\music\\gluescreenmusic\\wow_main_theme.mp3", diff --git a/Interface/AddOns/LookingForGroup_Options/Init.lua b/Interface/AddOns/LookingForGroup_Options/Init.lua index 9e61fa37..3d7e4756 100755 --- a/Interface/AddOns/LookingForGroup_Options/Init.lua +++ b/Interface/AddOns/LookingForGroup_Options/Init.lua @@ -83,14 +83,15 @@ function LookingForGroup_Options.FilterSearchResult(groupid) local profile = LookingForGroup.db.profile local filters = profile.spam_filter_keywords local maxlength = profile.spam_filter_maxlength - if maxlength and ( maxlength < name:len() or maxlength < comment:len() ) then + if maxlength and ( maxlength < name:len() or maxlength < comment:len() or maxlength < voiceChat:len() ) then return true end name = name:gsub(" ",""):lower() comment = comment:gsub(" ",""):lower() + voiceChat = voiceChat:gsub(" ",""):lower() for i=1,#filters do local ele = filters[i] - if string_find(name,ele) or string_find(comment,ele) then + if string_find(name,ele) or string_find(comment,ele) or string_find(voiceChat,ele) then return true end end @@ -99,14 +100,15 @@ function LookingForGroup_Options.FilterSearchResult(groupid) local profile = LookingForGroup.db.profile local filters = profile.spam_filter_keywords local maxlength = profile.spam_filter_maxlength - if maxlength and ( maxlength < name:len() or maxlength < comment:len() ) then + if maxlength and ( maxlength < name:len() or maxlength < comment:len() or maxlength < voiceChat:len() ) then return end name = name:gsub(" ",""):lower() comment = comment:gsub(" ",""):lower() + voiceChat = voiceChat:gsub(" ",""):lower() for i=1,#filters do local ele = filters[i] - if string_find(name,ele) or string_find(comment,ele) then + if string_find(name,ele) or string_find(comment,ele) or string_find(voiceChat,ele) then return end end diff --git a/Interface/AddOns/LookingForGroup_Options/LookingForGroup_Options.toc b/Interface/AddOns/LookingForGroup_Options/LookingForGroup_Options.toc index 4e9c5d24..7ce5b6e5 100755 --- a/Interface/AddOns/LookingForGroup_Options/LookingForGroup_Options.toc +++ b/Interface/AddOns/LookingForGroup_Options/LookingForGroup_Options.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Options -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## SavedVariablesPerCharacter: LookingForGroup_OptionsCharacterDB ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_Options/find/Core.lua b/Interface/AddOns/LookingForGroup_Options/find/Core.lua index ecb95972..08fe2e48 100755 --- a/Interface/AddOns/LookingForGroup_Options/find/Core.lua +++ b/Interface/AddOns/LookingForGroup_Options/find/Core.lua @@ -523,7 +523,11 @@ LookingForGroup_Options:push("find",{ return LookingForGroup_Options.db.profile.find_a_group_role end, set = function(info,val) - LookingForGroup_Options.db.profile.find_a_group_role = val + if val then + LookingForGroup_Options.db.profile.find_a_group_role = true + else + LookingForGroup_Options.db.profile.find_a_group_role = nil + end end }, class = @@ -535,7 +539,11 @@ LookingForGroup_Options:push("find",{ return LookingForGroup_Options.db.profile.find_a_group_class end, set = function(info,val) - LookingForGroup_Options.db.profile.find_a_group_class = val + if val then + LookingForGroup_Options.db.profile.find_a_group_class = true + else + LookingForGroup_Options.db.profile.find_a_group_class = nil + end end }, complete = @@ -547,7 +555,11 @@ LookingForGroup_Options:push("find",{ return LookingForGroup_Options.db.profile.find_a_group_complete end, set = function(info,val) - LookingForGroup_Options.db.profile.find_a_group_complete = val + if val then + LookingForGroup_Options.db.profile.find_a_group_complete = true + else + LookingForGroup_Options.db.profile.find_a_group_complete = nil + end end }, gold = @@ -559,7 +571,11 @@ LookingForGroup_Options:push("find",{ return LookingForGroup_Options.db.profile.find_a_group_gold end, set = function(info,val) - LookingForGroup_Options.db.profile.find_a_group_gold = val + if val then + LookingForGroup_Options.db.profile.find_a_group_gold = true + else + LookingForGroup_Options.db.profile.find_a_group_gold = nil + end end }, cancel = @@ -568,7 +584,7 @@ LookingForGroup_Options:push("find",{ name = CANCEL, type = "execute", func = function() - LookingForGroup_Options:RestoreDBVariable("find_a_group_role") + LookingForGroup_Options.db.profile.find_a_group_role = nil LookingForGroup_Options.db.profile.find_a_group_class = nil LookingForGroup_Options.db.profile.find_a_group_gold = nil LookingForGroup_Options.db.profile.find_a_group_complete = nil @@ -590,7 +606,7 @@ LookingForGroup_Options:push("find",{ type = "execute", func = function() LookingForGroup_Options:RestoreDBVariable("find_a_group_filter") - LookingForGroup_Options:RestoreDBVariable("find_a_group_role") + LookingForGroup_Options.db.profile.find_a_group_role = nil LookingForGroup_Options.db.profile.find_a_group_class = nil LookingForGroup_Options.db.profile.find_a_group_gold = nil LookingForGroup_Options.db.profile.find_a_group_complete = nil diff --git a/Interface/AddOns/LookingForGroup_Options/options/Core.lua b/Interface/AddOns/LookingForGroup_Options/options/Core.lua index 8dd1b181..050bb9b2 100755 --- a/Interface/AddOns/LookingForGroup_Options/options/Core.lua +++ b/Interface/AddOns/LookingForGroup_Options/options/Core.lua @@ -211,6 +211,29 @@ LookingForGroup_Options:push("options",{ get = function() return LookingForGroup_Options.db.profile.addon_meeting_stone end, } } - } + }, + wq_config = + { + name = TRACKER_HEADER_WORLD_QUESTS, + type = "group", + args = + { + leave_party = + { + name = PARTY_LEAVE, + type = "toggle", + get = function(info) + return LookingForGroup.db.profile.wq_leave_party + end, + set = function(info,val) + if val then + LookingForGroup.db.profile.wq_leave_party = true + else + LookingForGroup.db.profile.wq_leave_party = nil + end + end, + } + } + }, } }) diff --git a/Interface/AddOns/LookingForGroup_Options/ui/search_result_checkbox.lua b/Interface/AddOns/LookingForGroup_Options/ui/search_result_checkbox.lua index 3090b8d3..954cbf8d 100755 --- a/Interface/AddOns/LookingForGroup_Options/ui/search_result_checkbox.lua +++ b/Interface/AddOns/LookingForGroup_Options/ui/search_result_checkbox.lua @@ -225,7 +225,7 @@ local function GetSearchEntryMenu(resultID) local tb = {} for i=1,#filters do local ele = filters[i] - if not string_find(name,ele) and not string_find(comment,ele) then + if not string_find(name,ele) and not string_find(comment,ele) and not string_find(voiceChat,ele) then table_insert(tb,ele) end end diff --git a/Interface/AddOns/LookingForGroup_SF/LookingForGroup_SF.toc b/Interface/AddOns/LookingForGroup_SF/LookingForGroup_SF.toc index 4e2eda6c..f0d05e61 100755 --- a/Interface/AddOns/LookingForGroup_SF/LookingForGroup_SF.toc +++ b/Interface/AddOns/LookingForGroup_SF/LookingForGroup_SF.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup Spam Filter -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## LoadOnDemand: 1 diff --git a/Interface/AddOns/LookingForGroup_WQ/Core.lua b/Interface/AddOns/LookingForGroup_WQ/Core.lua index cc2b3896..f2107335 100755 --- a/Interface/AddOns/LookingForGroup_WQ/Core.lua +++ b/Interface/AddOns/LookingForGroup_WQ/Core.lua @@ -125,11 +125,11 @@ function LookingForGroup_WQ:QUEST_ACCEPTED(info,index,wq_id) _, leaderName, _, autoaccept = C_LFGList.GetSearchResultInfo(v) if LookingForGroup.FilterRealm(leaderName) then if autoaccept then - C_LFGList.ApplyToGroup(v, "", tank,healer,dps) + C_LFGList.ApplyToGroup(v, "", tank,healer,true) b = b + 1 else if comment:find("#WQ:"..wq_id.."#") then - C_LFGList.ApplyToGroup(v, "WorldQuestGroupFinderUser-"..wq_id, tank,healer,dps) + C_LFGList.ApplyToGroup(v, "WorldQuestGroupFinderUser-"..wq_id, tank,healer,true) b = b + 1 end end @@ -227,6 +227,10 @@ function LookingForGroup_WQ:QUEST_TURNED_IN(info,id) StaticPopup_Hide("LookingForGroup_WQ_HardwareAPIDialog") return end + if LookingForGroup.db.profile.wq_leave_party then + LeaveParty() + return + end if GetNumGroupMembers() < 2 then LeaveParty() StaticPopup_Hide("LookingForGroup_WQ_HardwareAPIDialog") diff --git a/Interface/AddOns/LookingForGroup_WQ/LookingForGroup_WQ.toc b/Interface/AddOns/LookingForGroup_WQ/LookingForGroup_WQ.toc index b5a49ea2..a21e4f38 100755 --- a/Interface/AddOns/LookingForGroup_WQ/LookingForGroup_WQ.toc +++ b/Interface/AddOns/LookingForGroup_WQ/LookingForGroup_WQ.toc @@ -1,7 +1,7 @@ ## Interface: 70200 ## Author: cqwrteur ## Title: LookingForGroup World Quest -## Version: 271 +## Version: 278 ## Dependencies: LookingForGroup ## SavedVariablesPerCharacter: LookingForGroup_WQCharacterDB ## LoadOnDemand: 1