daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Upgrade to discord.net 2.0

Browse source
This commit is contained in:
runebaas 2018-05-17 22:06:58 +02:00
parent acb2b25e09
commit 4e4ef3584e
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
12 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Geekbot.net/Commands/Games/Pokedex.cs
View file

@ -4,6 +4,7 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using PokeAPI;
namespace Geekbot.net.Commands.Games

5
Geekbot.net/Commands/Integrations/MagicTheGathering.cs
View file

@ -6,16 +6,17 @@ using Discord;
using Discord.Commands;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using MtgApiManager.Lib.Service;
namespace Geekbot.net.Commands.Integrations
{
public class Magicthegathering : ModuleBase
public class MagicTheGathering : ModuleBase
{
private readonly IErrorHandler _errorHandler;
private readonly IMtgManaConverter _manaConverter;
public Magicthegathering(IErrorHandler errorHandler, IMtgManaConverter manaConverter)
public MagicTheGathering(IErrorHandler errorHandler, IMtgManaConverter manaConverter)
{
_errorHandler = errorHandler;
_manaConverter = manaConverter;

1
Geekbot.net/Commands/Integrations/Mal.cs
View file

@ -5,6 +5,7 @@ using Discord;
using Discord.Commands;
using Geekbot.net.Lib.Clients;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
namespace Geekbot.net.Commands.Integrations
{

1
Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
View file

@ -5,6 +5,7 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Newtonsoft.Json;
namespace Geekbot.net.Commands.Integrations.UbranDictionary

6
Geekbot.net/Commands/Randomness/RandomAnimals.cs
View file

@ -65,11 +65,9 @@ namespace Geekbot.net.Commands.Randomness
await ReplyAsync("", false, Eb(_mediaProvider.GetFox()));
}
private EmbedBuilder Eb(string image)
private static Embed Eb(string image)
{
var eb = new EmbedBuilder();
eb.ImageUrl = image;
return eb;
return new EmbedBuilder {ImageUrl = image}.Build();
}
}
}

1
Geekbot.net/Commands/Utils/Info.cs
View file

@ -7,6 +7,7 @@ using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
namespace Geekbot.net.Commands.Utils
{

1
Geekbot.net/Commands/Utils/Poll/Poll.cs
View file

@ -7,6 +7,7 @@ using Discord;
using Discord.Commands;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.UserRepository;
using Newtonsoft.Json;
using StackExchange.Redis;

11
Geekbot.net/Commands/Utils/Quote/Quote.cs
View file

@ -187,12 +187,11 @@ namespace Geekbot.net.Commands.Utils.Quote
try
{
var list = Context.Channel.GetMessagesAsync().Flatten();
await list;
return list.Result
.First(msg => msg.Author.Id == user.Id
&& msg.Embeds.Count == 0
&& msg.Id != Context.Message.Id
&& !msg.Content.ToLower().StartsWith("!"));
return await list.FirstOrDefault(msg =>
msg.Author.Id == user.Id &&
msg.Embeds.Count == 0 &&
msg.Id != Context.Message.Id &&
!msg.Content.ToLower().StartsWith("!"));
}
catch
{