minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 09:18:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix to buttons not working when there's only one item, and buy db query

Browse Source
This commit is contained in:
Kwoth
2022-07-26 04:08:37 +02:00
parent 6a042c3faa
commit 516bc1e484
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/NadekoBot/Common/Interaction/SimpleInteraction.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace NadekoBot;
public class SimpleInteraction<T>
{
public ButtonBuilder Button { get; }
private readonly Func<SocketMessageComponent, T, Task> _onClick;
private readonly T? _state;
public SimpleInteraction(ButtonBuilder button, Func<SocketMessageComponent, T?, Task> onClick, T? state = default)
{
Button = button;
_onClick = onClick;
_state = state;
}
public async Task TriggerAsync(SocketMessageComponent smc)
{
await _onClick(smc, _state!);
}
}

19
src/NadekoBot/Modules/Xp/Xp.cs
View File

@@ -472,23 +472,4 @@ public partial class Xp : NadekoModule<XpService>
return GetText(strs.xpn_notif_disabled);
}
}
public class SimpleInteraction<T>
{
public ButtonBuilder Button { get; }
private readonly Func<SocketMessageComponent, T, Task> _onClick;
private readonly T? _state;
public SimpleInteraction(ButtonBuilder button, Func<SocketMessageComponent, T?, Task> onClick, T state = default)
{
Button = button;
_onClick = onClick;
_state = state;
}
public async Task TriggerAsync(SocketMessageComponent smc)
{
await _onClick(smc, _state);
}
}

2
src/NadekoBot/Modules/Xp/XpService.cs
View File

@@ -1337,7 +1337,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
// await using var tran = await ctx.Database.BeginTransactionAsync();
try
{
if (await ctx.GetTable<XpShopOwnedItem>().AnyAsyncLinqToDB(x => x.ItemKey == key && x.ItemType == type))
if (await ctx.GetTable<XpShopOwnedItem>().AnyAsyncLinqToDB(x => x.UserId == userId && x.ItemKey == key && x.ItemType == type))
return BuyResult.AlreadyOwned;
var item = GetShopItem(type, key);

2
src/NadekoBot/_Extensions/IMessageChannelExtensions.cs
View File

@@ -314,7 +314,7 @@ public static class MessageChannelExtensions
}
}
if (lastPage == 0)
if (lastPage == 0 && interFactory is null)
return;
var client = (DiscordSocketClient)ctx.Client;