mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

invalid hex error

Browse Source
This commit is contained in:
Master Kwoth 2017-06-15 20:04:15 +02:00
parent 06693b9b34
commit 4e7b7a6ee5
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NadekoBot/Modules/Searches/Searches.cs
View File

@ -637,9 +637,21 @@ namespace NadekoBot.Modules.Searches
color = color?.Trim().Replace("#", ""); color = color?.Trim().Replace("#", "");
if (string.IsNullOrWhiteSpace(color)) if (string.IsNullOrWhiteSpace(color))
return; return;
ImageSharp.Color clr;
try
{
clr = ImageSharp.Color.FromHex(color);
}
catch
{
await ReplyErrorLocalized("hex_invalid").ConfigureAwait(false);
return;
}
var img = new ImageSharp.Image(50, 50); var img = new ImageSharp.Image(50, 50);
img.BackgroundColor(ImageSharp.Color.FromHex(color)); img.BackgroundColor(clr);
await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false);
} }

17
src/NadekoBot/Services/Administration/VplusTService.cs
View File

@ -93,16 +93,11 @@ namespace NadekoBot.Services.Administration
var beforeRoleName = GetRoleName(beforeVch); var beforeRoleName = GetRoleName(beforeVch);
var beforeRole = guild.Roles.FirstOrDefault(x => x.Name == beforeRoleName); var beforeRole = guild.Roles.FirstOrDefault(x => x.Name == beforeRoleName);
if (beforeRole != null) if (beforeRole != null)
try {
{ _log.Info("Removing role " + beforeRoleName + " from user " + user.Username);
_log.Info("Removing role " + beforeRoleName + " from user " + user.Username); await user.RemoveRoleAsync(beforeRole).ConfigureAwait(false);
await user.RemoveRoleAsync(beforeRole).ConfigureAwait(false); await Task.Delay(200).ConfigureAwait(false);
await Task.Delay(200).ConfigureAwait(false); }
}
catch (Exception ex)
{
_log.Warn(ex);
}
} }
var afterVch = after.VoiceChannel; var afterVch = after.VoiceChannel;
if (afterVch != null && guild.AFKChannel?.Id != afterVch.Id) if (afterVch != null && guild.AFKChannel?.Id != afterVch.Id)
@ -130,7 +125,7 @@ namespace NadekoBot.Services.Administration
.ConfigureAwait(false); .ConfigureAwait(false);
await Task.Delay(50).ConfigureAwait(false); await Task.Delay(50).ConfigureAwait(false);
} }
_log.Warn("Adding role " + roleToAdd.Name + " to user " + user.Username); _log.Info("Adding role " + roleToAdd.Name + " to user " + user.Username);
await user.AddRoleAsync(roleToAdd).ConfigureAwait(false); await user.AddRoleAsync(roleToAdd).ConfigureAwait(false);
} }
} }

1
src/NadekoBot/_strings/ResponseStrings.en-US.json
View File

@ -534,6 +534,7 @@
"searches_hashtag_error": "Failed finding a definition for that tag.", "searches_hashtag_error": "Failed finding a definition for that tag.",
"searches_height_weight": "Height/Weight", "searches_height_weight": "Height/Weight",
"searches_height_weight_val": "{0}m/{1}kg", "searches_height_weight_val": "{0}m/{1}kg",
"searches_hex_invalid": "Invalid color specified.",
"searches_humidity": "Humidity", "searches_humidity": "Humidity",
"searches_image_search_for": "Image search for:", "searches_image_search_for": "Image search for:",
"searches_imdb_fail": "Failed to find that movie.", "searches_imdb_fail": "Failed to find that movie.",