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

Merge pull request #997 from samdivaio/dev

Browse Source 
tiny ~ow fix
This commit is contained in:
Master Kwoth
2017-01-23 02:05:01 +01:00
committed by GitHub
parent f7af4c9584 6e7165cc5a
commit 2e2894fd5e
1 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs
View File

@@ -1,102 +1,98 @@
using Discord; using Discord;
using Discord.Commands; using Discord.Commands;
using NadekoBot.Attributes; using NadekoBot.Attributes;
using NadekoBot.Extensions; using NadekoBot.Extensions;
using NadekoBot.Modules.Searches.Models; using NadekoBot.Modules.Searches.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using NLog; using NLog;
using System.Net.Http; using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace NadekoBot.Modules.Searches namespace NadekoBot.Modules.Searches
{ {
public partial class Searches public partial class Searches
{ {
[Group] [Group]
public class OverwatchCommands : ModuleBase public class OverwatchCommands : ModuleBase
{ {
private readonly Logger _log; private readonly Logger _log;
public OverwatchCommands() public OverwatchCommands()
{ {
_log = LogManager.GetCurrentClassLogger(); _log = LogManager.GetCurrentClassLogger();
} }
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
public async Task Overwatch(string region, [Remainder] string query = null) public async Task Overwatch(string region, [Remainder] string query = null)
{ {
if (string.IsNullOrWhiteSpace(query)) if (string.IsNullOrWhiteSpace(query))
return; return;
var battletag = Regex.Replace(query, "#", "-", RegexOptions.IgnoreCase); var battletag = Regex.Replace(query, "#", "-", RegexOptions.IgnoreCase);
await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); await Context.Channel.TriggerTypingAsync().ConfigureAwait(false);
try try
{ {
await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); await Context.Channel.TriggerTypingAsync().ConfigureAwait(false);
var model = await GetProfile(region, battletag); var model = await GetProfile(region, battletag);
var rankimg = $"{model.Competitive.rank_img}"; var rankimg = $"{model.Competitive.rank_img}";
var rank = $"{model.Competitive.rank}"; var rank = $"{model.Competitive.rank}";
var competitiveplay = $"{model.Games.Competitive.played}"; var competitiveplay = $"{model.Games.Competitive.played}";
if (string.IsNullOrWhiteSpace(rank)) if (string.IsNullOrWhiteSpace(rank))
{ {
var embed = new EmbedBuilder() var embed = new EmbedBuilder()
.WithAuthor(eau => eau.WithName($"{model.username}") .WithAuthor(eau => eau.WithName($"{model.username}")
.WithUrl($"https://www.overbuff.com/players/pc/{battletag}") .WithUrl($"https://www.overbuff.com/players/pc/{battletag}")
.WithIconUrl($"{model.avatar}")) .WithIconUrl($"{model.avatar}"))
.WithThumbnailUrl("https://cdn.discordapp.com/attachments/155726317222887425/255653487512256512/YZ4w2ey.png") .WithThumbnailUrl("https://cdn.discordapp.com/attachments/155726317222887425/255653487512256512/YZ4w2ey.png")
.AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true)) .AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true))
.AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) .AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Wins**").WithValue($"{model.Games.Competitive.wins}").WithIsInline(true)) .AddField(fb => fb.WithName("**Competitive Rank**").WithValue("0").WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Loses**").WithValue($"{model.Games.Competitive.lost}").WithIsInline(true)) .AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Played**").WithValue($"{model.Games.Competitive.played}").WithIsInline(true)) .WithOkColor();
.AddField(fb => fb.WithName("**Competitive Rank**").WithValue("0").WithIsInline(true)) await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
.AddField(fb => fb.WithName("**Competitive Playtime**").WithValue($"{model.Playtime.competitive}").WithIsInline(true)) }
.AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true)) else
.WithOkColor(); {
await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); var embed = new EmbedBuilder()
} .WithAuthor(eau => eau.WithName($"{model.username}")
else .WithUrl($"https://www.overbuff.com/players/pc/{battletag}")
{ .WithIconUrl($"{model.avatar}"))
var embed = new EmbedBuilder() .WithThumbnailUrl(rankimg)
.WithAuthor(eau => eau.WithName($"{model.username}") .AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true))
.WithUrl($"https://www.overbuff.com/players/pc/{battletag}") .AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true))
.WithIconUrl($"{model.avatar}")) .AddField(fb => fb.WithName("**Current Competitive Wins**").WithValue($"{model.Games.Competitive.wins}").WithIsInline(true))
.WithThumbnailUrl(rankimg) .AddField(fb => fb.WithName("**Current Competitive Loses**").WithValue($"{model.Games.Competitive.lost}").WithIsInline(true))
.AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true)) .AddField(fb => fb.WithName("**Current Competitive Played**").WithValue($"{model.Games.Competitive.played}").WithIsInline(true))
.AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) .AddField(fb => fb.WithName("**Competitive Rank**").WithValue(rank).WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Wins**").WithValue($"{model.Games.Competitive.wins}").WithIsInline(true)) .AddField(fb => fb.WithName("**Competitive Playtime**").WithValue($"{model.Playtime.competitive}").WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Loses**").WithValue($"{model.Games.Competitive.lost}").WithIsInline(true)) .AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true))
.AddField(fb => fb.WithName("**Current Competitive Played**").WithValue($"{model.Games.Competitive.played}").WithIsInline(true)) .WithColor(NadekoBot.OkColor);
.AddField(fb => fb.WithName("**Competitive Rank**").WithValue(rank).WithIsInline(true)) await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
.AddField(fb => fb.WithName("**Competitive Playtime**").WithValue($"{model.Playtime.competitive}").WithIsInline(true)) return;
.AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true)) }
.WithColor(NadekoBot.OkColor); }
await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); catch
return; {
} await Context.Channel.SendErrorAsync("Found no user! Please check the **Region** and **BattleTag** before trying again.");
} }
catch }
{ public async Task<OverwatchApiModel.OverwatchPlayer.Data> GetProfile(string region, string battletag)
await Context.Channel.SendErrorAsync("Found no user! Please check the **Region** and **BattleTag** before trying again."); {
} try
} {
public async Task<OverwatchApiModel.OverwatchPlayer.Data> GetProfile(string region, string battletag) using (var http = new HttpClient())
{ {
try var Url = await http.GetStringAsync($"https://api.lootbox.eu/pc/{region.ToLower()}/{battletag}/profile");
{ var model = JsonConvert.DeserializeObject<OverwatchApiModel.OverwatchPlayer>(Url);
using (var http = new HttpClient()) return model.data;
{ }
var Url = await http.GetStringAsync($"https://api.lootbox.eu/pc/{region.ToLower()}/{battletag}/profile"); }
var model = JsonConvert.DeserializeObject<OverwatchApiModel.OverwatchPlayer>(Url); catch
return model.data; {
} return null;
} }
catch }
{
return null; }
} }
} }
}
}
}