+ Added additional checks for colors
This commit is contained in:
@@ -191,6 +191,7 @@
|
||||
"Localized Strings","MusicInfo",""
|
||||
"Localized Strings","MusicVolChanged","Volume set to %s!"
|
||||
"Localized Strings","MusicVolCurrent","Volume is at %s!"
|
||||
"Localized Strings","MusicVolOOB",""
|
||||
"Localized Strings","PerishInfo","Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned"
|
||||
"Localized Strings","PingInfo","Will respond with Pong!"
|
||||
"Localized Strings","PingResponse","Pong!"
|
||||
|
||||
|
@@ -32,7 +32,7 @@ public class CommandColor extends Command
|
||||
public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
|
||||
{
|
||||
// First, try and parse out the color to make sure we can even get it.
|
||||
ColorData colorData = theColorAPI.lookupHex(input.args.trim());
|
||||
ColorData colorData = theColorAPI.lookupHex(input.args);
|
||||
|
||||
// Verify the color was even found
|
||||
if(colorData == null)
|
||||
|
||||
@@ -73,9 +73,22 @@ public class NetworkTheColorAPI
|
||||
|
||||
public ColorData lookupHex(String hex)
|
||||
{
|
||||
if(hex == null)
|
||||
return null;
|
||||
|
||||
hex = hex.replace("#", "").trim();
|
||||
int len = hex.length();
|
||||
|
||||
if(len == 0)
|
||||
return null;
|
||||
|
||||
// Verify we're either a full or half length color. Intermediate colors not supported.
|
||||
// Alpha is also not supported.
|
||||
if(len != 6 && len != 3)
|
||||
return null;
|
||||
|
||||
try
|
||||
{
|
||||
hex = hex.replace("#", "").trim();
|
||||
String hexUpper = hex.toUpperCase();
|
||||
|
||||
// Verify the number is hex.
|
||||
|
||||
Reference in New Issue
Block a user