merge conflict

Author: TannerShmoog

AutoResponse.lua

@@ -34,7 +34,6 @@ local function RespondToInvite(_, author)
     if addon.db.char.autoRejectInvites == true and listedLFG then
         for i = 1, STATICPOPUP_NUMDIALOGS do
             if _G["StaticPopup" .. i].which == "PARTY_INVITE" then
-                print(1)
                 local player = _G["StaticPopup" .. i].text.text_arg1:gsub(" invites you.+", "")
                 --dont reject recently spoken to players or friends
                 if addon.recentPlayers[player] == nil and addon.friendList[player] == nil then

Core.lua

@@ -562,7 +562,13 @@ local function DrawListings(self)
             button.btn:SetScript("OnClick", function()
                 addon.SendPlayerInfo(listing.author, nil, nil, listing.fullName, listing.resultID)
                 listing.messageSent = true
+                listing.senderName = myname
             end)
+            --clear messages sent on switching characters
+            if listing.messageSent and myname ~= listing.senderName then
+                listing.messageSent = nil
+                listing.senderName = nil
+            end
             --Change
             if listing.messageSent then
                 button.btn:SetText("|TInterface\\AddOns\\" ..
@@ -1949,6 +1955,7 @@ function addon:OnInitialize()
             charSheetGear = true,
             announceInstanceReset = true,
             showedv161InfoPopup = false,
+            lastShowedInfoPopup = 1.63,
         }
     }
 
@@ -2833,8 +2840,8 @@ function addon.SetupConfig()
     addon.db.global.lastServer = currentServer
 
 
-    if not addon.db.global.showedv161InfoPopup then
-        addon.db.global.showedv161InfoPopup = true
+    if addon.db.global.lastShowedInfoPopup < addon.version then
+        addon.db.global.lastShowedInfoPopup = addon.version
         local PopupFrame = nil
         local POPUP_WINDOW_WIDTH = 400
         local POPUP_WINDOW_HEIGHT = 450
@@ -2871,12 +2878,12 @@ function addon.SetupConfig()
         local PopupGroupieTitle = PopupFrame:CreateFontString("FontString", "OVERLAY", "GameFontNormalMed1")
         PopupGroupieTitle:SetPoint("TOP", PopupFrame, "TOP", 0, -36)
         PopupGroupieTitle:SetWidth(POPUP_WINDOW_WIDTH - 32)
-        PopupGroupieTitle:SetText("Groupie 1.61")
+        PopupGroupieTitle:SetText("Groupie 1.64")
         --Info Text
         local PopupMsg = PopupFrame:CreateFontString("FontString", "OVERLAY", "GameFontHighlight")
         PopupMsg:SetPoint("TOPLEFT", PopupFrame, "TOPLEFT", 16, -64)
         PopupMsg:SetWidth(POPUP_WINDOW_WIDTH - 32)
-        PopupMsg:SetText("LFG Auto-Response has been Disabled by default on Start-up; to Enable it just Right click the Groupie Mini-map Icon.\n\nFixed a few other bugs.\n---\nGroupie 1.60\n\nHola Amigo, we've got some changes for you.\n\n1) LFG Auto-Response is a new feature that responds to your Friends and Guildies when they create 5-man groups. It's enabled by default. To turn it off, or change what sort of groups it responds to, check out the Options Interface. You can also toggle LFG Auto Response by Right Clicking on the Groupie Mini-map Icon.\n\n2) We've re-worked the \"challenge\" messages when you're being invited to a group, or someone requests to join your group. By default, we've disabled these messages when someone invites you, and kept on the \"What role are you?...\" messages when someone requests to join your group. These messages don't fire at all when someone messages you before inviting or requesting to join, and you can tweak the behavior in the Options Interface.\n\nCheers!")
+        PopupMsg:SetText("1.64\n\nHey Everyone,\n\nGroupie is switching to a new \"Charm Validation\" technique and getting rid of the ugly hashes -- like \"[#Ag4f]\" at the end of messages.\n\nInstead we're using 3 target markers. The idea came from user Haste on our Discord.\n\nYou may see some \"Fake News\" responses from people who haven't updated yet. Hopefully it won't take too long to get everyone updated.\n\nCheers!")
         PopupMsg:SetJustifyH("LEFT")
         --Edit Box for Discord Link
         local PopupEditBox = CreateFrame("EditBox", "GroupieEditBoxPopup", PopupFrame, "InputBoxTemplate")
@@ -3072,29 +3079,30 @@ function addon.UpdateCharacterSheet(ignoreILVL, ignoreGS)
     --1st Line : Show Talents
     --2nd Line : Show Average Item Level
     --3rd Line : Show Gear Score
-    if addon.db.global.charSheetGear then
-        --Calculate talents
-        local spec1, spec2, spec3 = CI:GetTalentPoints("player")
-        local talentStr = format("%d / %d / %d", spec1, spec2, spec3)
-        --Calculate Item level
-        local ilvl = addon.MyILVL()
-        if ilvl then
-            if ilvl > 0 then
-                addon.playerILVL = ilvl
-            end
-        end
-        --Calculate gearscore
-        LGS:PLAYER_EQUIPMENT_CHANGED() --Workaround for PEW event in library being too early
-        CI:DoInspect("player")
-        local guid, gearScore = LGS:GetScore("player")
-        if gearScore and gearScore.GearScore and gearScore.GearScore > 0 then
-            addon.playerGearScore = gearScore.GearScore
-        end
-        local colorStr = ""
-        if gearScore.Color then
-            colorStr = "|c" .. gearScore.Color:GenerateHexColor()
+
+    --Calculate talents
+    local spec1, spec2, spec3 = CI:GetTalentPoints("player")
+    local talentStr = format("%d / %d / %d", spec1, spec2, spec3)
+    --Calculate Item level
+    local ilvl = addon.MyILVL()
+    if ilvl then
+        if ilvl > 0 then
+            addon.playerILVL = ilvl
         end
-        --Display on character sheet
+    end
+    --Calculate gearscore
+    LGS:PLAYER_EQUIPMENT_CHANGED() --Workaround for PEW event in library being too early
+    CI:DoInspect("player")
+    local guid, gearScore = LGS:GetScore("player")
+    if gearScore and gearScore.GearScore and gearScore.GearScore > 0 then
+        addon.playerGearScore = gearScore.GearScore
+    end
+    local colorStr = ""
+    if gearScore.Color then
+        colorStr = "|c" .. gearScore.Color:GenerateHexColor()
+    end
+    --Display on character sheet
+    if addon.db.global.charSheetGear then
         CharSheetSummaryFrame:SetText(format("%s\nItem-level : %d\nGearScore : %s%d", talentStr, ilvl,
             colorStr, gearScore.GearScore))
     end
@@ -3173,6 +3181,11 @@ function addon:OnEnable()
         --Turn LFG mode off on group join
         addon.icon:ChangeTexture("Interface\\AddOns\\" .. addonName .. "\\Images\\icon64.tga", "GroupieLDB")
         addon.LFGMode = false
+
+        for author, listing in pairs(addon.db.global.listingTable) do
+            listing.messageSent = nil
+            listing.senderName = nil
+        end
     end)
     --Send version check to players joining group/raid
     addon:RegisterEvent("CHAT_MSG_SYSTEM", function(...)

Globals.lua

@@ -814,7 +814,7 @@ addon.groupieUnflippedDungeonPatterns = {
     ["Halls of Reflection"]   = "hor reflection",
 
     --["Naxxramas"]            = "",
-    ["Obsidian Sanctum"]  = "os obsidian obssanc obsanc obsidiansanctum",
+    ["Obsidian Sanctum"]  = "os obsidian obssanc obsanc obsidiansanctum os0d os1d os2d os3d",
     ["Vault of Archavon"] = "voa archavon vault",
     ["Eye of Eternity"]   = "eoe eye maly malygos",
     --["Onyxia's Lair"]        = "",

Groupie.toc

@@ -1,7 +1,7 @@
 ## Interface: 30400
 ## Title: Groupie
 ## Notes: A better LFG tool for Classic WoW.
-## Version: 1.63
+## Version: 1.64
 ## Author: Gogo, LemonDrake, Kynura, Raegen
 ## SavedVariables: GroupieDB
 ## X-Curse-Project-ID: 661450

Helpers.lua

@@ -722,14 +722,18 @@ function addon.MyILVL()
 
             if tempItemLink then
                 local name, _, _, iLevel, _, _, _, _, itemType = GetItemInfo(tempItemLink)
-                if slotNum == 16 and itemType == "INVTYPE_2HWEAPON" then
-                    --If the weapon is 2 handed, and the offhand slot is empty, we sum the weapon's itemlevel twice
-                    if GetInventoryItemLink("player", 17) == nil then
-                        iLevelSum = iLevelSum + iLevel
+                if iLevel then
+                    if slotNum == 16 and itemType == "INVTYPE_2HWEAPON" then
+                        --If the weapon is 2 handed, and the offhand slot is empty, we sum the weapon's itemlevel twice
+                        if GetInventoryItemLink("player", 17) == nil then
+                            iLevelSum = iLevelSum + iLevel
+                        end
                     end
-                end
 
-                iLevelSum = iLevelSum + iLevel
+                    iLevelSum = iLevelSum + iLevel
+                else
+                    return 0
+                end
             end
         end
     end

Listener.lua

@@ -605,6 +605,10 @@ local function WhisperListener(_, msg, longAuthor, ...)
                 end
             end
         end
+        if msg == WARNING_MESSAGE then
+            SendChatMessage("Actually... you're still on an old version of Groupie that doesn't recognize the new \"Charm Validation\" method. Please update! (Sent by Groupie)."
+                , "WHISPER", "COMMON", longAuthor)
+        end
     end
 end
 

RightClick.lua

@@ -84,13 +84,17 @@ function addon.SendPlayerInfo(targetName, dropdownMenu, which, fullName, resultI
 		end
 		if addon.playerILVL ~= nil and addon.playerILVL > 0 then
 			lvlStr = "Item-level " .. tostring(addon.playerILVL)
+		else
+			lvlStr = "Level " .. tostring(mylevel)
 		end
 	elseif addon.db.char.LFGMsgGearType == 3 then
 		if addon.playerGearScore == nil or addon.playerGearScore < 1 then
 			addon.UpdateCharacterSheet()
 		end
 		if addon.playerGearScore ~= nil and addon.playerGearScore > 0 then
 			lvlStr = "GearScore " .. tostring(addon.playerGearScore)
+		else
+			lvlStr = "Level " .. tostring(mylevel)
 		end
 	end
 
@@ -116,13 +120,13 @@ function addon.SendPlayerInfo(targetName, dropdownMenu, which, fullName, resultI
 	------------
 	--Old Hash--
 	------------
-	local msgHash = addon.StringHash(myname .. groupieMsg)
-	groupieMsg = format("%s [#%s]", groupieMsg, msgHash)
+	--local msgHash = addon.StringHash(myname .. groupieMsg)
+	--groupieMsg = format("%s [#%s]", groupieMsg, msgHash)
 	------------
 	--New Hash--
 	------------
-	--local msgHash = addon.RTHash(myname .. groupieMsg)
-	--groupieMsg = format("%s %s", groupieMsg, msgHash)
+	local msgHash = addon.RTHash(myname .. groupieMsg)
+	groupieMsg = format("%s %s", groupieMsg, msgHash)
 
 	--Sending Current Spec Info
 	if which == "BN_FRIEND" then
@@ -149,13 +153,13 @@ function addon.SendWCLInfo(targetName, dropdownMenu, which)
 	------------
 	--Old Hash--
 	------------
-	local msgHash = addon.StringHash(myname .. groupieMsg)
-	groupieMsg = format("%s [#%s]", groupieMsg, msgHash)
+	--local msgHash = addon.StringHash(myname .. groupieMsg)
+	--groupieMsg = format("%s [#%s]", groupieMsg, msgHash)
 	------------
 	--New Hash--
 	------------
-	--local msgHash = addon.RTHash(myname .. groupieMsg)
-	--groupieMsg = format("%s %s", groupieMsg, msgHash)
+	local msgHash = addon.RTHash(myname .. groupieMsg)
+	groupieMsg = format("%s %s", groupieMsg, msgHash)
 
 
 	if which == "BN_FRIEND" then