From 7d22e2f73061ee1d88cf9f5edccc259a2fd9a8c0 Mon Sep 17 00:00:00 2001
From: Daniel Yates <me@meorawr.io>
Date: Tue, 7 May 2024 11:38:41 +0100
Subject: [PATCH] Route all messages through ChatThrottleLib (#50)

* Route all messages through ChatThrottleLib

This removes all internal management of internal transmission queues,
leaving Chomp as a wrapper that really just provides "smart" routing with
the worst implementation of message serialization known to mankind.

The upstream CTL library has at this point merged in all the support
required for sending logged messages. Battle.net message support is
still pending but queued up.

One thing that we still provide for now is an increase to CTL's ancient,
outdated, and totally crappy default transmission rates. Hopefully we
can just get newer happy values upstreamed at some point, but that might
be a bit of an ask in the face of all the other major changes made to
appease Blizzard's new per-prefix throttles.
---
 .luacheckrc   |  39 ++----
 CTLCompat.lua | 105 ----------------
 Chomp.xml     |   1 -
 Internal.lua  | 236 ++----------------------------------
 Public.lua    | 322 ++++++--------------------------------------------
 5 files changed, 61 insertions(+), 642 deletions(-)
 delete mode 100644 CTLCompat.lua

diff --git a/.luacheckrc b/.luacheckrc
index babd499..d0aa59c 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -15,7 +15,9 @@ std = "lua51"
 globals = {
 	"__chomp_internal",
 	"AddOn_Chomp",
-	"ChatThrottleLib",
+	"ChatThrottleLib.MSG_OVERHEAD",
+	"ChatThrottleLib.BURST",
+	"ChatThrottleLib.MAX_CPS",
 }
 
 read_globals = {
@@ -26,53 +28,39 @@ read_globals = {
 	"LibStub.GetLibrary",
 	"LibStub.NewLibrary",
 
+	-- ChatThrottleLib
+	"ChatThrottleLib.BNSendGameData",
+	"ChatThrottleLib.Enqueue",
+	"ChatThrottleLib.SendAddonMessage",
+	"ChatThrottleLib.SendAddonMessageLogged",
+	"ChatThrottleLib.SendChatMessage",
+
 	-- Global APIs
 	"Ambiguate",
 	"bit.band",
 	"bit.bor",
 	"BNET_CLIENT_WOW",
 	"BNFeaturesEnabledAndConnected",
-	"BNGetFriendGameAccountInfo",
-	"BNGetGameAccountInfo",
-	"BNGetNumFriendGameAccounts",
 	"BNGetNumFriends",
 	"BNSendGameData",
-	"BNSendWhisper",
 	"C_BattleNet.GetFriendGameAccountInfo",
 	"C_BattleNet.GetFriendNumGameAccounts",
 	"C_BattleNet.GetGameAccountInfoByID",
-	"C_ChatInfo",
-	"C_Club",
-	"C_ReportSystem.CanReportPlayer",
-	"C_ReportSystem.OpenReportPlayerDialog",
-	"C_Timer.After",
-	"C_Timer.NewTicker",
-	"CallErrorHandler",
+	"C_ChatInfo.IsAddonMessagePrefixRegistered",
+	"C_ChatInfo.RegisterAddonMessagePrefix",
 	"ChatFrame_AddMessageEventFilter",
-	"CopyValuesAsKeys",
 	"CreateFrame",
-	"CreateFromMixins",
-	"DoublyLinkedListMixin",
-	"Enum.SendAddonMessageResult",
 	"ERR_CHAT_PLAYER_NOT_FOUND_S",
 	"FULL_PLAYER_NAME",
 	"GetAutoCompleteRealms",
 	"GetNetStats",
-	"GetPlayerInfoByGUID",
 	"GetRealmName",
 	"GetTime",
 	"hooksecurefunc",
-	"InCombatLockdown",
-	"IsInGroup",
-	"IsInRaid",
 	"IsLoggedIn",
 	"LE_PARTY_CATEGORY_HOME",
-	"LE_PARTY_CATEGORY_INSTANCE",
 	"LE_REALM_RELATION_COALESCED",
-	"Mixin",
-	"PLAYER_REPORT_TYPE_LANGUAGE",
-	"PlayerLocationMixin",
-	"SendChatMessage",
+	"securecallfunction",
 	"strcmputf8i",
 	"string.join",
 	"string.split",
@@ -85,7 +73,6 @@ read_globals = {
 	"UnitName",
 	"UnitRealmRelationship",
 	"UNKNOWNOBJECT",
-	"wipe",
 	"WOW_PROJECT_ID",
 	"WOW_PROJECT_MAINLINE",
 }
diff --git a/CTLCompat.lua b/CTLCompat.lua
deleted file mode 100644
index 404ed31..0000000
--- a/CTLCompat.lua
+++ /dev/null
@@ -1,105 +0,0 @@
---[[
-	© Justin Snelgrove
-
-	Permission to use, copy, modify, and distribute this software for any
-	purpose with or without fee is hereby granted, provided that the above
-	copyright notice and this permission notice appear in all copies.
-
-	THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-	WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-	SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-	WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-	OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-	CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-	--
-
-	Portions of this file are copied directly from ChatThrottleLib (v23) by
-	mikk, which was released into the public domain.
-]]
-
-local Chomp = LibStub:GetLibrary("Chomp", true)
-local Internal = Chomp and Chomp.Internal or nil
-
-if not Chomp or not Internal or not Internal.LOADING then
-	return
-end
-
--- The following code provides a compatibility layer for addons using
--- ChatThrottleLib. It won't load (and Chomp will feed messages into CTL) if
--- there's a newer version of CTL loaded than this layer is compatible with, or
--- if a newer version is loaded after Chomp. This can cause some weird things
--- to happen if someone decides to LoadOnDemand a newer copy of ChatThrottleLib,
--- but that will hopefully be vanishingly rare.
-
-local CTL_VERSION = 24
-
-local PRIORITY_FROM_CTL = { BULK = "LOW", NORMAL = "MEDIUM", ALERT = "HIGH" }
-
-if ChatThrottleLib and not ChatThrottleLib.isChomp and ChatThrottleLib.version > CTL_VERSION then
-	Internal.ChatThrottleLib = true
-	return
-end
-
-if type(ChatThrottleLib) ~= "table" then
-	ChatThrottleLib = {}
-else
-	setmetatable(ChatThrottleLib, nil)
-end
-ChatThrottleLib.version = nil -- Handled in metatable.
-ChatThrottleLib.isChomp = true
-
-function ChatThrottleLib:SendAddonMessage(priorityName, prefix, text, kind, target, queueName, callback, callbackArg)
-	if not priorityName or not prefix or not text or not kind or not PRIORITY_FROM_CTL[priorityName] then
-		error("Usage: ChatThrottleLib:SendAddonMessage(\"{BULK||NORMAL||ALERT}\", \"prefix\", \"text\", \"chattype\"[, \"target\"])", 2)
-	elseif callback and type(callback) ~= "function" then
-		error("ChatThrottleLib:SendAddonMessage(): callback: expected function, got " .. type(callback), 2)
-	elseif #text > 255 then
-		error("ChatThrottleLib:SendAddonMessage(): message length cannot exceed 255 bytes", 2)
-	end
-	if kind == "CHANNEL" then
-		target = tonumber(target)
-	end
-	Chomp.SendAddonMessage(prefix, text, kind, target, PRIORITY_FROM_CTL[priorityName], queueName or ("%s%s%s"):format(prefix, kind, (tostring(target) or "")), callback, callbackArg)
-end
-
-function ChatThrottleLib:SendChatMessage(priorityName, prefix, text, kind, language, target, queueName, callback, callbackArg)
-	if not priorityName or not prefix or not text or not PRIORITY_FROM_CTL[priorityName] then
-		error("Usage: ChatThrottleLib:SendChatMessage(\"{BULK||NORMAL||ALERT}\", \"prefix\", \"text\"[, \"chattype\"[, \"language\"[, \"destination\"]]]", 2)
-	elseif callback and type(callback) ~= "function" then
-		error("ChatThrottleLib:SendChatMessage(): callback: expected function, got " .. type(callback), 2)
-	elseif #text > 255 then
-		error("ChatThrottleLib:SendChatMessage(): message length cannot exceed 255 bytes", 2)
-	end
-	if kind == "CHANNEL" then
-		target = tonumber(target)
-	end
-	Chomp.SendChatMessage(text, kind, language, target, PRIORITY_FROM_CTL[priorityName], queueName or ("%s%s%s"):format(prefix, (kind or "SAY"), (tostring(target) or "")), callback, callbackArg)
-end
-
-function ChatThrottleLib.Hook_SendAddonMessage()
-end
-ChatThrottleLib.Hook_SendChatMessage = ChatThrottleLib.Hook_SendAddonMessage
-
--- This metatable catches changes to the CTL version, in case of a newer
--- version of CTL replacing this compatibility layer.
-setmetatable(ChatThrottleLib, {
-	__index = function(self, key)
-		if key == "version" then
-			return CTL_VERSION
-		elseif key == "securelyHooked" then
-			return true
-		end
-	end,
-	__newindex = function(self, key, value)
-		if key == "version" then
-			self.isChomp = nil
-			Internal.ChatThrottleLib = true
-			setmetatable(self, nil)
-		end
-		rawset(self, key, value)
-	end,
-})
-
-Internal.ChatThrottleLib = nil
diff --git a/Chomp.xml b/Chomp.xml
index e6a964b..2e65c03 100644
--- a/Chomp.xml
+++ b/Chomp.xml
@@ -2,7 +2,6 @@
 	<Include file="Internal.lua"/>
 	<Include file="Public.lua"/>
 	<Include file="StringManip.lua"/>
-	<Include file="CTLCompat.lua"/>
 
 	<Script>
 		local Chomp = LibStub:GetLibrary("Chomp", true)
diff --git a/Internal.lua b/Internal.lua
index 8b71400..0b1ad73 100644
--- a/Internal.lua
+++ b/Internal.lua
@@ -14,7 +14,7 @@
 	CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ]]
 
-local VERSION = 25
+local VERSION = 26
 
 if IsLoggedIn() then
 	error(("Chomp Message Library (embedded: %s) cannot be loaded after login."):format((...)))
@@ -34,30 +34,6 @@ local Internal = Chomp.Internal
 
 Internal.callbacks = LibStub:GetLibrary("CallbackHandler-1.0"):New(Internal)
 
---[[
-	CONSTANTS
-]]
-
--- Safe instantaneous burst bytes and safe susatined bytes per second.
--- Lower rates on non-Retail clients due to aggressive throttling.
-local BURST, BPS
-
-if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
-	BURST, BPS = 8192, 2048
-else
-	BURST, BPS = 4000, 800
-end
-
--- These values were safe on 8.0 beta, but are unsafe on 7.3 live. Normally I'd
--- love to automatically use them if 8.0 is live, but it's not 100% clear if
--- this is a 8.0 thing or a test realm thing.
---local BURST, BPS = 16384, 4096
-local OVERHEAD = 27
-
-local POOL_TICK = 0.2
-
-local PRIORITIES = { "HIGH", "MEDIUM", "LOW" }
-
 --[[
 	INTERNAL TABLES
 ]]
@@ -193,7 +169,7 @@ local function HandleMessageIn(prefix, text, channel, sender, target, zoneChanne
 	end
 
 	if prefixData.rawCallback then
-		xpcall(prefixData.rawCallback, CallErrorHandler, prefix, text, channel, sender, target, zoneChannelID, localID, name, instanceID, nil, nil, nil, sessionID, msgID, msgTotal, bitField)
+		securecallfunction(prefixData.rawCallback, prefix, text, channel, sender, target, zoneChannelID, localID, name, instanceID, nil, nil, nil, sessionID, msgID, msgTotal, bitField)
 	end
 
 	local deserialize = bit.band(bitField, Internal.BITS.SERIALIZE) == Internal.BITS.SERIALIZE
@@ -233,7 +209,7 @@ local function HandleMessageIn(prefix, text, channel, sender, target, zoneChanne
 				end
 			end
 			if prefixData.validTypes[type(handlerData)] then
-				xpcall(prefixData.callback, CallErrorHandler, prefix, handlerData, channel, sender, target, zoneChannelID, localID, name, instanceID, nil, nil, nil, sessionID, msgID, msgTotal, bitField)
+				securecallfunction(prefixData.callback, prefix, handlerData, channel, sender, target, zoneChannelID, localID, name, instanceID, nil, nil, nil, sessionID, msgID, msgTotal, bitField)
 				Internal:TriggerEvent("OnMessageReceived", prefix, handlerData, channel, sender, target, zoneChannelID, localID, name, instanceID, nil, nil, nil, sessionID, msgID, msgTotal, bitField)
 			end
 			buffer[i] = false
@@ -270,154 +246,6 @@ local function ParseBattleNetMessage(prefix, text, kind, bnetIDGameAccount)
 	return prefix, text, ("%s:BATTLENET"):format(kind), name, Chomp.NameMergedRealm(UnitName("player")), 0, 0, "", 0
 end
 
---[[
-	INTERNAL BANDWIDTH POOL
-]]
-
-local SendAddonMessageResult = Mixin({
-    Success = 0,
-    InvalidPrefix = 1,
-    InvalidMessage = 2,
-    AddonMessageThrottle = 3,
-    InvalidChatType = 4,
-    NotInGroup = 5,
-    TargetRequired = 6,
-    InvalidChannel = 7,
-    ChannelThrottle = 8,
-    GeneralError = 9,  -- Reporting for duty, sir!
-}, Enum.SendAddonMessageResult or {})
-
-function Internal:MapToSendAddonMessageResult(result)
-	if result == true then
-		result = SendAddonMessageResult.Success
-	elseif result == false then
-		result = SendAddonMessageResult.GeneralError
-	end
-
-	return result
-end
-
-function Internal:IsRetryMessageResult(result)
-	if result == SendAddonMessageResult.AddonMessageThrottle then
-		return true
-	elseif result == SendAddonMessageResult.ChannelThrottle then
-		return true
-	else
-		return false
-	end
-end
-
-function Internal:RunQueue()
-	if self:UpdateBytes() <= 0 then
-		return
-	end
-	local active = {}
-	local blockedQueues = {}
-	for i, priority in ipairs(PRIORITIES) do
-		if self[priority].front then -- Priority has queues.
-			active[#active + 1] = self[priority]
-		end
-	end
-	local bytes = (#active > 0 and self.bytes / #active or 0)
-	self.bytes = 0
-	for i, priority in ipairs(active) do
-		priority.bytes = priority.bytes + bytes
-		while priority.front and priority.bytes >= priority.front.front.length do
-			local queue = priority:PopFront()
-			local message = queue:PopFront()
-			local sendResult = SendAddonMessageResult.GeneralError
-			if (message.kind ~= "RAID" and message.kind ~= "PARTY" or IsInGroup(LE_PARTY_CATEGORY_HOME)) and (message.kind ~= "INSTANCE_CHAT" or IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) then
-				priority.bytes = priority.bytes - message.length
-				self.isSending = true
-				sendResult = self:MapToSendAddonMessageResult(select(-1, true, message.f(unpack(message, 1, 4))))
-				self.isSending = false
-			end
-			if self:IsRetryMessageResult(sendResult) then
-				-- Requeue the message, but don't requeue the queue.
-				queue:PushFront(message)
-				priority.bytes = priority.bytes + message.length
-				blockedQueues[#blockedQueues + 1] = { priority, queue }
-			else
-				if queue.front then -- More messages in this queue.
-					priority:PushBack(queue)
-				else -- No more messages in this queue.
-					priority.byName[queue.name] = nil
-				end
-				if message.callback then
-					local didSend = (sendResult == SendAddonMessageResult.Success)
-					xpcall(message.callback, CallErrorHandler, message.callbackArg, didSend)
-				end
-			end
-		end
-		if not priority.front then
-			self.bytes = self.bytes + priority.bytes
-			priority.bytes = 0
-		end
-	end
-	for _, blockedQueueInfo in ipairs(blockedQueues) do
-		local priority, queue = unpack(blockedQueueInfo)
-		priority:PushBack(queue)
-	end
-end
-
-function Internal:HasQueuedData()
-	for _, priority in ipairs(PRIORITIES) do
-		if self[priority].front then
-			return true;
-		end
-	end
-
-	return false;
-end
-
-function Internal:UpdateBytes()
-	local bps, burst = self.BPS, self.BURST
-	if InCombatLockdown() then
-		bps = bps * 0.50
-		burst = burst * 0.50
-	end
-
-	local now = GetTime()
-	local newBytes = (now - self.lastByteUpdate) * bps
-	local bytes = math.min(burst, self.bytes + newBytes)
-	bytes = math.max(bytes, -bps) -- Probably going to fail anyway.
-	self.bytes = bytes
-	self.lastByteUpdate = now
-
-	return bytes
-end
-
-function Internal:Enqueue(priorityName, queueName, message)
-	local priority = self[priorityName]
-	local queue = priority.byName[queueName]
-	if not queue then
-		queue = Mixin({ name = queueName }, DoublyLinkedListMixin)
-		priority.byName[queueName] = queue
-		priority:PushBack(queue)
-	end
-	queue:PushBack(message)
-	self:StartQueue()
-end
-
-Internal.bytes = 0
-Internal.lastByteUpdate = GetTime()
-Internal.BPS = BPS
-Internal.BURST = BURST
-
-for i, priority in ipairs(PRIORITIES) do
-	Internal[priority] = Mixin({ bytes = 0, byName = {} }, DoublyLinkedListMixin)
-end
-
-function Internal:StartQueue()
-	if not self.queueTicker then
-		local function OnTick()
-			self:RunQueue()
-		end
-
-		self.queueTicker = C_Timer.NewTicker(POOL_TICK, OnTick)
-	end
-end
-
 function Internal:TriggerEvent(event, ...)
 	return self.callbacks:Fire(event, ...)
 end
@@ -488,10 +316,6 @@ local function HookSendAddonMessage(prefix, text, kind, target)
 		local filterKey = Internal.MessageFilterKeyCache[target]
 		Internal.Filter[filterKey] = GetTime() + (select(3, GetNetStats()) * 0.001) + 5.000
 	end
-	if Internal.isSending then return end
-	local prefixLength = math.min(#tostring(prefix), 16)
-	local length = math.min(#tostring(text), 255)
-	Internal.bytes = Internal.bytes - (length + prefixLength + OVERHEAD)
 end
 
 local function HookSendAddonMessageLogged(prefix, text, kind, target)
@@ -499,40 +323,6 @@ local function HookSendAddonMessageLogged(prefix, text, kind, target)
 		local filterKey = Internal.MessageFilterKeyCache[target]
 		Internal.Filter[filterKey] = GetTime() + (select(3, GetNetStats()) * 0.001) + 5.000
 	end
-	if Internal.isSending then return end
-	local prefixLength = math.min(#tostring(prefix), 16)
-	local length = math.min(#tostring(text), 255)
-	Internal.bytes = Internal.bytes - (length + prefixLength + OVERHEAD)
-end
-
-local function HookSendChatMessage(text, kind, language, target)
-	if Internal.isSending then return end
-	Internal.bytes = Internal.bytes - (#tostring(text) + OVERHEAD)
-end
-
-local function HookBNSendGameData(bnetIDGameAccount, prefix, text)
-	if Internal.isSending then return end
-	local prefixLength = math.min(#tostring(prefix), 16)
-	local length = math.min(#tostring(text), 4093 - prefixLength)
-	Internal.bytes = Internal.bytes - (length + prefixLength + OVERHEAD)
-end
-
-local function HookBNSendWhisper(bnetIDAccount, text)
-	if Internal.isSending then return end
-	local length = math.min(#tostring(text), 997)
-	Internal.bytes = Internal.bytes - (length + OVERHEAD)
-end
-
-local function HookC_ClubSendMessage(clubID, streamID, text)
-	if Internal.isSending then return end
-	local length = #tostring(text)
-	Internal.bytes = Internal.bytes - (length + OVERHEAD)
-end
-
-local function HookC_ClubEditMessage(clubID, streamID, messageID, text)
-	if Internal.isSending then return end
-	local length = #tostring(text)
-	Internal.bytes = Internal.bytes - (length + OVERHEAD)
 end
 
 --[[
@@ -649,6 +439,7 @@ end
 ]]
 
 Internal:Hide()
+Internal:RegisterEvent("ADDON_LOADED")
 Internal:RegisterEvent("CHAT_MSG_ADDON")
 Internal:RegisterEvent("CHAT_MSG_ADDON_LOGGED")
 Internal:RegisterEvent("BN_CHAT_MSG_ADDON")
@@ -660,7 +451,6 @@ Internal:RegisterEvent("BN_DISCONNECTED")
 Internal:RegisterEvent("BN_FRIEND_ACCOUNT_OFFLINE")
 Internal:RegisterEvent("BN_FRIEND_ACCOUNT_ONLINE")
 Internal:RegisterEvent("BN_FRIEND_INFO_CHANGED")
-Internal:RegisterEvent("BN_INFO_CHANGED")
 Internal:RegisterEvent("FRIENDLIST_UPDATE")
 
 Internal:SetScript("OnEvent", function(self, event, ...)
@@ -681,11 +471,6 @@ Internal:SetScript("OnEvent", function(self, event, ...)
 		_G.__chomp_internal = nil
 		hooksecurefunc(C_ChatInfo, "SendAddonMessage", HookSendAddonMessage)
 		hooksecurefunc(C_ChatInfo, "SendAddonMessageLogged", HookSendAddonMessageLogged)
-		hooksecurefunc("SendChatMessage", HookSendChatMessage)
-		hooksecurefunc("BNSendGameData", HookBNSendGameData)
-		hooksecurefunc("BNSendWhisper", HookBNSendWhisper)
-		hooksecurefunc(C_Club, "SendMessage", HookC_ClubSendMessage)
-		hooksecurefunc(C_Club, "EditMessage", HookC_ClubEditMessage)
 		ChatFrame_AddMessageEventFilter("CHAT_MSG_SYSTEM", MessageEventFilter_SYSTEM)
 		self.SameRealm = {}
 		self.SameRealm[(GetRealmName():gsub("[%s%-]", ""))] = true
@@ -699,12 +484,6 @@ Internal:SetScript("OnEvent", function(self, event, ...)
 			end
 			self.IncomingQueue = nil
 		end
-		if self.OutgoingQueue then
-			for i, q in ipairs(self.OutgoingQueue) do
-				Chomp[q.f](unpack(q, 1, q.n))
-			end
-			self.OutgoingQueue = nil
-		end
 		Internal:UpdateBattleNetAccountData()
 	elseif event == "PLAYER_LEAVING_WORLD" then
 		self.unloadTime = GetTime()
@@ -719,6 +498,13 @@ Internal:SetScript("OnEvent", function(self, event, ...)
 		end
 		self.unloadTime = nil
 		Internal:UpdateBattleNetAccountData()
+	elseif event == "ADDON_LOADED" then
+		-- Tweak CTL's conservative estimates.
+		if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
+			ChatThrottleLib.BURST = math.max(ChatThrottleLib.BURST, 6144)
+			ChatThrottleLib.MAX_CPS = math.max(ChatThrottleLib.MAX_CPS, 2048)
+			ChatThrottleLib.MSG_OVERHEAD = math.min(32, ChatThrottleLib.MSG_OVERHEAD)
+		end
 	end
 end)
 
diff --git a/Public.lua b/Public.lua
index 000b282..d725860 100644
--- a/Public.lua
+++ b/Public.lua
@@ -22,21 +22,9 @@ if not Chomp or not Internal or not Internal.LOADING then
 	return
 end
 
-local DEFAULT_PRIORITY = "MEDIUM"
+local DEFAULT_PRIORITY = "NORMAL"
 local PRIORITIES_HASH = { HIGH = true, MEDIUM = true, LOW = true }
 local PRIORITY_TO_CTL = { LOW = "BULK", MEDIUM = "NORMAL", HIGH = "ALERT" }
-local OVERHEAD = 27
-
-local function QueueMessageOut(func, ...)
-	if not Internal.OutgoingQueue then
-		Internal.OutgoingQueue = {}
-	end
-	local t = { ... }
-	t.f = func
-	t.n = select("#", ...)
-	local q = Internal.OutgoingQueue
-	q[#q + 1] = t
-end
 
 function Chomp.SendAddonMessage(prefix, text, kind, target, priority, queue, callback, callbackArg)
 	if type(prefix) ~= "string" then
@@ -61,58 +49,18 @@ function Chomp.SendAddonMessage(prefix, text, kind, target, priority, queue, cal
 	elseif #prefix > 16 then
 		error("Chomp.SendAddonMessage: prefix: length cannot exceed 16 bytes", 2)
 	end
-	if not Internal.isReady then
-		QueueMessageOut("SendAddonMessage", prefix, text, kind, target, priority, queue, callback, callbackArg)
-		return
-	end
 
 	if not kind then
 		kind = "PARTY"
 	else
 		kind = kind:upper()
 	end
+
 	if target and kind == "WHISPER" then
 		target = Ambiguate(target, "none")
 	end
-	length = length + #prefix + OVERHEAD
 
-	if Internal.ChatThrottleLib and not ChatThrottleLib.isChomp then
-		-- CTL likes to drop RAID messages, despite the game falling back
-		-- automatically to PARTY.
-		if kind == "RAID" and not IsInRaid() then
-			kind = "PARTY"
-		end
-		ChatThrottleLib:SendAddonMessage(PRIORITY_TO_CTL[priority] or "NORMAL", prefix, text, kind, target, queue or ("%s%s%s"):format(prefix, kind, tostring(target) or ""), callback, callbackArg)
-		return
-	end
-
-	if not Internal:HasQueuedData() and length <= Internal:UpdateBytes() then
-		Internal.bytes = Internal.bytes - length
-		Internal.isSending = true
-		local sendResult = select(-1, C_ChatInfo.SendAddonMessage(prefix, text, kind, target))
-		sendResult = Internal:MapToSendAddonMessageResult(sendResult)
-		Internal.isSending = false
-		if not Internal:IsRetryMessageResult(sendResult) then
-			if callback then
-				xpcall(callback, CallErrorHandler, callbackArg, true)
-			end
-			return
-		end
-	end
-
-	local message = {
-		f = C_ChatInfo.SendAddonMessage,
-		[1] = prefix,
-		[2] = text,
-		[3] = kind,
-		[4] = target,
-		kind = kind,
-		length = length,
-		callback = callback,
-		callbackArg = callbackArg,
-	}
-
-	return Internal:Enqueue(priority or DEFAULT_PRIORITY, queue or ("%s%s%s"):format(prefix, kind, (tostring(target) or "")), message)
+	ChatThrottleLib:SendAddonMessage(PRIORITY_TO_CTL[priority] or DEFAULT_PRIORITY, prefix, text, kind, target, queue, callback, callbackArg)
 end
 
 function Chomp.SendAddonMessageLogged(prefix, text, kind, target, priority, queue, callback, callbackArg)
@@ -138,58 +86,18 @@ function Chomp.SendAddonMessageLogged(prefix, text, kind, target, priority, queu
 	elseif #prefix > 16 then
 		error("Chomp.SendAddonMessageLogged: prefix: length cannot exceed 16 bytes", 2)
 	end
-	if not Internal.isReady then
-		QueueMessageOut("SendAddonMessageLogged", prefix, text, kind, target, priority, queue, callback, callbackArg)
-		return
-	end
 
 	if not kind then
 		kind = "PARTY"
 	else
 		kind = kind:upper()
 	end
+
 	if target and kind == "WHISPER" then
 		target = Ambiguate(target, "none")
 	end
-	length = length + #prefix + OVERHEAD
-
-	if Internal.ChatThrottleLib and not ChatThrottleLib.isChomp and ChatThrottleLib.SendAddonMessageLogged then
-		-- CTL likes to drop RAID messages, despite the game falling back
-		-- automatically to PARTY.
-		if kind == "RAID" and not IsInRaid() then
-			kind = "PARTY"
-		end
-		ChatThrottleLib:SendAddonMessageLogged(PRIORITY_TO_CTL[priority] or "NORMAL", prefix, text, kind, target, queue or ("%s%s%s"):format(prefix, kind, tostring(target) or ""), callback, callbackArg)
-		return
-	end
 
-	if not Internal:HasQueuedData() and length <= Internal:UpdateBytes() then
-		Internal.bytes = Internal.bytes - length
-		Internal.isSending = true
-		local sendResult = select(-1, C_ChatInfo.SendAddonMessageLogged(prefix, text, kind, target))
-		sendResult = Internal:MapToSendAddonMessageResult(sendResult)
-		Internal.isSending = false
-		if not Internal:IsRetryMessageResult(sendResult) then
-			if callback then
-				xpcall(callback, CallErrorHandler, callbackArg, true)
-			end
-			return
-		end
-	end
-
-	local message = {
-		f = C_ChatInfo.SendAddonMessageLogged,
-		[1] = prefix,
-		[2] = text,
-		[3] = kind,
-		[4] = target,
-		kind = kind,
-		length = length,
-		callback = callback,
-		callbackArg = callbackArg,
-	}
-
-	return Internal:Enqueue(priority or DEFAULT_PRIORITY, queue or ("%s%s%s"):format(prefix, kind, (tostring(target) or "")), message)
+	ChatThrottleLib:SendAddonMessageLogged(PRIORITY_TO_CTL[priority] or DEFAULT_PRIORITY, prefix, text, kind, target, queue, callback, callbackArg)
 end
 
 function Chomp.SendChatMessage(text, kind, language, target, priority, queue, callback, callbackArg)
@@ -213,55 +121,18 @@ function Chomp.SendChatMessage(text, kind, language, target, priority, queue, ca
 	if length > 255 then
 		error("Chomp.SendChatMessage: text length cannot exceed 255 bytes", 2)
 	end
-	if not Internal.isReady then
-		QueueMessageOut("SendChatMessage", text, kind, language, target, priority, queue, callback, callbackArg)
-		return
-	end
 
 	if not kind then
 		kind = "SAY"
 	else
 		kind = kind:upper()
 	end
+
 	if target and kind == "WHISPER" then
 		target = Ambiguate(target, "none")
 	end
-	length = length + OVERHEAD
-
-	if Internal.ChatThrottleLib and not ChatThrottleLib.isChomp then
-		-- CTL likes to drop RAID messages, despite the game falling back
-		-- automatically to PARTY.
-		if kind == "RAID" and not IsInRaid() then
-			kind = "PARTY"
-		end
-		ChatThrottleLib:SendChatMessage(PRIORITY_TO_CTL[priority] or "NORMAL", "Chomp", text, kind, language, target, queue or kind .. (target or ""), callback, callbackArg)
-		return
-	end
-
-	if not Internal:HasQueuedData() and length <= Internal:UpdateBytes() then
-		Internal.bytes = Internal.bytes - length
-		Internal.isSending = true
-		SendChatMessage(text, kind, language, target)
-		Internal.isSending = false
-		if callback then
-			xpcall(callback, CallErrorHandler, callbackArg, true)
-		end
-		return
-	end
 
-	local message = {
-		f = SendChatMessage,
-		[1] = text,
-		[2] = kind,
-		[3] = language,
-		[4] = target,
-		kind = kind,
-		length = length,
-		callback = callback,
-		callbackArg = callbackArg,
-	}
-
-	return Internal:Enqueue(priority or DEFAULT_PRIORITY, queue or kind .. (target or ""), message)
+	ChatThrottleLib:SendChatMessage(PRIORITY_TO_CTL[priority] or DEFAULT_PRIORITY, "Chomp", text, kind, language, target, queue, callback, callbackArg)
 end
 
 function Chomp.BNSendGameData(bnetIDGameAccount, prefix, text, priority, queue, callback, callbackArg)
@@ -280,93 +151,34 @@ function Chomp.BNSendGameData(bnetIDGameAccount, prefix, text, priority, queue,
 	end
 
 	local length = #text
-	if length > 4078 then
-		error("Chomp.BNSendGameData: text: length cannot exceed 4078 bytes", 2)
+	if length > 255 then
+		error("Chomp.BNSendGameData: text: length cannot exceed 255 bytes", 2)
 	elseif #prefix > 16 then
 		error("Chomp.BNSendGameData: prefix: length cannot exceed 16 bytes", 2)
 	end
 
-	if not Internal.isReady then
-		QueueMessageOut("BNSendGameData", bnetIDGameAccount, prefix, text, priority, queue, callback, callbackArg)
-		return
-	end
-
-	length = length + 18 -- 16 byte prefix, 2 byte bnetIDAccount
+	-- Revisit this logic later if/when CTL merges in BNSendGameData support;
+	-- until then let's poke into its guts.
 
-	if not Internal:HasQueuedData() and length <= Internal:UpdateBytes() then
-		Internal.bytes = Internal.bytes - length
-		Internal.isSending = true
-		BNSendGameData(bnetIDGameAccount, prefix, text)
-		Internal.isSending = false
-		if callback then
-			xpcall(callback, CallErrorHandler, callbackArg, true)
-		end
+	if not ChatThrottleLib.Enqueue then
 		return
 	end
 
-	local message = {
+	ChatThrottleLib:Enqueue(PRIORITY_TO_CTL[priority] or DEFAULT_PRIORITY, queue or prefix, {
 		f = BNSendGameData,
-		[1] = bnetIDGameAccount,
-		[2] = prefix,
-		[3] = text,
-		length = length,
-		callback = callback,
+		callbackFn = callback,
 		callbackArg = callbackArg,
-	}
-
-	return Internal:Enqueue(priority or DEFAULT_PRIORITY, queue or ("%s%d"):format(prefix, bnetIDGameAccount), message)
-end
-
-function Chomp.BNSendWhisper(bnetIDAccount, text, priority, queue, callback, callbackArg)
-	if type(text) ~= "string" then
-		error("Chomp.BNSendWhisper: text: expected string, got " .. type(text), 2)
-	elseif type(bnetIDAccount) ~= "number" then
-		error("Chomp.BNSendWhisper: bnetIDAccount: expected number, got " .. type(bnetIDAccount), 2)
-	elseif priority and not PRIORITIES_HASH[priority] then
-		error("Chomp.BNSendWhisper: priority: expected \"HIGH\", \"MEDIUM\", \"LOW\", or nil, got " .. tostring(priority), 2)
-	elseif queue and type(queue) ~= "string" then
-		error("Chomp.BNSendWhisper: queue: expected string or nil, got " .. type(queue), 2)
-	elseif callback and type(callback) ~= "function" then
-		error("Chomp.BNSendWhisper: callback: expected function or nil, got " .. type(callback), 2)
-	end
-
-	local length = #text
-	if length > 997 then
-		error("Chomp.BNSendWhisper: text length cannot exceed 997 bytes", 2)
-	end
-
-	if not Internal.isReady then
-		QueueMessageOut("BNSendWhisper", bnetIDAccount, text, priority, queue, callback, callbackArg)
-		return
-	end
-
-	length = length + 2 -- 2 byte bnetIDAccount
-
-	if not Internal:HasQueuedData() and length <= Internal:UpdateBytes() then
-		Internal.bytes = Internal.bytes - length
-		Internal.isSending = true
-		BNSendWhisper(bnetIDAccount, text)
-		Internal.isSending = false
-		if callback then
-			xpcall(callback, CallErrorHandler, callbackArg, true)
-		end
-		return
-	end
-
-	local message = {
-		f = BNSendWhisper,
-		[1] = bnetIDAccount,
-		[2] = text,
-		length = length,
-		callback = callback,
-		callbackArg = callbackArg,
-	}
-
-	return Internal:Enqueue(priority or DEFAULT_PRIORITY, queue or tostring(bnetIDAccount), message)
+		nSize = length + (ChatThrottleLib.MSG_OVERHEAD or 40),
+		n = 3,
+		bnetIDGameAccount,
+		prefix,
+		text,
+	})
 end
 
 function Chomp.IsSending()
-	return Internal.isSending
+	-- v26+: Removed with no replacement.
+	return false
 end
 
 local DEFAULT_SETTINGS = {
@@ -462,7 +274,7 @@ local function BNSendGameDataRearrange(prefix, text, bnetIDGameAccount, ...)
 end
 
 local function ToBattleNet(bitField, prefix, text, kind, bnetIDGameAccount, priority, queue)
-	return SplitAndSend(BNSendGameDataRearrange, 4078, bitField, prefix, text, bnetIDGameAccount, priority, queue)
+	return SplitAndSend(BNSendGameDataRearrange, 255, bitField, prefix, text, bnetIDGameAccount, priority, queue)
 end
 
 local DEFAULT_OPTIONS = {}
@@ -495,11 +307,6 @@ function Chomp.SmartAddonMessage(prefix, data, kind, target, messageOptions)
 		error("Chomp.SmartAddonMessage: messageOptions.queue: expected string or nil, got " .. type(messageOptions.queue), 2)
 	end
 
-	if not Internal.isReady then
-		QueueMessageOut("SmartAddonMessage", prefix, data, kind, target, messageOptions)
-		return
-	end
-
 	local bitField = 0x000
 
 	-- v20+: Always set the CODECV2 bit. All clients on the network at this
@@ -522,14 +329,12 @@ function Chomp.SmartAddonMessage(prefix, data, kind, target, messageOptions)
 		target = Chomp.NameMergedRealm(target)
 	end
 
-	local queue = ("%s%s%s"):format(prefix, kind, tostring(target) or "")
-
 	if kind == "WHISPER" then
 		-- GetBattleNetAccountID() only returns an ID for crossfaction and
 		-- crossrealm targets.
 		local bnetIDGameAccount = Internal:GetBattleNetAccountID(target)
 		if bnetIDGameAccount then
-			ToBattleNet(bitField, prefix, Internal.EncodeQuotedPrintable(data, false), kind, bnetIDGameAccount, messageOptions.priority, messageOptions.queue or queue)
+			ToBattleNet(bitField, prefix, Internal.EncodeQuotedPrintable(data, false), kind, bnetIDGameAccount, messageOptions.priority, messageOptions.queue)
 			return "BATTLENET"
 		end
 		local targetUnit = Ambiguate(target, "none")
@@ -541,78 +346,30 @@ function Chomp.SmartAddonMessage(prefix, data, kind, target, messageOptions)
 			kind = UnitInRaid(targetUnit, LE_PARTY_CATEGORY_HOME) and not UnitInSubgroup(targetUnit, LE_PARTY_CATEGORY_HOME) and "RAID" or UnitInParty(targetUnit, LE_PARTY_CATEGORY_HOME) and "PARTY" or "INSTANCE_CHAT"
 			data = ("%s\127%s"):format(not messageOptions.universalBroadcast and Chomp.NameMergedRealm(target) or "", data)
 			target = nil
-			if messageOptions.universalBroadcast then
-				queue = nil
-			end
 		end
 	end
 	if not messageOptions.binaryBlob then
-		ToInGameLogged(bitField, prefix, Internal.EncodeQuotedPrintable(data, true), kind, target, messageOptions.priority, messageOptions.queue or queue)
+		ToInGameLogged(bitField, prefix, Internal.EncodeQuotedPrintable(data, true), kind, target, messageOptions.priority, messageOptions.queue)
 		return "LOGGED"
 	end
-	ToInGame(bitField, prefix, data, kind, target, messageOptions.priority, messageOptions.queue or queue)
+	ToInGame(bitField, prefix, data, kind, target, messageOptions.priority, messageOptions.queue)
 	return "UNLOGGED"
 end
 
-local ReportLocation = CreateFromMixins(PlayerLocationMixin)
-
 function Chomp.CheckReportGUID(prefix, guid)
-	local prefixData = Internal.Prefixes[prefix]
-	if type(prefix) ~= "string" then
-		error("Chomp.CheckReportGUID: prefix: expected string, got " .. type(prefix), 2)
-	elseif type(guid) ~= "string" then
-		error("Chomp.CheckReportGUID: guid: expected string, got " .. type(guid), 2)
-	elseif not prefixData then
-		error("Chomp.CheckReportGUID: prefix: prefix has not been registered with Chomp", 2)
-	end
-	local success, _, _, _, _, _, name, realm = pcall(GetPlayerInfoByGUID, guid)
-	if not success or not name or name == UNKNOWNOBJECT then
-		return false, "UNKNOWN"
-	end
-	local target = Chomp.NameMergedRealm(name, realm)
-	if Internal:GetBattleNetAccountID(target) then
-		return false, "BATTLENET"
-	end
-	ReportLocation:SetGUID(guid)
-	if C_ReportSystem then
-		return C_ReportSystem.CanReportPlayer(ReportLocation), "LOGGED"
-	else
-		return C_ChatInfo.CanReportPlayer(ReportLocation), "LOGGED"
-	end
+	-- v26+: Removed with no replacement.
+	return false
 end
 
 function Chomp.ReportGUID(prefix, guid, customMessage)
-	local prefixData = Internal.Prefixes[prefix]
-	if type(prefix) ~= "string" then
-		error("Chomp.ReportGUID: prefix: expected string, got " .. type(prefix), 2)
-	elseif customMessage and type(customMessage) ~= "string" then
-		error("Chomp.ReportGUID: customMessage: expected string, got " .. type(customMessage), 2)
-	elseif type(guid) ~= "string" then
-		error("Chomp.ReportGUID: guid: expected string, got " .. type(guid), 2)
-	elseif not prefixData then
-		error("Chomp.ReportGUID: prefix: prefix has not been registered with Chomp", 2)
-	end
-	local canReport, reason = Chomp.CheckReportGUID(prefix, guid)
-	if canReport then
-		if C_ReportSystem then
-			local _, _, _, _, _, name, realm = GetPlayerInfoByGUID(guid)
-			if name and realm then
-				C_ReportSystem.OpenReportPlayerDialog(PLAYER_REPORT_TYPE_LANGUAGE, name .. "-" .. realm, ReportLocation)
-			end
-		else
-			C_ChatInfo.ReportPlayer(PLAYER_REPORT_TYPE_LANGUAGE, ReportLocation, ("Report for logged addon prefix: %s. %s"):format(prefix, customMessage or "Objectionable content in logged addon messages."))
-		end
-		return true, reason
-	end
-	return false, reason
+	-- v26+: Removed with no replacement.
+	return false, ""
 end
 
-Chomp.Event = CopyValuesAsKeys(
-	{
-		"OnMessageReceived",
-		"OnError",
-	}
-)
+Chomp.Event = {
+	OnMessageReceived = "OnMessageReceived",
+	OnError = "OnError",
+}
 
 function Chomp.RegisterCallback(event, func, owner)
 	if type(event) ~= "string" then
@@ -677,17 +434,12 @@ end
 Chomp.UnegisterErrorCallback = Chomp.UnregisterErrorCallback
 
 function Chomp.GetBPS()
-	return Internal.BPS, Internal.BURST
+	return ChatThrottleLib.MAX_CPS, ChatThrottleLib.BURST
 end
 
 function Chomp.SetBPS(bps, burst)
-	if type(bps) ~= "number" then
-		error("Chomp.SetBPS: bps: expected number, got " .. type(bps), 2)
-	elseif type(burst) ~= "number" then
-		error("Chomp.SetBPS: burst: expected number, got " .. type(burst), 2)
-	end
-	Internal.BPS = bps
-	Internal.BURST = burst
+	ChatThrottleLib.MAX_CPS = bps
+	ChatThrottleLib.BURST = burst
 end
 
 function Chomp.GetVersion()