From 0a0a777b9992e25c6502707babac0a065fdd70d3 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 8 May 2015 20:22:39 +0200
Subject: [PATCH] Added HandleMOTDNotFound to MOTDHandlers

---
 ChatSharp/Handlers/MOTDHandlers.cs    | 16 +++++++++++++++-
 ChatSharp/Handlers/MessageHandlers.cs |  7 ++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChatSharp/Handlers/MOTDHandlers.cs b/ChatSharp/Handlers/MOTDHandlers.cs
index 7cd5866..721e316 100644
--- a/ChatSharp/Handlers/MOTDHandlers.cs
+++ b/ChatSharp/Handlers/MOTDHandlers.cs
@@ -1,4 +1,4 @@
-using ChatSharp.Events;
+using ChatSharp.Events;
 using System;
 
 namespace ChatSharp.Handlers
@@ -26,6 +26,20 @@ namespace ChatSharp.Handlers
             client.OnMOTDRecieved(new ServerMOTDEventArgs(MOTD));
             client.OnConnectionComplete(new EventArgs());
             // Verify our identity
+            VerifyOurIdentity(client);
+            
+        }
+
+	public static void HandleMOTDNotFound(IrcClient client, IrcMessage message)
+	{
+            client.OnMOTDRecieved(new ServerMOTDEventArgs(MOTD));
+            client.OnConnectionComplete(new EventArgs());
+
+            VerifyOurIdentity(client);
+	}
+
+	private static void VerifyOurIdentity(IrcClient client)
+	{
             if (client.Settings.WhoIsOnConnect)
             {
                 client.WhoIs(client.User.Nick, whois =>
diff --git a/ChatSharp/Handlers/MessageHandlers.cs b/ChatSharp/Handlers/MessageHandlers.cs
index 23833ef..a620910 100644
--- a/ChatSharp/Handlers/MessageHandlers.cs
+++ b/ChatSharp/Handlers/MessageHandlers.cs
@@ -1,4 +1,4 @@
-using ChatSharp.Events;
+using ChatSharp.Events;
 using System.Linq;
 
 namespace ChatSharp.Handlers
@@ -24,11 +24,12 @@ namespace ChatSharp.Handlers
             client.SetHandler("375", MOTDHandlers.HandleMOTDStart);
             client.SetHandler("372", MOTDHandlers.HandleMOTD);
             client.SetHandler("376", MOTDHandlers.HandleEndOfMOTD);
+            client.SetHandler("422", MOTDHandlers.HandleMOTDNotFound);
 
             // Channel handlers
             client.SetHandler("JOIN", ChannelHandlers.HandleJoin);
-            client.SetHandler("PART", ChannelHandlers.HandlePart);
-            client.SetHandler("332", ChannelHandlers.HandleGetTopic);
+            client.SetHandler("PART", ChannelHandlers.HandlePart);
+            client.SetHandler("332", ChannelHandlers.HandleGetTopic);
             client.SetHandler("331", ChannelHandlers.HandleGetEmptyTopic);
             client.SetHandler("353", ChannelHandlers.HandleUserListPart);
             client.SetHandler("366", ChannelHandlers.HandleUserListEnd);