github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Added Msg.Content Null Check For Prefixes (#1200)

Browse Source 
* Added Msg.Content Null Check

* Minor Change

* Grouped Params In If Statement

* Minor Change
This commit is contained in:
ComputerMaster1st
2018-11-29 22:13:50 +00:00
committed by Christopher F
parent 7366cd4361
commit 46e2674a93
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Commands/Extensions/MessageExtensions.cs
View File

@@ -19,7 +19,7 @@ namespace Discord.Commands
public static bool HasCharPrefix(this IUserMessage msg, char c, ref int argPos) public static bool HasCharPrefix(this IUserMessage msg, char c, ref int argPos)
{ {
var text = msg.Content; var text = msg.Content;
if (text.Length > 0 && text[0] == c) if (!string.IsNullOrEmpty(text) && text[0] == c)
{ {
argPos = 1; argPos = 1;
return true; return true;
@@ -32,7 +32,7 @@ namespace Discord.Commands
public static bool HasStringPrefix(this IUserMessage msg, string str, ref int argPos, StringComparison comparisonType = StringComparison.Ordinal) public static bool HasStringPrefix(this IUserMessage msg, string str, ref int argPos, StringComparison comparisonType = StringComparison.Ordinal)
{ {
var text = msg.Content; var text = msg.Content;
if (text.StartsWith(str, comparisonType)) if (!string.IsNullOrEmpty(text) && text.StartsWith(str, comparisonType))
{ {
argPos = str.Length; argPos = str.Length;
return true; return true;
@@ -45,7 +45,7 @@ namespace Discord.Commands
public static bool HasMentionPrefix(this IUserMessage msg, IUser user, ref int argPos) public static bool HasMentionPrefix(this IUserMessage msg, IUser user, ref int argPos)
{ {
var text = msg.Content; var text = msg.Content;
if (text.Length <= 3 || text[0] != '<' || text[1] != '@') return false; if (string.IsNullOrEmpty(text) || text.Length <= 3 || text[0] != '<' || text[1] != '@') return false;
int endPos = text.IndexOf('>'); int endPos = text.IndexOf('>');
if (endPos == -1) return false; if (endPos == -1) return false;