From 682ecb6f0831219cdc58d0afbbd7e64054e41604 Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Sat, 5 Apr 2025 19:44:45 +1300
Subject: [PATCH] fixed base amount in .vote
---
.../Modules/Gambling/GamblingService.cs | 17 ++++++++++-------
.../Modules/Searches/Feeds/FeedCommands.cs | 5 ++++-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/EllieBot/Modules/Gambling/GamblingService.cs b/src/EllieBot/Modules/Gambling/GamblingService.cs
index 7aab1d0..0b4308d 100644
--- a/src/EllieBot/Modules/Gambling/GamblingService.cs
+++ b/src/EllieBot/Modules/Gambling/GamblingService.cs
@@ -3,6 +3,7 @@ using System.Globalization;
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using EllieBot.Common.ModuleBehaviors;
+using EllieBot.Common.TypeReaders;
using EllieBot.Db.Models;
using EllieBot.Modules.Gambling.Common;
using EllieBot.Modules.Gambling.Common.Connect4;
@@ -208,8 +209,9 @@ public class GamblingService : IEService, IReadyExecutor
private string N(long amount)
=> CurrencyHelper.N(amount, CultureInfo.InvariantCulture, _gcs.Data.Currency.Sign);
- public async Task<(long val, string msg)> GetAmountAndMessage(ulong userId, long originalAmount)
+ public async Task<(long val, string msg)> GetAmountAndMessage(ulong userId, long baseAmount)
{
+ var totalAmount = baseAmount;
var gcsData = _gcs.Data;
var boostGuilds = gcsData.BoostBonus.GuildIds ?? [];
var guildUsers = await boostGuilds
@@ -232,19 +234,19 @@ public class GamblingService : IEService, IReadyExecutor
var booster = userInfo != default;
if (booster)
- originalAmount += gcsData.BoostBonus.BaseTimelyBonus;
+ totalAmount += gcsData.BoostBonus.BaseTimelyBonus;
var hasCompletedDailies = await _quests.UserCompletedDailies(userId);
if (hasCompletedDailies)
- originalAmount = (long)(1.5 * originalAmount);
+ totalAmount = (long)(1.5 * totalAmount);
var patron = await _ps.GetPatronAsync(userId);
var percentBonus = (_ps.PercentBonus(patron) / 100f);
- originalAmount += (long)(originalAmount * percentBonus);
+ totalAmount += (long)(totalAmount * percentBonus);
- var msg = $"**{N(originalAmount)}** base reward\n\n";
+ var msg = $"**{N(baseAmount)}** base reward\n\n";
if (boostGuilds.Count > 0)
{
if (booster)
@@ -261,7 +263,7 @@ public class GamblingService : IEService, IReadyExecutor
else
msg += $"❌ *+0 bonus for the [Patreon](https://patreon.com/elliebot) pledge*\n";
}
-
+
if (hasCompletedDailies)
{
msg += $"✅ *+50% bonus for completing daily quests*\n";
@@ -271,6 +273,7 @@ public class GamblingService : IEService, IReadyExecutor
msg += $"❌ *+0 bonus for completing daily quests*\n";
}
- return (originalAmount, msg);
+
+ return (totalAmount, msg);
}
}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Searches/Feeds/FeedCommands.cs b/src/EllieBot/Modules/Searches/Feeds/FeedCommands.cs
index 4984ed4..5b7dece 100644
--- a/src/EllieBot/Modules/Searches/Feeds/FeedCommands.cs
+++ b/src/EllieBot/Modules/Searches/Feeds/FeedCommands.cs
@@ -10,7 +10,7 @@ public partial class Searches
public partial class FeedCommands : EllieModule<FeedsService>
{
private static readonly Regex _ytChannelRegex =
- new(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-_]{1,})");
+ MyRegex();
[Cmd]
[RequireContext(ContextType.Guild)]
@@ -146,5 +146,8 @@ public partial class Searches
})
.SendAsync();
}
+
+ [GeneratedRegex(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-_]{1,})")]
+ private static partial Regex MyRegex();
}
}
\ No newline at end of file