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

Merge branch 'dev' into 1.4

Browse Source
This commit is contained in:
Master Kwoth
2017-05-02 11:02:09 +02:00
parent 9579ab7902 3ff989cf92
commit f5523c8469
12 changed files with 1647 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NadekoBot/Modules/NSFW/NSFW.cs
View File

@@ -212,12 +212,6 @@ namespace NadekoBot.Modules.NSFW
public Task Gelbooru([Remainder] string tag = null)
=> InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Gelbooru);
[NadekoCommand, Usage, Description, Aliases]
public async Task Cp()
{
await Context.Channel.SendMessageAsync("http://i.imgur.com/MZkY1md.jpg").ConfigureAwait(false);
}
[NadekoCommand, Usage, Description, Aliases]
public async Task Boobs()
{

5
src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs
View File

@@ -173,13 +173,14 @@ namespace NadekoBot.Modules.Utility
using (var uow = DbHandler.UnitOfWork())
{
var users = uow._context.Set<RewardedUser>();
var usr = users.FirstOrDefault(x => x.UserId == userId);
var usr = users.FirstOrDefault(x => x.PatreonUserId == data.User.id);
if (usr == null)
{
users.Add(new RewardedUser()
{
UserId = userId,
PatreonUserId = data.User.id,
LastReward = now,
AmountRewardedThisMonth = amount,
});
@@ -194,6 +195,7 @@ namespace NadekoBot.Modules.Utility
{
usr.LastReward = now;
usr.AmountRewardedThisMonth = amount;
usr.PatreonUserId = data.User.id;
await CurrencyHandler.AddCurrencyAsync(userId, "Patreon reward - recurring", amount, uow).ConfigureAwait(false);
@@ -207,6 +209,7 @@ namespace NadekoBot.Modules.Utility
usr.LastReward = now;
usr.AmountRewardedThisMonth = amount;
usr.PatreonUserId = data.User.id;
await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward - update", toAward, uow).ConfigureAwait(false);