From 3b5283cbd4808107fbc52d00c0e63de2d831397b Mon Sep 17 00:00:00 2001
From: macillespretorious-lgtm <macilles.pretorious@gmail.com>
Date: Thu, 6 Aug 2026 23:34:12 +0100
Subject: [PATCH 1/3] Fix summon/target buttons silently doing nothing

Two independent bugs, both confirmed via live testing in an 11-person
raid on the current Classic Era client:

1. RaidSummon:getRaidMembers() assumed GetRaidRosterInfo(i)'s loop
   index equals the "raidN" unit token. These are different, only
   coincidentally-aligned numbering systems (roster list position vs
   actual subgroup slot), so the wrong unit could get targeted
   depending on raid composition. Fixed by resolving the real unit
   token via UnitName("raid"..u) matching instead.

2. RaidSummon_NameListButton's SecureActionButtonTemplate silently
   fails to dispatch type1/type2 macro actions on the current client
   -- PostClick fires but the underlying secure click action never
   executes, with no error. Confirmed via an isolated A/B test: two
   otherwise-identical buttons differing only in template: the
   SecureActionButtonTemplate one did nothing, an otherwise identical
   SecureUnitButtonTemplate one worked correctly. Fixed by switching
   the button's inherited template.

Also included: GetAddOnMetadata moved to C_AddOns on the current
client with no compatibility shim; added a fallback local.

As a side effect of fixing bug 2, attribute staging was moved from
PreClick (re-staged every click) into UpdateList (staged once when
the list is built). This also means buttons stay clickable mid-combat
using whatever was staged before the pull, since SetAttribute is no
longer called during PreClick.
---
 RaidSummon/RaidSummon.lua | 78 +++++++++++++++++++++++++--------------
 RaidSummon/RaidSummon.xml |  6 ++-
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/RaidSummon/RaidSummon.lua b/RaidSummon/RaidSummon.lua
index 810d21c..fc857cd 100644
--- a/RaidSummon/RaidSummon.lua
+++ b/RaidSummon/RaidSummon.lua
@@ -1,5 +1,8 @@
 RaidSummon = LibStub("AceAddon-3.0"):NewAddon("RaidSummon", "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("RaidSummon", true)
+-- Classic Era's latest patch moved GetAddOnMetadata to C_AddOns; fall
+-- back to the old global for clients that haven't made the switch.
+local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
 
 --set options
 local options = {
@@ -449,27 +452,13 @@ function RaidSummon:NameListButton_PreClick(source, button)
 
 	RaidSummon:getRaidMembers()
 
-	if RaidSummonRaidMembersDB then
-		for i, v in ipairs (RaidSummonRaidMembersDB) do
-			if v.rName == name then
-				raidIndex = "raid"..v.rIndex
-			end
-		end
-
-		if raidIndex then
-			--set target when not in combat (securetemplate)
-			if not InCombatLockdown() then
-				if RaidSummonRaidMembersDB then
-					source:SetAttribute("type1", "target")
-					source:SetAttribute("unit", raidIndex)
-				end
-				source:SetAttribute("type2", "spell")
-				source:SetAttribute("spell", "698") --698 - Ritual of Summoning
-			else
-				print(L["Lockdown"])
-			end
-		end
-	end
+	-- Secure attributes (type1/macrotext1/type2/macrotext2) are staged
+	-- once in UpdateList() when the button's name/text is set, not here.
+	-- Re-staging in PreClick on every click did not reliably take effect
+	-- in time for the same click to use. Attributes staged before combat
+	-- remain valid through combat, so clicking still works mid-fight
+	-- even though UpdateList() itself can't restage anything new while
+	-- InCombatLockdown() is true.
 
 	if buttonName == "RightButton" and targetname ~= nil and not InCombatLockdown() then
 	
@@ -567,14 +556,33 @@ function RaidSummon:UpdateList()
 			end
 
 			if not InCombatLockdown() then
-				_G["RaidSummon_NameList"..i]:Show()
+				-- Stage secure attributes here, once, when the list is
+				-- built, rather than inside a PreClick handler on every
+				-- click. Re-staging in PreClick (the old approach) did not
+				-- reliably take effect in time for the same click to use.
+				local btn = _G["RaidSummon_NameList"..i]
+				local rName = RaidSummonBrowseDB[i].rName
+				local ritualSpellName = GetSpellInfo(698) --698 - Ritual of Summoning
+				btn:SetAttribute("unit", nil)
+				btn:SetAttribute("type1", "macro")
+				btn:SetAttribute("macrotext1", "/target "..rName)
+				if ritualSpellName then
+					btn:SetAttribute("type2", "macro")
+					btn:SetAttribute("macrotext2", "/target "..rName.."\n/cast "..ritualSpellName)
+				end
+				btn:Show()
 			else
 				RaidSummon:UpdateListCombatCheck()
 			end
 		else
 			if not InCombatLockdown() then
 				_G["RaidSummon_NameList"..i.."TextName"]:SetText("")
-				_G["RaidSummon_NameList"..i]:Hide()
+				local btn = _G["RaidSummon_NameList"..i]
+				btn:SetAttribute("type1", nil)
+				btn:SetAttribute("macrotext1", nil)
+				btn:SetAttribute("type2", nil)
+				btn:SetAttribute("macrotext2", nil)
+				btn:Hide()
 			else
 				RaidSummon:UpdateListCombatCheck()
 			end
@@ -605,15 +613,29 @@ function RaidSummon:getRaidMembers()
 		if (members > 0) then
 		RaidSummonRaidMembersDB = {}
 
+			-- GetRaidRosterInfo(i)'s index is the roster LIST position,
+			-- which is not guaranteed to match the "raidN" unit token
+			-- (actual subgroup slot). They only coincidentally line up
+			-- for some raid compositions. Resolve rIndex from the actual
+			-- unit token instead of trusting the roster-list position.
 			for i = 1, members do
 				local rName, rRank, rSubgroup, rLevel, rClass, rfileName = GetRaidRosterInfo(i)
 
 				if rName and rClass and rfileName then
-					RaidSummonRaidMembersDB[i] = {}
-					RaidSummonRaidMembersDB[i].rIndex = i
-					RaidSummonRaidMembersDB[i].rName = rName
-					RaidSummonRaidMembersDB[i].rClass = rClass
-					RaidSummonRaidMembersDB[i].rfileName = rfileName
+					local unitToken
+					for u = 1, MAX_RAID_MEMBERS do
+						if UnitName("raid"..u) == rName then
+							unitToken = u
+							break
+						end
+					end
+					if unitToken then
+						RaidSummonRaidMembersDB[i] = {}
+						RaidSummonRaidMembersDB[i].rIndex = unitToken
+						RaidSummonRaidMembersDB[i].rName = rName
+						RaidSummonRaidMembersDB[i].rClass = rClass
+						RaidSummonRaidMembersDB[i].rfileName = rfileName
+					end
 				end
 			end
 		end
diff --git a/RaidSummon/RaidSummon.xml b/RaidSummon/RaidSummon.xml
index 20158c4..e8bb7ad 100644
--- a/RaidSummon/RaidSummon.xml
+++ b/RaidSummon/RaidSummon.xml
@@ -1,5 +1,9 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI_shared.xsd">
-	<Button name="RaidSummon_NameListButton" inherits="SecureActionButtonTemplate" virtual="true">
+	<!-- Was SecureActionButtonTemplate. Isolated testing showed that
+	     template's OnClick dispatch silently fails to execute type1/
+	     type2 macro actions on the current client, while an otherwise
+	     identical SecureUnitButtonTemplate button works correctly. -->
+	<Button name="RaidSummon_NameListButton" inherits="SecureUnitButtonTemplate" virtual="true">
 		<Size>
 			<AbsDimension x="100" y="16"/>
 		</Size>

From b71ff6c0fd8bebc106242df00ec48d67c2e169e3 Mon Sep 17 00:00:00 2001
From: macillespretorious-lgtm <macilles.pretorious@gmail.com>
Date: Fri, 7 Aug 2026 01:37:20 +0100
Subject: [PATCH 2/3] Add auto-remove from queue when player is back in range

Periodically checks queued players and drops anyone already within
interact range, so Warlocks don't summon someone who's already made
it to the group (walked, got a portal, got summoned by someone else,
etc).

- New "Auto-Remove In Range" toggle in options (default on)
- Checks every 2s via CheckInteractDistance(name, 4)
- Warlock-only: range relative to a non-Warlock's position doesn't
  tell you anything about whether the Warlock still needs to summon
  that player
- Removal broadcasts over the existing COMM_PREFIX_REMOVE channel (the
  same one used after a successful summon), so it stays in sync across
  every raid member's copy of the queue, not just the checking client
- Prints a distinct chat message so it's not confused with a manual or
  post-summon removal

Builds on the click-fix branch since the summon flow needs to actually
work to test this against.
---
 RaidSummon/Locales/RaidSummon-enUS.lua |  7 +++
 RaidSummon/RaidSummon.lua              | 67 +++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/RaidSummon/Locales/RaidSummon-enUS.lua b/RaidSummon/Locales/RaidSummon-enUS.lua
index 1a71150..5272b72 100644
--- a/RaidSummon/Locales/RaidSummon-enUS.lua
+++ b/RaidSummon/Locales/RaidSummon-enUS.lua
@@ -20,6 +20,9 @@ end
 L["MemberAdded"] = function(X,Y)
 	return '|cff9482c9RaidSummon:|r Adding player ' .. X .. ' to the summoning frame as requested by ' .. Y
 end
+L["MemberInRange"] = function(X)
+	return '|cff9482c9RaidSummon:|r Removing player ' .. X .. ' from the summoning frame, already in range'
+end
 L["AddAllMessage"] = "|cff9482c9RaidSummon:|r Adding all players"
 
 --Options
@@ -33,6 +36,8 @@ L["OptionFlashwindowName"] = "Flash Window"
 L["OptionFlashwindowDesc"] = "Flashes the Windows when someone requests a summon."
 L["OptionSummoningStoneName"] = "Summoning Stone"
 L["OptionSummoningStoneDesc"] = "Enable announcement when interacting with a Summoning Stone."
+L["OptionAutoRemoveInRangeName"] = "Auto-Remove In Range"
+L["OptionAutoRemoveInRangeDesc"] = "Automatically remove a player from the summoning frame once they're already within interact range of you (Warlock only)."
 L["OptionHelpName"] = "Help"
 L["OptionHelpDesc"] = "Shows a list of supported commands and options."
 L["OptionConfigName"] = "Config"
@@ -80,6 +85,8 @@ L["OptionFlashwindowEnabled"] = "|cff9482c9RaidSummon:|r Option flash window |cf
 L["OptionFlashwindowDisabled"] = "|cff9482c9RaidSummon:|r Option flash window |cffff0000disabled|r"
 L["OptionSummoningStoneEnabled"] = "|cff9482c9RaidSummon:|r Option Summoning Stone |cff00ff00enabled|r"
 L["OptionSummoningStoneDisabled"] = "|cff9482c9RaidSummon:|r Option Summoning Stone |cffff0000disabled|r"
+L["OptionAutoRemoveInRangeEnabled"] = "|cff9482c9RaidSummon:|r Option auto-remove in range |cff00ff00enabled|r"
+L["OptionAutoRemoveInRangeDisabled"] = "|cff9482c9RaidSummon:|r Option auto-remove in range |cffff0000disabled|r"
 L["OptionHelpPrint"] = [[
 |cff9482c9RaidSummon usage:|r
 /rs or /raidsummon { clear | config | help | list | add | addall | remove | toggle | whisper | zone | kwlist | kwadd | kwremove }
diff --git a/RaidSummon/RaidSummon.lua b/RaidSummon/RaidSummon.lua
index fc857cd..0bf5e99 100644
--- a/RaidSummon/RaidSummon.lua
+++ b/RaidSummon/RaidSummon.lua
@@ -56,6 +56,14 @@ local options = {
 					set = "SetOptionSummoningStone",
 					order = 15,
 				},
+				autoremoveinrange = {
+					type = "toggle",
+					name = L["OptionAutoRemoveInRangeName"],
+					desc = L["OptionAutoRemoveInRangeDesc"],
+					get = "GetOptionAutoRemoveInRange",
+					set = "SetOptionAutoRemoveInRange",
+					order = 16,
+				},
 			}
 		},
 		commands = {
@@ -190,10 +198,16 @@ local defaults = {
 		zone = true,
 		flashwindow = true,
 		keywordsinit = false,
-		summoningstone = true
+		summoningstone = true,
+		autoremoveinrange = true
 	}
 }
 
+-- CheckInteractDistance's follow-range index (confirmed working on the
+-- current client). Interval in seconds between range checks.
+local AUTO_REMOVE_DISTANCE_INDEX = 4
+local AUTO_REMOVE_CHECK_INTERVAL = 2
+
 function RaidSummon:OnEnable()
 	self:Print(L["AddonEnabled"](GetAddOnMetadata("RaidSummon", "Version"), GetAddOnMetadata("RaidSummon", "Author")))
 	self:RegisterEvent("GROUP_JOINED", "GroupEvent")
@@ -207,6 +221,15 @@ function RaidSummon:OnEnable()
 	self:RegisterEvent("CHAT_MSG_WHISPER", "msgParser")
 	self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
 
+	-- Auto-remove queued players once they're back in range. Only
+	-- meaningful from the summoner's own position, so Warlock-only (a
+	-- non-Warlock's proximity to a queued player says nothing about
+	-- whether the Warlock still needs to summon them).
+	local _, playerClassFilename = UnitClass("player")
+	if playerClassFilename == "WARLOCK" then
+		self.autoRemoveInRangeTimer = self:ScheduleRepeatingTimer("CheckQueueRange", AUTO_REMOVE_CHECK_INTERVAL)
+	end
+
 	--Blizzard Menu
 	Menu.ModifyMenu("MENU_UNIT_RAID_PLAYER", function(ownerRegion, rootDescription, contextData)
 		-- Append a new section to the end of the menu.
@@ -230,6 +253,10 @@ end
 
 function RaidSummon:OnDisable()
 	self:Print(L["AddonDisabled"])
+	if self.autoRemoveInRangeTimer then
+		self:CancelTimer(self.autoRemoveInRangeTimer)
+		self.autoRemoveInRangeTimer = nil
+	end
 	RaidSummonSyncDB = {}
 end
 
@@ -343,6 +370,31 @@ function RaidSummon:UNIT_SPELLCAST_CHANNEL_START(eventName,...)
 	end
 end
 
+--Periodically drops queued players who are already back in interact
+--range. Only runs for Warlocks (see OnEnable) since range only means
+--anything relative to the summoner's own position.
+function RaidSummon:CheckQueueRange()
+	if not self.db.profile.autoremoveinrange then
+		return
+	end
+	if not IsInRaid() or not RaidSummonSyncDB or not RaidSummonSyncDB[1] then
+		return
+	end
+
+	--copy first: table.remove while iterating would skip entries
+	local inRange = {}
+	for i, v in ipairs(RaidSummonSyncDB) do
+		if UnitExists(v) and CheckInteractDistance(v, AUTO_REMOVE_DISTANCE_INDEX) then
+			table.insert(inRange, v)
+		end
+	end
+
+	for _, v in ipairs(inRange) do
+		print(L["MemberInRange"](v))
+		RaidSummon:SendCommMessage(COMM_PREFIX_REMOVE, v, "RAID")
+	end
+end
+
 --Ace3 Comm
 function RaidSummon:OnCommReceived(prefix, message, distribution, sender)
 	if (prefix) then
@@ -763,6 +815,10 @@ function RaidSummon:GetOptionSummoningStone(info)
 	return self.db.profile.summoningstone
 end
 
+function RaidSummon:GetOptionAutoRemoveInRange(info)
+	return self.db.profile.autoremoveinrange
+end
+
 function RaidSummon:SetOptionWhisper(info, value)
 	self.db.profile.whisper = value
 	if value == true then
@@ -808,6 +864,15 @@ function RaidSummon:SetOptionSummoningStone(info, value)
 	end
 end
 
+function RaidSummon:SetOptionAutoRemoveInRange(info, value)
+	self.db.profile.autoremoveinrange = value
+	if value == true then
+		print(L["OptionAutoRemoveInRangeEnabled"])
+	else
+		print(L["OptionAutoRemoveInRangeDisabled"])
+	end
+end
+
 function RaidSummon:ExecuteHelp()
 	print(L["OptionHelpPrint"])
 end

From 77889a67b4caf89229681a9fbf082b4c2e3e4045 Mon Sep 17 00:00:00 2001
From: macillespretorious-lgtm <macilles.pretorious@gmail.com>
Date: Tue, 11 Aug 2026 18:38:49 +0100
Subject: [PATCH 3/3] Fix silent truncation of raid roster when a name match
 fails

getRaidMembers() indexed RaidSummonRaidMembersDB by the roster-list
position, but only wrote to that index when the raidN unit-token
cross-check succeeded. If it failed for even one member (observed
with an accented name where GetRaidRosterInfo's name didn't match
UnitName's), that index was left nil, and every subsequent ipairs()
loop over the table silently stopped there -- meaning nobody added
after that member in the roster could ever be queued, whether via
the "123" chat keyword or the right-click Add Player option.

Append entries instead of indexing by roster position, and fall
back to the roster index when the unit-token cross-check fails
rather than dropping the member.
---
 RaidSummon/RaidSummon.lua | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/RaidSummon/RaidSummon.lua b/RaidSummon/RaidSummon.lua
index fc857cd..9dbb3b0 100644
--- a/RaidSummon/RaidSummon.lua
+++ b/RaidSummon/RaidSummon.lua
@@ -622,6 +622,14 @@ function RaidSummon:getRaidMembers()
 				local rName, rRank, rSubgroup, rLevel, rClass, rfileName = GetRaidRosterInfo(i)
 
 				if rName and rClass and rfileName then
+					-- Prefer the verified "raidN" unit token, but fall
+					-- back to the roster-list position if it can't be
+					-- cross-matched (e.g. a name mismatch between
+					-- GetRaidRosterInfo and UnitName for names with
+					-- accented/special characters) -- dropping the
+					-- member entirely instead left a hole in this
+					-- array, which silently truncated every ipairs()
+					-- loop over it after the first unmatched member.
 					local unitToken
 					for u = 1, MAX_RAID_MEMBERS do
 						if UnitName("raid"..u) == rName then
@@ -629,13 +637,13 @@ function RaidSummon:getRaidMembers()
 							break
 						end
 					end
-					if unitToken then
-						RaidSummonRaidMembersDB[i] = {}
-						RaidSummonRaidMembersDB[i].rIndex = unitToken
-						RaidSummonRaidMembersDB[i].rName = rName
-						RaidSummonRaidMembersDB[i].rClass = rClass
-						RaidSummonRaidMembersDB[i].rfileName = rfileName
-					end
+
+					table.insert(RaidSummonRaidMembersDB, {
+						rIndex = unitToken or i,
+						rName = rName,
+						rClass = rClass,
+						rfileName = rfileName,
+					})
 				end
 			end
 		end