Item link update

Author: mcd8604

MessageBarkerFrame.lua

@@ -225,31 +225,22 @@ function MessageBarkerFrameMixin:PromptDeleteSelectedMessage()
 	StaticPopup_Show("CONFIRM_DELETE_MESSAGE", selectedMessage.name, nil, { messageRow = messageRow, messageToDelete = selectedMessage })
 end
 
--- Hook item clicks
-local originalHandleModifiedItemClick = nil
-if not originalHandleModifiedItemClick and HandleModifiedItemClick then
-	originalHandleModifiedItemClick = HandleModifiedItemClick
-	HandleModifiedItemClick = function(link)
+-- Hook ChatEdit_InsertLink
+local originalChatEdit_InsertLink = nil
+if not originalChatEdit_InsertLink and ChatEdit_InsertLink then
+	originalChatEdit_InsertLink = ChatEdit_InsertLink
+	ChatEdit_InsertLink = function(link)
 		local handled = false
-		if originalHandleModifiedItemClick then
-			handled = originalHandleModifiedItemClick(link)
-			if not handled and type(link) == "string" then
-				handled = MessageBarkerFrame:HandleItemLinked(Item:CreateFromItemLink(link))
-			end
+		-- Try handling in the MessageEditor
+		if link and MessageBarkerFrame:IsShown() and MessageBarkerFrame.MessageEditor then
+			handled = MessageBarkerFrame.MessageEditor:HandleInsertLink(link)
 		end
-		return handled
-	end
-end
-
-function MessageBarkerFrameMixin:HandleItemLinked(item)
-	local handled = false
-	if item and self:IsShown() and IsModifiedClick("CHATLINK") then
-		handled = self.MessageEditor:HandleItemLinked(item)
+		-- Fall back to original handler
 		if not handled then
-			local newMessage = MessageBarker:CreateMessage(MessageBarker_MessageTypes.Sale, item:GetItemID(), item:GetItemLink())
-			MessageBarker:AddNewMessage(newMessage)
-			handled = true
+			if originalChatEdit_InsertLink then
+				handled = originalChatEdit_InsertLink(link)
+			end
 		end
+		return handled
 	end
-	return handled
 end

MessageEditor.lua

@@ -130,10 +130,30 @@ function MessageEditorMixin:OnNameChanged()
 	self:TriggerEvent(MessageEditorEvent.MessageChanged, self.currentMessage)
 end
 
-function MessageEditorMixin:HandleItemLinked(item)
+function MessageEditorMixin:HandleInsertLink(link)
 	local handled = false
-	if self.messageContentFrame and self.messageContentFrame.HandleItemLinked then
-		handled = self.messageContentFrame:HandleItemLinked(item)
+	if self.messageContentFrame then
+		if self.messageContentFrame.HandleInsertLink then
+			handled = self.messageContentFrame:HandleInsertLink(link)
+		end
+	else
+		handled = self:TryCreateNewSaleMessageFromLink(link)
+	end
+	return handled
+end
+
+function MessageEditorMixin:TryCreateNewSaleMessageFromLink(link)
+	local handled = false
+	if link and type(link) == "string" then
+		local item = Item:CreateFromItemLink(link)
+		if item then
+			local itemId = item:GetItemID()
+			if itemId and itemId > 0 then
+				local newMessage = MessageBarker:CreateMessage(MessageBarker_MessageTypes.Sale, itemId, item:GetItemLink())
+				MessageBarker:AddNewMessage(newMessage)
+				handled = true
+			end
+		end
 	end
 	return handled
 end

MessageTemplates/BasicMessageTemplate.lua

@@ -14,10 +14,10 @@ function BasicMessageTemplateMixin:OnTextChanged()
 	self.message.content = self.MessageScrollFrame.MessageEditBox:GetText()
 end
 
-function BasicMessageTemplateMixin:HandleItemLinked(item)
+function BasicMessageTemplateMixin:HandleInsertLink(link)
 	local handled = false
-	if item then
-		self.MessageScrollFrame.MessageEditBox:Insert(item:GetItemLink())
+	if link then
+		self.MessageScrollFrame.MessageEditBox:Insert(link)
 		handled = true
 	end
 	return handled

MessageTemplates/SaleMessageTemplate.lua

@@ -22,11 +22,17 @@ function SaleMessageTemplateMixin:DeleteItem(item)
 	self.SaleScrollFrame:Update()
 end
 
-function SaleMessageTemplateMixin:HandleItemLinked(item)
+function SaleMessageTemplateMixin:HandleInsertLink(link)
 	local handled = false
-	if item then
-		self:AddItem(item:GetItemID(), item:GetItemLink())
-		handled = true
+	if link and type(link) == "string" then
+		local item = Item:CreateFromItemLink(link)
+		if item then
+			local itemId = item:GetItemID()
+			if itemId and itemId > 0 then
+				self:AddItem(itemId, item:GetItemLink())
+				handled = true
+			end
+		end
 	end
 	return handled
 end