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

Added Use button on sucessful .xpshopbuy or when a user already owns the item

Browse Source
This commit is contained in:
Kwoth
2022-08-08 16:17:30 +02:00
parent 38e3badb87
commit 6b9a858f28
8 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,7 @@ public partial class Xp : NadekoModule<XpService>
var button = new ButtonBuilder(ownedItem.IsUsing
? GetText(strs.in_use)
: GetText(strs.use),
"XP_SHOP_USE",
"xpshop:use",
emote: Emoji.Parse("👐"),
isDisabled: ownedItem.IsUsing);
@@ -446,7 +446,7 @@ public partial class Xp : NadekoModule<XpService>
else
{
var button = new ButtonBuilder(GetText(strs.buy),
"XP_SHOP_BUY",
"xpshop:buy",
emote: Emoji.Parse("💰"));
var inter = new SimpleInteraction<(string key, XpShopItemType type)?>(
@@ -467,12 +467,22 @@ public partial class Xp : NadekoModule<XpService>
{
var result = await _service.BuyShopItemAsync(ctx.User.Id, (XpShopItemType)type, key);
NadekoInteraction GetUseInteraction()
{
return _inter.Create(ctx.User.Id,
new SimpleInteraction<object>(
new ButtonBuilder(label: "Use", customId: "xpshop:use_item", emote: Emoji.Parse("👐")),
async (smc, _) => await XpShopUse(type, key)
));
}
if (result != BuyResult.Success)
{
var _ = result switch
{
BuyResult.XpShopDisabled => await ReplyErrorLocalizedAsync(strs.xp_shop_disabled),
BuyResult.InsufficientFunds => await ReplyErrorLocalizedAsync(strs.not_enough(_gss.Data.Currency.Sign)),
BuyResult.AlreadyOwned => await ReplyErrorLocalizedAsync(strs.xpshop_already_owned),
BuyResult.AlreadyOwned => await ReplyErrorLocalizedAsync(strs.xpshop_already_owned, GetUseInteraction()),
BuyResult.UnknownItem => await ReplyErrorLocalizedAsync(strs.xpshop_item_not_found),
BuyResult.InsufficientPatronTier => await ReplyErrorLocalizedAsync(strs.patron_insuff_tier),
_ => throw new ArgumentOutOfRangeException()
@@ -481,7 +491,8 @@ public partial class Xp : NadekoModule<XpService>
}
await ReplyConfirmLocalizedAsync(strs.xpshop_buy_success(type.ToString().ToLowerInvariant(),
key.ToLowerInvariant()));
key.ToLowerInvariant()),
GetUseInteraction());
}
[Cmd]

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

@@ -1394,7 +1394,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
var conf = _xpConfig.Data;
if (!conf.Shop.IsEnabled)
return BuyResult.UnknownItem;
return BuyResult.XpShopDisabled;
var req = type == XpShopItemType.Background
? conf.Shop.BgsTierRequirement
@@ -1545,6 +1545,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
public enum BuyResult
{
Success,
XpShopDisabled,
AlreadyOwned,
InsufficientFunds,
UnknownItem,