Merge pull request #53 from hburn7/hotfix/duplicate-message-received-…

…events Remove duplicate OnPrivateMessageReceived invocation
hburn7 · Sep 20, 2024 · 7331d2f · 7331d2f
2 parents 74a1705 + 4a8676b
commit 7331d2f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/BanchoSharp/BanchoClient.cs b/BanchoSharp/BanchoClient.cs
@@ -264,7 +264,6 @@ private void RegisterEvents()
 			if (m is IPrivateIrcMessage priv)
 			{
 				_banchoBotEventInvoker.ProcessMessage(priv);
-				OnPrivateMessageReceived?.Invoke(priv);
 
 				var channel = GetChannel(priv.IsDirect ? priv.Sender : priv.Recipient);
 				if (priv.IsDirect)
@@ -420,14 +419,13 @@ private async Task ListenerAsync()
 
 			OnMessageReceived?.Invoke(message);
 
-			if (message is IPrivateIrcMessage dm)
-			{
-				OnPrivateMessageReceived?.Invoke(dm);
+			if (message is not IPrivateIrcMessage dm) continue;
+
+			OnPrivateMessageReceived?.Invoke(dm);
 
-				if (dm.Recipient == ClientConfig.Credentials.Username)
-				{
-					OnAuthenticatedUserDMReceived?.Invoke(dm);
-				}
+			if (dm.Recipient == ClientConfig.Credentials.Username)
+			{
+				OnAuthenticatedUserDMReceived?.Invoke(dm);
 			}
 		}
 	}