Skip to content

Commit

Permalink
Minor refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@Plenyx
Plenyx committed Feb 1, 2025
1 parent 1571132 commit 6918c29
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 32 deletions.
1 change: 0 additions & 1 deletion Forms/FormTwitchNameSetup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ internal FormTwitchNameSetup(FormMain mainLink)
Icon = Resources.AppIcon;
}


private async void ButtonNext_Click(object sender, EventArgs e)
{
var channelInput = textBoxChannelUrl.Text.ToLower();
Expand Down
62 changes: 31 additions & 31 deletions Tools/SessionTextConstructor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace PlenBotLogUploader.Tools;

internal static class SessionTextConstructor
{
// consts
private const int MaxAllowedMessageSize = 1750;
// constants
private const int maxAllowedMessageSize = 1750;

// fields
private static readonly DiscordApiJsonContentEmbedThumbnail DefaultThumbnail = new()
Expand All @@ -33,43 +33,43 @@ private static DiscordApiJsonContentEmbed MakeEmbedFromText(string title, string
Thumbnail = DefaultThumbnail,
};

internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reportsJSON, LogSessionSettings logSessionSettings)
internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reportsJson, LogSessionSettings logSessionSettings)
{
var discordEmbedsSuccessFailure = new List<DiscordApiJsonContentEmbed>();
var discordEmbedsSuccess = new List<DiscordApiJsonContentEmbed>();
var discordEmbedsFailure = new List<DiscordApiJsonContentEmbed>();
DiscordApiJsonContentEmbed discordEmbedSummary = null;

var raidLogs = logSessionSettings.SortBy.Equals(LogSessionSortBy.Wing) ?
reportsJSON
reportsJson
.Where(x => Bosses.GetWingForBoss(x.Evtc.BossId) > 0)
.Select(x => new { LogData = x, RaidWing = Bosses.GetWingForBoss(x.Evtc.BossId) })
.OrderBy(x => Bosses.GetWingForBoss(x.LogData.Evtc.BossId))
.ThenBy(x => Bosses.GetBossOrder(x.LogData.Encounter.BossId))
.ThenBy(x => x.LogData.UploadTime)
.ToArray() :
reportsJSON
reportsJson
.Where(x => Bosses.GetWingForBoss(x.Evtc.BossId) > 0)
.Select(x => new { LogData = x, RaidWing = Bosses.GetWingForBoss(x.Evtc.BossId) })
.OrderBy(x => x.LogData.UploadTime)
.ToArray();
var fractalLogs = reportsJSON
var fractalLogs = reportsJson
.Where(x => Bosses.All
.Any(y => y.BossId.Equals(x.Evtc.BossId) && y.Type.Equals(BossType.Fractal)))
.ToArray();
var strikeLogs = reportsJSON
var strikeLogs = reportsJson
.Where(x => Bosses.All
.Any(y => y.BossId.Equals(x.Evtc.BossId) && y.Type.Equals(BossType.Strike)))
.ToArray();
var golemLogs = reportsJSON
var golemLogs = reportsJson
.Where(x => Bosses.All
.Any(y => y.BossId.Equals(x.Evtc.BossId) && y.Type.Equals(BossType.Golem)))
.ToArray();
var wvwLogs = reportsJSON
var wvwLogs = reportsJson
.Where(x => Bosses.All
.Any(y => y.BossId.Equals(x.Evtc.BossId) && y.Type.Equals(BossType.WvW)))
.ToArray();
var otherLogs = reportsJSON
var otherLogs = reportsJson
.Where(x =>
Bosses.All
.Any(y => y.BossId.Equals(x.Evtc.BossId) && y.Type.Equals(BossType.None)) ||
Expand Down Expand Up @@ -111,7 +111,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
}

builderSuccessFailure.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -121,7 +121,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (data.LogData.Encounter.Success ?? false)
{
builderSuccess.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -132,7 +132,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -175,7 +175,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
}

builderSuccessFailure.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -185,7 +185,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (data.LogData.Encounter.Success ?? false)
{
builderSuccess.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -196,7 +196,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append('[').Append(bossName).Append("](").Append(data.LogData.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -247,7 +247,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
}

builderSuccessFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -257,7 +257,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (log.Encounter.Success ?? false)
{
builderSuccess.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -268,7 +268,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -318,7 +318,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
}

builderSuccessFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -328,7 +328,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (log.Encounter.Success ?? false)
{
builderSuccess.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -339,7 +339,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -369,7 +369,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
foreach (var log in golemLogs.AsSpan())
{
builderSuccessFailure.Append(log.ConfigAwarePermalink).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -379,7 +379,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (log.Encounter.Success ?? false)
{
builderSuccess.Append(log.ConfigAwarePermalink).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -390,7 +390,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append(log.ConfigAwarePermalink).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -444,7 +444,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
foreach (var log in wvwLogs.AsSpan())
{
builderSuccessFailure.Append(log.ConfigAwarePermalink).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -454,7 +454,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (log.Encounter.Success ?? false)
{
builderSuccess.Append(log.ConfigAwarePermalink).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -465,7 +465,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append(log.ConfigAwarePermalink).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down Expand Up @@ -511,7 +511,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
}

builderSuccessFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccessFailure.Length >= MaxAllowedMessageSize)
if (builderSuccessFailure.Length >= maxAllowedMessageSize)
{
messageSuccessFailureCount++;
discordEmbedsSuccessFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessFailureCount > 1 ? $" part {messageSuccessFailureCount}" : ""), builderSuccessFailure.ToString()));
Expand All @@ -521,7 +521,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
if (log.Encounter.Success ?? false)
{
builderSuccess.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderSuccess.Length >= MaxAllowedMessageSize)
if (builderSuccess.Length >= maxAllowedMessageSize)
{
messageSuccessCount++;
discordEmbedsSuccess.Add(MakeEmbedFromText(logSessionSettings.Name + (messageSuccessCount > 1 ? $" part {messageSuccessCount}" : ""), builderSuccess.ToString()));
Expand All @@ -532,7 +532,7 @@ internal static DiscordEmbeds ConstructSessionEmbeds(List<DpsReportJson> reports
else
{
builderFailure.Append('[').Append(bossName).Append("](").Append(log.ConfigAwarePermalink).Append(')').Append(duration).Append(successText).Append('\n');
if (builderFailure.Length >= MaxAllowedMessageSize)
if (builderFailure.Length >= maxAllowedMessageSize)
{
messageFailureCount++;
discordEmbedsFailure.Add(MakeEmbedFromText(logSessionSettings.Name + (messageFailureCount > 1 ? $" part {messageFailureCount}" : ""), builderFailure.ToString()));
Expand Down

0 comments on commit 6918c29

Please sign in to comment.