From 8b6fec06221500472daab165c42911b81affb341 Mon Sep 17 00:00:00 2001
From: Charlie Nolan <funnyman3595@gmail.com>
Date: Mon, 22 Apr 2024 13:38:01 -0700
Subject: [PATCH] Prevent duplicate messages when sending a PM to yourself.
 (#25124)

* Prevent duplicate messages when replying to yourself.

* Oops.

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
---
 code/modules/admin/verbs/adminpm.dm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 6d8ad148178..852168cb285 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -187,17 +187,18 @@
 	else
 		receive_message = chat_box_ahelp(receive_message)
 	to_chat(C, receive_message)
-	var/send_window_link = "(<a href='byond://?src=[pm_tracker.UID()];newtitle=[C.key]'>WINDOW</a>)"
-	if(message_type == MESSAGE_TYPE_MENTORPM && check_rights(R_ADMIN|R_MENTOR, 0, mob))
-		send_window_link = ticket_link
-	else if(message_type == MESSAGE_TYPE_ADMINPM && check_rights(R_ADMIN, 0, mob))
-		send_window_link = ticket_link
-	var/send_message = "<span class='[send_span]'>[send_pm_type][type] to-<b>[holder ? key_name(C, TRUE, type, ticket_id = ticket_id) : key_name_hidden(C, TRUE, type, ticket_id = ticket_id)]</b>:<br><br>[emoji_msg]</span><br>[ping_link] [send_window_link] [alert_link]"
-	if(message_type == MESSAGE_TYPE_MENTORPM)
-		send_message = chat_box_mhelp(send_message)
-	else
-		send_message = chat_box_ahelp(send_message)
-	to_chat(src, send_message)
+	if(C != src)
+		var/send_window_link = "(<a href='byond://?src=[pm_tracker.UID()];newtitle=[C.key]'>WINDOW</a>)"
+		if(message_type == MESSAGE_TYPE_MENTORPM && check_rights(R_ADMIN|R_MENTOR, 0, mob))
+			send_window_link = ticket_link
+		else if(message_type == MESSAGE_TYPE_ADMINPM && check_rights(R_ADMIN, 0, mob))
+			send_window_link = ticket_link
+		var/send_message = "<span class='[send_span]'>[send_pm_type][type] to-<b>[holder ? key_name(C, TRUE, type, ticket_id = ticket_id) : key_name_hidden(C, TRUE, type, ticket_id = ticket_id)]</b>:<br><br>[emoji_msg]</span><br>[ping_link] [send_window_link] [alert_link]"
+		if(message_type == MESSAGE_TYPE_MENTORPM)
+			send_message = chat_box_mhelp(send_message)
+		else
+			send_message = chat_box_ahelp(send_message)
+		to_chat(src, send_message)
 
 	var/third_party_message
 	if(message_type == MESSAGE_TYPE_MENTORPM)