Add usage for commands

kjsmita6 · kjsmita6 · commit 1c1c083569ac · 2016-12-23T13:48:46.000-06:00
diff --git a/SteamChatBot/MainWindow.xaml.cs b/SteamChatBot/MainWindow.xaml.cs
@@ -312,6 +312,7 @@ private void plusTriggerButton_Click(object sender, RoutedEventArgs e)
                         ccaw.apiBlock.PreviewMouseDown += (sender1, e1) => Ccaw_PreviewMouseDown_Wunderground(sender1, e1, ccaw);
                         break;
                     case "youtubeTrigger":
+                        MessageBox.Show("You MUST name your project \"Steam Chat Bot\" or else this trigger will not work!", "Information", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
                         ccaw.apiBlock.PreviewMouseDown += (sender1, e1) => Ccaw_PreviewMouseDown1_Google(sender1, e1, ccaw);
                         break;
                 }
diff --git a/SteamChatBot/Triggers/BanCheckTrigger.cs b/SteamChatBot/Triggers/BanCheckTrigger.cs
@@ -37,7 +37,13 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)
                 SendMessageAfterDelay(toID, "You must declare a Steam API key to use this trigger.", room);
                 return false;
             }
-            if(query != null && query[1] != null)
+
+            if(query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommandApi.ChatCommand.Command + " <steamid64>", room);
+                return true;
+            }
+            else if(query != null && query[1] != null)
             {
                 if (query[1] != null)
                 {
diff --git a/SteamChatBot/Triggers/ChangeNameTrigger.cs b/SteamChatBot/Triggers/ChangeNameTrigger.cs
@@ -26,7 +26,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null && query.Length >= 2)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <new name>", room);
+                return true;
+            }
+            else if (query != null && query.Length >= 2)
             {
                 string name = "";
                 for (int i = 1; i < query.Length; i++)
diff --git a/SteamChatBot/Triggers/ChooseTrigger.cs b/SteamChatBot/Triggers/ChooseTrigger.cs
@@ -26,7 +26,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null && query.Length > 2)
+            if(query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <item1> <item2> ...", room);
+                return true;
+            }
+            else if(query != null && query.Length > 2)
             {
                 List<string> removed = new List<string>();
                 for (int i = 1; i < query.Length; i++)
diff --git a/SteamChatBot/Triggers/GoogleTrigger.cs b/SteamChatBot/Triggers/GoogleTrigger.cs
@@ -29,7 +29,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null && query.Length >= 2)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <query>", room);
+                return true;
+            }
+            else if (query != null && query.Length >= 2)
             {
                 string q = "";
                 for (int i = 1; i < query.Length; i++)
diff --git a/SteamChatBot/Triggers/IsUpTrigger.cs b/SteamChatBot/Triggers/IsUpTrigger.cs
@@ -29,7 +29,12 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterID, str
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if (query != null)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <url>", room);
+                return true;
+            }
+            else if (query != null && query.Length == 2)
             {
                 HttpWebResponse response;
                 try
diff --git a/SteamChatBot/Triggers/KickTrigger.cs b/SteamChatBot/Triggers/KickTrigger.cs
@@ -23,7 +23,12 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str
         private bool Respond(SteamID toID, SteamID userID, string message)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null && query[1] != null)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <steamid64>", true);
+                return true;
+            }
+            else if (query != null && query[1] != null)
             {
                 Bot.steamFriends.KickChatMember(toID, new SteamID(Convert.ToUInt64(query[1])));
                 return true;
diff --git a/SteamChatBot/Triggers/LockChatTrigger.cs b/SteamChatBot/Triggers/LockChatTrigger.cs
@@ -24,7 +24,7 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str
         private bool Respond(SteamID roomID, string message)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null)
+            if (query != null)
             {
                 var msg = new ClientMsg<MsgClientChatAction>();
                 msg.Body.SteamIdChat = SteamHelper.ToChatID(roomID);
diff --git a/SteamChatBot/Triggers/NoteTrigger.cs b/SteamChatBot/Triggers/NoteTrigger.cs
@@ -93,7 +93,12 @@ private bool Respond(SteamID roomID, SteamID userID, string message)
             }
 
             query = StripCommand(message, Options.NoteTriggerOptions.DeleteCommand);
-            if (query != null && query.Length == 2)
+            if(query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(roomID, "Usage: " + Options.NoteTriggerOptions.DeleteCommand + " <note name>", true);
+                return true;
+            }
+            else if (query != null && query.Length == 2)
             {
                 string name = query[1];
                 if (!db.ContainsKey(name))
@@ -110,7 +115,12 @@ private bool Respond(SteamID roomID, SteamID userID, string message)
             }
 
             query = StripCommand(message, Options.NoteTriggerOptions.InfoCommand);
-            if(query != null && query.Length == 2)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(roomID, "Usage: " + Options.NoteTriggerOptions.InfoCommand + " <note name>", true);
+                return true;
+            }
+            else if (query != null && query.Length == 2)
             {
                 string name = query[1];
                 if (!db.ContainsKey(name))
@@ -127,7 +137,12 @@ private bool Respond(SteamID roomID, SteamID userID, string message)
             }
 
             query = StripCommand(message, Options.NoteTriggerOptions.NoteCommand);
-            if (query != null && query.Length == 2)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(roomID, "Usage: " + Options.NoteTriggerOptions.NoteCommand + " <note name> [note content]", true);
+                return true;
+            }
+            else if (query != null && query.Length == 2)
             {
                 string name = query[1];
                 if (!db.ContainsKey(name))
diff --git a/SteamChatBot/Triggers/NotificationTrigger.cs b/SteamChatBot/Triggers/NotificationTrigger.cs
@@ -43,17 +43,17 @@ public override bool onLoggedOn()
                 Options.NotificationOptions.DB = JsonConvert.DeserializeObject<Dictionary<ulong, DB>>(File.ReadAllText(Options.NotificationOptions.DBFile));
                 Log.Instance.Silly("{0}/{1}: Read db from {2}", Bot.username, Name, Options.NotificationOptions.DBFile);
             }
-            catch(FileNotFoundException fnfe)
+            catch (FileNotFoundException fnfe)
             {
                 File.Create(Options.NotificationOptions.DBFile);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Log.Instance.Error(e.StackTrace);
                 return false;
             }
 
-            if(Options.NotificationOptions.DB == null)
+            if (Options.NotificationOptions.DB == null)
             {
                 Options.NotificationOptions.DB = new Dictionary<ulong, DB>();
             }
@@ -74,7 +74,6 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str
 
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
-            bool messageSent = false;
             CheckIfDBExists(userID);
             Dictionary<ulong, DB> db = Options.NotificationOptions.DB;
 
@@ -83,27 +82,37 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)
             db[userID].name = Bot.steamFriends.GetFriendPersonaName(userID);
 
             string[] query = StripCommand(message, Options.NotificationOptions.SeenCommand);
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.SeenCommand + " <steamid64>", room);
+                return true;
+            }
             if (query != null && query.Length == 2)
             {
                 if (!db.ContainsKey(Convert.ToUInt64(query[1])) || db[Convert.ToUInt64(query[1])] == null)
                 {
                     SendMessageAfterDelay(toID, "The user " + query[1] + " was not found.", room);
-                    messageSent = true;
+                    return true;
                 }
                 else
                 {
                     SendMessageAfterDelay(toID, string.Format("I last saw {0} on {1} at {2}", db[Convert.ToUInt64(query[1])].name, db[Convert.ToUInt64(query[1])].seen.ToShortDateString(), db[Convert.ToUInt64(query[1])].seen.ToShortTimeString()), room);
-                    messageSent = true;
+                    return true;
                 }
             }
 
             query = StripCommand(message, Options.NotificationOptions.APICommand);
-            if(query != null && userID != toID)
+            if (query != null && userID != toID)
             {
                 SendMessageAfterDelay(toID, "This command will only work in private to protect privacy.", room);
-                messageSent = true;
+                return true;
             }
-            else if(query != null && query.Length == 2 && userID == toID)
+            else if (query != null && userID == toID && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.APICommand + " <apikey>", room);
+                return true;
+            }
+            else if (query != null && query.Length == 2 && userID == toID)
             {
                 CheckIfDBExists(userID);
                 string api = query[1];
@@ -116,27 +125,27 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)
                 };
 
                 PushResponse response = client.PushNote(note);
-                if(response == null)
+                if (response == null)
                 {
                     SendMessageAfterDelay(toID, "Your push failed. Most likely your API key is incorrect.", room);
-                    messageSent = true;
+                    return true;
                 }
                 else
                 {
                     SendMessageAfterDelay(toID, "Your push was a success.", room);
-                    messageSent = true;
+                    return true;
                 }
             }
 
             query = StripCommand(message, Options.NotificationOptions.FilterCommand);
-            if(query != null && query.Length == 1)
+            if (query != null && query.Length == 1)
             {
-                SendMessageAfterDelay(toID, "Available sub commands: add, list, clear, delete", room);
-                messageSent = true;
+                SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.FilterCommand + "<subcommand> [query]\nAvailable sub commands: add, list, clear, delete", room);
+                return true;
             }
-            else if(query != null && query.Length >= 2)
+            else if (query != null && query.Length >= 2)
             {
-                if(query[1] == "add" && query.Length >= 3)
+                if (query[1] == "add" && query.Length >= 3)
                 {
 
                     List<string> words = new List<string>();
@@ -149,42 +158,42 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)
 
                     db[userID].pb.filter = words;
                     SendMessageAfterDelay(toID, "Your filter has been successfully modified.", room);
-                    messageSent = true;
+                    return true;
                 }
-                else if(query[1] == "list" && query.Length == 2)
+                else if (query[1] == "list" && query.Length == 2)
                 {
                     if (db[userID].pb.filter.Count > 0)
                     {
                         string words = string.Join(", ", db[userID].pb.filter);
                         SendMessageAfterDelay(userID, "Your filter: " + words, false);
-                        messageSent = true;
+                        return true;
                     }
                     else
                     {
                         SendMessageAfterDelay(userID, "Your filter is empty. Use \"!filter add <words>\" to add to your filter", false);
-                        messageSent = true;
+                        return true;
                     }
                 }
-                else if(query[1] == "clear" && query.Length == 2)
+                else if (query[1] == "clear" && query.Length == 2)
                 {
                     db[userID].pb.filter.Clear();
                     SendMessageAfterDelay(toID, "Your filter has been cleared", room);
-                    messageSent = true;
+                    return true;
                 }
-                else if(query[1] == "delete" && query.Length == 3)
+                else if (query[1] == "delete" && query.Length == 3)
                 {
                     db[userID].pb.filter.Remove(query[2]);
                     SendMessageAfterDelay(toID, "The filter \"" + query[2] + "\" has been removed", room);
-                    messageSent = true;
+                    return true;
                 }
             }
 
             query = StripCommand(message, Options.NotificationOptions.ClearCommand);
-            if(query != null)
+            if (query != null)
             {
                 db[userID] = null;
                 SendMessageAfterDelay(toID, "Your database file has been cleared.", room);
-                messageSent = true;
+                return true;
             }
 
 
@@ -211,8 +220,7 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)
                     }
                 }
             }
-
-            return messageSent;
+            return false;
         }
 
         private void CheckIfDBExists(SteamID userID)
diff --git a/SteamChatBot/Triggers/PlayGameTrigger.cs b/SteamChatBot/Triggers/PlayGameTrigger.cs
@@ -18,18 +18,23 @@ public PlayGameTrigger(TriggerType type, string name, TriggerOptionsBase cc) : b
 
         public override bool respondToFriendMessage(SteamID userID, string message)
         {
-            return Respond(userID, message);
+            return Respond(userID, message, false);
         }
 
         public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, string message)
         {
-            return Respond(roomID, message);
+            return Respond(roomID, message, true);
         }
 
-        private bool Respond(SteamID toID, string message)
+        private bool Respond(SteamID toID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if(query != null)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <appid OR \"clear\">", room);
+                return true;
+            }
+            else if (query != null && query.Length == 2)
             {
                 var gamesPlayed = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
                 if(query[1] == "clear")
diff --git a/SteamChatBot/Triggers/TranslateTrigger.cs b/SteamChatBot/Triggers/TranslateTrigger.cs
@@ -41,7 +41,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if (query != null && query.Length == 4)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <word> <fromlang> <tolang>", room);
+                return true;
+            }
+            else if (query != null && query.Length == 4)
             {
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(new Uri("http://hablaa.com/hs/translation/" + query[1] + "/" + query[2] + "-" + query[3] + "/"));
                 try {
diff --git a/SteamChatBot/Triggers/UnbanTrigger.cs b/SteamChatBot/Triggers/UnbanTrigger.cs
@@ -23,7 +23,12 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str
         private bool Respond(SteamID roomID, SteamID userID, string message)
         {
             string[] query = StripCommand(message, Options.ChatCommand.Command);
-            if (query != null && query[1] != null)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(roomID, "Usage: " + Options.ChatCommand.Command + " <steamid64>", true);
+                return true;
+            }
+            else if (query != null && query[1] != null)
             {
                 Bot.steamFriends.UnbanChatMember(roomID, new SteamID(Convert.ToUInt64(query[1])));
                 return true;
diff --git a/SteamChatBot/Triggers/WeatherTrigger.cs b/SteamChatBot/Triggers/WeatherTrigger.cs
@@ -31,7 +31,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommandApi.ChatCommand.Command);
-            if (query != null && query[1] != null)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <city,zip,etc>", room);
+                return true;
+            }
+            else if (query != null && query[1] != null)
             {
                 if (Options.ChatCommandApi.ApiKey == null)
                 {
diff --git a/SteamChatBot/Triggers/YoutubeTrigger.cs b/SteamChatBot/Triggers/YoutubeTrigger.cs
@@ -33,8 +33,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)
         private bool Respond(SteamID toID, SteamID userID, string message, bool room)
         {
             string[] query = StripCommand(message, Options.ChatCommandApi.ChatCommand.Command);
-
-            if (query != null && query.Length >= 2)
+            if (query != null && query.Length == 1)
+            {
+                SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommandApi.ChatCommand.Command + " <query>", room);
+                return true;
+            }
+            else if (query != null && query.Length >= 2)
             {
                 try
                 {

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ private void plusTriggerButton_Click(object sender, RoutedEventArgs e)`
`312`	`312`	`ccaw.apiBlock.PreviewMouseDown += (sender1, e1) => Ccaw_PreviewMouseDown_Wunderground(sender1, e1, ccaw);`
`313`	`313`	`break;`
`314`	`314`	`case "youtubeTrigger":`
	`315`	`+ MessageBox.Show("You MUST name your project \"Steam Chat Bot\" or else this trigger will not work!", "Information", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);`
`315`	`316`	`ccaw.apiBlock.PreviewMouseDown += (sender1, e1) => Ccaw_PreviewMouseDown1_Google(sender1, e1, ccaw);`
`316`	`317`	`break;`
`317`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,13 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`37`	`37`	`SendMessageAfterDelay(toID, "You must declare a Steam API key to use this trigger.", room);`
`38`	`38`	`return false;`
`39`	`39`	`}`
`40`		`- if(query != null && query[1] != null)`
	`40`	`+`
	`41`	`+ if(query != null && query.Length == 1)`
	`42`	`+ {`
	`43`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommandApi.ChatCommand.Command + " <steamid64>", room);`
	`44`	`+ return true;`
	`45`	`+ }`
	`46`	`+ else if(query != null && query[1] != null)`
`41`	`47`	`{`
`42`	`48`	`if (query[1] != null)`
`43`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)`
`26`	`26`	`private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`27`	`27`	`{`
`28`	`28`	`string[] query = StripCommand(message, Options.ChatCommand.Command);`
`29`		`- if(query != null && query.Length >= 2)`
	`29`	`+ if (query != null && query.Length == 1)`
	`30`	`+ {`
	`31`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <new name>", room);`
	`32`	`+ return true;`
	`33`	`+ }`
	`34`	`+ else if (query != null && query.Length >= 2)`
`30`	`35`	`{`
`31`	`36`	`string name = "";`
`32`	`37`	`for (int i = 1; i < query.Length; i++)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,12 @@ public override bool respondToFriendMessage(SteamID userID, string message)`
`29`	`29`	`private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`30`	`30`	`{`
`31`	`31`	`string[] query = StripCommand(message, Options.ChatCommand.Command);`
`32`		`- if(query != null && query.Length >= 2)`
	`32`	`+ if (query != null && query.Length == 1)`
	`33`	`+ {`
	`34`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <query>", room);`
	`35`	`+ return true;`
	`36`	`+ }`
	`37`	`+ else if (query != null && query.Length >= 2)`
`33`	`38`	`{`
`34`	`39`	`string q = "";`
`35`	`40`	`for (int i = 1; i < query.Length; i++)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,12 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str`
`23`	`23`	`private bool Respond(SteamID toID, SteamID userID, string message)`
`24`	`24`	`{`
`25`	`25`	`string[] query = StripCommand(message, Options.ChatCommand.Command);`
`26`		`- if(query != null && query[1] != null)`
	`26`	`+ if (query != null && query.Length == 1)`
	`27`	`+ {`
	`28`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.ChatCommand.Command + " <steamid64>", true);`
	`29`	`+ return true;`
	`30`	`+ }`
	`31`	`+ else if (query != null && query[1] != null)`
`27`	`32`	`{`
`28`	`33`	`Bot.steamFriends.KickChatMember(toID, new SteamID(Convert.ToUInt64(query[1])));`
`29`	`34`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str`
`24`	`24`	`private bool Respond(SteamID roomID, string message)`
`25`	`25`	`{`
`26`	`26`	`string[] query = StripCommand(message, Options.ChatCommand.Command);`
`27`		`- if(query != null)`
	`27`	`+ if (query != null)`
`28`	`28`	`{`
`29`	`29`	`var msg = new ClientMsg<MsgClientChatAction>();`
`30`	`30`	`msg.Body.SteamIdChat = SteamHelper.ToChatID(roomID);`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,17 @@ public override bool onLoggedOn()`
`43`	`43`	`Options.NotificationOptions.DB = JsonConvert.DeserializeObject<Dictionary<ulong, DB>>(File.ReadAllText(Options.NotificationOptions.DBFile));`
`44`	`44`	`Log.Instance.Silly("{0}/{1}: Read db from {2}", Bot.username, Name, Options.NotificationOptions.DBFile);`
`45`	`45`	`}`
`46`		`- catch(FileNotFoundException fnfe)`
	`46`	`+ catch (FileNotFoundException fnfe)`
`47`	`47`	`{`
`48`	`48`	`File.Create(Options.NotificationOptions.DBFile);`
`49`	`49`	`}`
`50`		`- catch(Exception e)`
	`50`	`+ catch (Exception e)`
`51`	`51`	`{`
`52`	`52`	`Log.Instance.Error(e.StackTrace);`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`	`55`
`56`		`- if(Options.NotificationOptions.DB == null)`
	`56`	`+ if (Options.NotificationOptions.DB == null)`
`57`	`57`	`{`
`58`	`58`	`Options.NotificationOptions.DB = new Dictionary<ulong, DB>();`
`59`	`59`	`}`
`@@ -74,7 +74,6 @@ public override bool respondToChatMessage(SteamID roomID, SteamID chatterId, str`
`74`	`74`
`75`	`75`	`private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`76`	`76`	`{`
`77`		`- bool messageSent = false;`
`78`	`77`	`CheckIfDBExists(userID);`
`79`	`78`	`Dictionary<ulong, DB> db = Options.NotificationOptions.DB;`
`80`	`79`
`@@ -83,27 +82,37 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`83`	`82`	`db[userID].name = Bot.steamFriends.GetFriendPersonaName(userID);`
`84`	`83`
`85`	`84`	`string[] query = StripCommand(message, Options.NotificationOptions.SeenCommand);`
	`85`	`+ if (query != null && query.Length == 1)`
	`86`	`+ {`
	`87`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.SeenCommand + " <steamid64>", room);`
	`88`	`+ return true;`
	`89`	`+ }`
`86`	`90`	`if (query != null && query.Length == 2)`
`87`	`91`	`{`
`88`	`92`	`if (!db.ContainsKey(Convert.ToUInt64(query[1])) \|\| db[Convert.ToUInt64(query[1])] == null)`
`89`	`93`	`{`
`90`	`94`	`SendMessageAfterDelay(toID, "The user " + query[1] + " was not found.", room);`
`91`		`- messageSent = true;`
	`95`	`+ return true;`
`92`	`96`	`}`
`93`	`97`	`else`
`94`	`98`	`{`
`95`	`99`	`SendMessageAfterDelay(toID, string.Format("I last saw {0} on {1} at {2}", db[Convert.ToUInt64(query[1])].name, db[Convert.ToUInt64(query[1])].seen.ToShortDateString(), db[Convert.ToUInt64(query[1])].seen.ToShortTimeString()), room);`
`96`		`- messageSent = true;`
	`100`	`+ return true;`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`query = StripCommand(message, Options.NotificationOptions.APICommand);`
`101`		`- if(query != null && userID != toID)`
	`105`	`+ if (query != null && userID != toID)`
`102`	`106`	`{`
`103`	`107`	`SendMessageAfterDelay(toID, "This command will only work in private to protect privacy.", room);`
`104`		`- messageSent = true;`
	`108`	`+ return true;`
`105`	`109`	`}`
`106`		`- else if(query != null && query.Length == 2 && userID == toID)`
	`110`	`+ else if (query != null && userID == toID && query.Length == 1)`
	`111`	`+ {`
	`112`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.APICommand + " <apikey>", room);`
	`113`	`+ return true;`
	`114`	`+ }`
	`115`	`+ else if (query != null && query.Length == 2 && userID == toID)`
`107`	`116`	`{`
`108`	`117`	`CheckIfDBExists(userID);`
`109`	`118`	`string api = query[1];`
`@@ -116,27 +125,27 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`116`	`125`	`};`
`117`	`126`
`118`	`127`	`PushResponse response = client.PushNote(note);`
`119`		`- if(response == null)`
	`128`	`+ if (response == null)`
`120`	`129`	`{`
`121`	`130`	`SendMessageAfterDelay(toID, "Your push failed. Most likely your API key is incorrect.", room);`
`122`		`- messageSent = true;`
	`131`	`+ return true;`
`123`	`132`	`}`
`124`	`133`	`else`
`125`	`134`	`{`
`126`	`135`	`SendMessageAfterDelay(toID, "Your push was a success.", room);`
`127`		`- messageSent = true;`
	`136`	`+ return true;`
`128`	`137`	`}`
`129`	`138`	`}`
`130`	`139`
`131`	`140`	`query = StripCommand(message, Options.NotificationOptions.FilterCommand);`
`132`		`- if(query != null && query.Length == 1)`
	`141`	`+ if (query != null && query.Length == 1)`
`133`	`142`	`{`
`134`		`- SendMessageAfterDelay(toID, "Available sub commands: add, list, clear, delete", room);`
`135`		`- messageSent = true;`
	`143`	`+ SendMessageAfterDelay(toID, "Usage: " + Options.NotificationOptions.FilterCommand + "<subcommand> [query]\nAvailable sub commands: add, list, clear, delete", room);`
	`144`	`+ return true;`
`136`	`145`	`}`
`137`		`- else if(query != null && query.Length >= 2)`
	`146`	`+ else if (query != null && query.Length >= 2)`
`138`	`147`	`{`
`139`		`- if(query[1] == "add" && query.Length >= 3)`
	`148`	`+ if (query[1] == "add" && query.Length >= 3)`
`140`	`149`	`{`
`141`	`150`
`142`	`151`	`List<string> words = new List<string>();`
`@@ -149,42 +158,42 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`149`	`158`
`150`	`159`	`db[userID].pb.filter = words;`
`151`	`160`	`SendMessageAfterDelay(toID, "Your filter has been successfully modified.", room);`
`152`		`- messageSent = true;`
	`161`	`+ return true;`
`153`	`162`	`}`
`154`		`- else if(query[1] == "list" && query.Length == 2)`
	`163`	`+ else if (query[1] == "list" && query.Length == 2)`
`155`	`164`	`{`
`156`	`165`	`if (db[userID].pb.filter.Count > 0)`
`157`	`166`	`{`
`158`	`167`	`string words = string.Join(", ", db[userID].pb.filter);`
`159`	`168`	`SendMessageAfterDelay(userID, "Your filter: " + words, false);`
`160`		`- messageSent = true;`
	`169`	`+ return true;`
`161`	`170`	`}`
`162`	`171`	`else`
`163`	`172`	`{`
`164`	`173`	`SendMessageAfterDelay(userID, "Your filter is empty. Use \"!filter add <words>\" to add to your filter", false);`
`165`		`- messageSent = true;`
	`174`	`+ return true;`
`166`	`175`	`}`
`167`	`176`	`}`
`168`		`- else if(query[1] == "clear" && query.Length == 2)`
	`177`	`+ else if (query[1] == "clear" && query.Length == 2)`
`169`	`178`	`{`
`170`	`179`	`db[userID].pb.filter.Clear();`
`171`	`180`	`SendMessageAfterDelay(toID, "Your filter has been cleared", room);`
`172`		`- messageSent = true;`
	`181`	`+ return true;`
`173`	`182`	`}`
`174`		`- else if(query[1] == "delete" && query.Length == 3)`
	`183`	`+ else if (query[1] == "delete" && query.Length == 3)`
`175`	`184`	`{`
`176`	`185`	`db[userID].pb.filter.Remove(query[2]);`
`177`	`186`	`SendMessageAfterDelay(toID, "The filter \"" + query[2] + "\" has been removed", room);`
`178`		`- messageSent = true;`
	`187`	`+ return true;`
`179`	`188`	`}`
`180`	`189`	`}`
`181`	`190`
`182`	`191`	`query = StripCommand(message, Options.NotificationOptions.ClearCommand);`
`183`		`- if(query != null)`
	`192`	`+ if (query != null)`
`184`	`193`	`{`
`185`	`194`	`db[userID] = null;`
`186`	`195`	`SendMessageAfterDelay(toID, "Your database file has been cleared.", room);`
`187`		`- messageSent = true;`
	`196`	`+ return true;`
`188`	`197`	`}`
`189`	`198`
`190`	`199`
`@@ -211,8 +220,7 @@ private bool Respond(SteamID toID, SteamID userID, string message, bool room)`
`211`	`220`	`}`
`212`	`221`	`}`
`213`	`222`	`}`
`214`		`-`
`215`		`- return messageSent;`
	`223`	`+ return false;`
`216`	`224`	`}`
`217`	`225`
`218`	`226`	`private void CheckIfDBExists(SteamID userID)`