mirror of
https://github.com/PluralKit/PluralKit.git
synced 2026-02-07 06:17:55 +00:00
Fix front percent returning negative percentages and ranges
This commit is contained in:
parent
548fe09fd4
commit
f53344cd89
4 changed files with 12 additions and 11 deletions
|
|
@ -214,15 +214,15 @@ namespace PluralKit.Bot.Commands
|
|||
{
|
||||
var system = ContextEntity ?? Context.SenderSystem;
|
||||
if (system == null) throw Errors.NoSystemError;
|
||||
|
||||
var now = SystemClock.Instance.GetCurrentInstant();
|
||||
|
||||
var duration = PluralKit.Utils.ParsePeriod(durationStr);
|
||||
if (duration == null) throw Errors.InvalidDateTime(durationStr);
|
||||
var rangeStart = PluralKit.Utils.ParseDateTime(durationStr);
|
||||
if (rangeStart == null) throw Errors.InvalidDateTime(durationStr);
|
||||
if (rangeStart.Value.ToInstant() > now) throw Errors.FrontPercentTimeInFuture;
|
||||
|
||||
var rangeEnd = SystemClock.Instance.GetCurrentInstant();
|
||||
var rangeStart = rangeEnd - duration.Value;
|
||||
|
||||
var frontpercent = await Switches.GetPerMemberSwitchDuration(system, rangeEnd - duration.Value, rangeEnd);
|
||||
await Context.Channel.SendMessageAsync(embed: await EmbedService.CreateFrontPercentEmbed(frontpercent, rangeStart.InZone(system.Zone)));
|
||||
var frontpercent = await Switches.GetPerMemberSwitchDuration(system, rangeStart.Value.ToInstant(), now);
|
||||
await Context.Channel.SendMessageAsync(embed: await EmbedService.CreateFrontPercentEmbed(frontpercent, system.Zone));
|
||||
}
|
||||
|
||||
[Command("timezone")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue