+ Added additional checks for colors

This commit is contained in:
Matthew Cech
2020-02-25 21:11:56 -08:00
parent 3e48056b15
commit dc56532ed0
3 changed files with 16 additions and 2 deletions
+1
View File
@@ -191,6 +191,7 @@
"Localized Strings","MusicInfo","" "Localized Strings","MusicInfo",""
"Localized Strings","MusicVolChanged","Volume set to %s!" "Localized Strings","MusicVolChanged","Volume set to %s!"
"Localized Strings","MusicVolCurrent","Volume is at %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","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","PingInfo","Will respond with Pong!"
"Localized Strings","PingResponse","Pong!" "Localized Strings","PingResponse","Pong!"
1 Type Key Value
191 Localized Strings MusicInfo
192 Localized Strings MusicVolChanged Volume set to %s!
193 Localized Strings MusicVolCurrent Volume is at %s!
194 Localized Strings MusicVolOOB
195 Localized Strings PerishInfo Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned
196 Localized Strings PingInfo Will respond with Pong!
197 Localized Strings PingResponse Pong!
+1 -1
View File
@@ -32,7 +32,7 @@ public class CommandColor extends Command
public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) 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. // 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 // Verify the color was even found
if(colorData == null) if(colorData == null)
+14 -1
View File
@@ -73,9 +73,22 @@ public class NetworkTheColorAPI
public ColorData lookupHex(String hex) 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 try
{ {
hex = hex.replace("#", "").trim();
String hexUpper = hex.toUpperCase(); String hexUpper = hex.toUpperCase();
// Verify the number is hex. // Verify the number is hex.