Merge branch 'release/2.18.2'

Locale/enUS.lua

@@ -188,7 +188,7 @@ L["Discord friendly output."] = true
 L["disenchant_desc"] = "Select to use this reason when awarding an item via the 'Disenchant' button"
 L["Double click to delete this entry."] = true
 L["Done syncing"] = true
-L["Do you want to keep %s for yourself?"] = true
+L["Do you want to keep %s for yourself or trade?"] = true
 L["Dropped by:"] = true
 L["Edit Entry"] = true
 L["Enable Loot History"] = true
@@ -241,6 +241,7 @@ L["Items stored in the loot master's bag for award later cannot be awarded later
 L["Items under consideration:"] = true
 L["item_in_bags_low_trade_time_remaining_reminder"] = "The following bind on pick up items in your inventory are in the award later list and have less than %s trade time remaining. To avoid this reminder, trade the item, or '/rc remove [index]' to remove the item from the list, or '/rc clear' to clear the award later list, or equip the item to make the item untradable."
 L["Total items won:"] = true
+L["Keep"] = true
 L["Latest item(s) won"] = true
 L["Length"] = true
 L["Log"] = true

Modules/History/lootHistory.lua

@@ -23,6 +23,8 @@ local NUM_ROWS = 15;
 local epochDates = {} -- [DateTime] = epoch
 local useClassFilters = false
 
+LootHistory.wowheadBaseUrl = "https://www.wowhead.com/item="
+
 --globals
 local tinsert, tostring, getglobal, pairs, ipairs, tremove, strsplit = tinsert, tostring, getglobal, pairs, ipairs, tremove, strsplit
 
@@ -718,7 +720,7 @@ function LootHistory:GetWowheadLinkFromItemLink(link)
     local color, itemType, itemID, enchantID, gemID1, gemID2, gemID3, gemID4, suffixID, uniqueID, linkLevel, specializationID,
 	 upgradeTypeID, upgradeID, instanceDifficultyID, numBonuses, bonusIDs = addon:DecodeItemLink(link)
 
-    local itemurl = "https://www.wowhead.com/item="..itemID
+    local itemurl = self.wowheadBaseUrl..itemID
 
 	 -- It seems bonus id 1487 (and basically any other id that's -5 below Wowheads first ilvl upgrade doesn't work)
 	 -- Neither does Warforged items it seems
@@ -1542,16 +1544,16 @@ do
 				tinsert(export, tostring(player))
 				tinsert(export, tostring(self:GetLocalizedDate(d.date)))
 				tinsert(export, tostring(d.time))
-				tinsert(export, "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(d.lootWon).."\",\""..tostring(d.lootWon).."\")")
+				tinsert(export, "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(d.lootWon).."\";\""..tostring(d.lootWon).."\")")
 				tinsert(export, addon:GetItemIDFromLink(d.lootWon))
 				tinsert(export, addon:GetItemStringFromLink(d.lootWon))
 				tinsert(export, tostring(d.response))
 				tinsert(export, tostring(d.votes))
 				tinsert(export, tostring(d.class))
 				tinsert(export, tostring(d.instance))
 				tinsert(export, tostring(d.boss))
-				tinsert(export, d.itemReplaced1 and "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(tostring(d.itemReplaced1)).."\",\""..tostring(d.itemReplaced1).."\")" or "")
-				tinsert(export, d.itemReplaced2 and "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(tostring(d.itemReplaced2)).."\",\""..tostring(d.itemReplaced2).."\")" or "")
+				tinsert(export, d.itemReplaced1 and "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(tostring(d.itemReplaced1)).."\";\""..tostring(d.itemReplaced1).."\")" or "")
+				tinsert(export, d.itemReplaced2 and "=HYPERLINK(\""..self:GetWowheadLinkFromItemLink(tostring(d.itemReplaced2)).."\";\""..tostring(d.itemReplaced2).."\")" or "")
 				tinsert(export, tostring(d.responseID))
 				tinsert(export, tostring(d.isAwardReason or false))
 				tinsert(export, rollType)

Modules/lootFrame.lua

@@ -164,7 +164,7 @@ end
 function LootFrame:OnRoll(entry, button)
 	local item = entry.item
 	if not item.isRoll then
-		if addon.mldb and addon.mldb.requireNotes then
+		if addon.mldb and addon.mldb.requireNotes and button ~= "PASS" then
 			if not item.note or #item.note == 0 then
 				addon:Print(format(L["lootFrame_error_note_required"], addon.Ambiguate(addon.masterLooter)))
 				return

Modules/votingFrame.lua

@@ -447,6 +447,7 @@ function RCVotingFrame:Setup(table)
 end
 
 function RCVotingFrame:HandleVote(session, name, vote, voter)
+	if not (lootTable[session] and lootTable[session].candidates[name]) then return end
 	voter = addon:UnitName(voter)
 	-- Do the vote
 	lootTable[session].candidates[name].votes = lootTable[session].candidates[name].votes + vote

RCLootCouncil.toc

@@ -1,8 +1,8 @@
 ## Author: Potdisc
 ## Interface: 80300
-## Notes: Interface for running a Loot Council v2.18.1
+## Notes: Interface for running a Loot Council v2.18.2
 ## Title: RCLootCouncil
-## Version: 2.18.1
+## Version: 2.18.2
 ## SavedVariables: RCLootCouncilDB, RCLootCouncilLootDB
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, lib-st, LibWindow-1.1, LibDialog-1.0
 

Utils/popups.lua

@@ -151,7 +151,7 @@ LibDialog:Register("RCLOOTCOUNCIL_TRADE_ADD_ITEM", {
 LibDialog:Register("RCLOOTCOUNCIL_KEEP_ITEM", {
    text = "something_went_wrong",
    on_show = function(self, link)
-      self.text:SetText(format(L["Do you want to keep %s for yourself?"], link))
+      self.text:SetText(format(L["Do you want to keep %s for yourself or trade?"], link))
       local tex = select(5, GetItemInfoInstant(link))
       self.icon:SetTexture(tex)
       local icon = addon.UI:New("Icon", self, tex)
@@ -166,13 +166,13 @@ LibDialog:Register("RCLOOTCOUNCIL_KEEP_ITEM", {
       self.icon2:Hide()
    end,
    buttons = {
-      {  text = _G.YES,
+      {  text = L["Keep"],
          on_click = function(self, link)
             addon:SendCommand("group", "rejected_trade", link)
             self.icon2:Hide()
          end,
       },
-      {  text = _G.NO,
+      {  text = _G.TRADE,
          on_click = function(self, link)
             addon:SendCommand("group", "tradable", link)
             self.icon2:Hide()

changelog.md

@@ -1,3 +1,14 @@
+# v2.18.2
+## Changes
+### Allow Keeping
+The pop-up for keeping items now shows "Keep"/"Trade" instead of yes/no. (#183).
+
+## Bugfixes
+* *Passes no longer require a note with 'Require Notes' enabled. (#184)*
+* *Fixes issue with receiving votes outside an instance (Curse#413).*
+* *Fixed issues with TSV Export hyperlinks.*
+
+
 # v2.18.0
 ## Additions
 ### Auto Award BoE's