Merge branch 'master' into 201-no-more-bots-message-in-log-channel

.github/workflows/build-pr.yml

@@ -23,9 +23,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: ReSharper CLI InspectCode
-        uses: muno92/resharper_inspectcode@1.11.0
+        uses: muno92/resharper_inspectcode@1.11.1
         with:
           solutionPath: ./Octobot.sln
-          ignoreIssueType: InvertIf, ConvertIfStatementToSwitchStatement
+          ignoreIssueType: InvertIf, ConvertIfStatementToSwitchStatement, ConvertToPrimaryConstructor
           extensions: ReSharperPlugin.CognitiveComplexity
           solutionWideAnalysis: true

Octobot.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Version>2.0.0</Version>
@@ -16,6 +16,7 @@
         <Company>LabsDevelopment</Company>
         <NeutralLanguage>en</NeutralLanguage>
         <Description>A general-purpose Discord bot for moderation written in C#</Description>
+        <ApplicationIcon>docs/octobot.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>

locale/Messages.resx

@@ -348,8 +348,8 @@
   <data name="DescriptionExternalEventCreated" xml:space="preserve">
     <value>The event will start at {0} until {1} in {2}</value>
   </data>
-  <data name="EventDetailsButton" xml:space="preserve">
+  <data name="OpenEventInfoButton" xml:space="preserve">
-    <value>Event details</value>
+      <value>Open Event Info</value>
   </data>
   <data name="EventDuration" xml:space="preserve">
     <value>The event has lasted for `{0}`</value>

locale/Messages.ru.resx

@@ -345,8 +345,8 @@
   <data name="DescriptionExternalEventCreated" xml:space="preserve">
     <value>Событие пройдёт с {0} до {1} в {2}</value>
   </data>
-  <data name="EventDetailsButton" xml:space="preserve">
+  <data name="OpenEventInfoButton" xml:space="preserve">
-    <value>Подробнее о событии</value>
+      <value>Открыть сведения о событии</value>
   </data>
   <data name="EventDuration" xml:space="preserve">
     <value>Событие длилось `{0}`</value>

locale/Messages.tt-ru.resx

@@ -348,8 +348,8 @@
   <data name="DescriptionExternalEventCreated" xml:space="preserve">
     <value>движуха будет происходить с {0} до {1} в {2}</value>
   </data>
-  <data name="EventDetailsButton" xml:space="preserve">
+  <data name="OpenEventInfoButton" xml:space="preserve">
-    <value>побольше о движухе</value>
+      <value>открыть ивент</value>
   </data>
   <data name="EventDuration" xml:space="preserve">
     <value>все это длилось `{0}`</value>

src/Commands/AboutCommandGroup.cs

@@ -88,7 +88,7 @@ public class AboutCommandGroup : CommandGroup
                 guildId, dev.Id, ct);
             var tag = guildMemberResult.IsSuccess ? $"<@{dev.Id}>" : $"@{dev.Username}";
 
-            builder.AppendLine($"- {tag} — {$"AboutDeveloper@{dev.Username}".Localized()}");
+            builder.AppendBulletPointLine($"{tag} — {$"AboutDeveloper@{dev.Username}".Localized()}");
         }
 
         builder.Append($"### [{Messages.AboutTitleRepository}](https://github.com/LabsDevelopment/Octobot)");

src/Commands/BanCommandGroup.cs

@@ -135,11 +135,10 @@ public class BanCommandGroup : CommandGroup
             return await _feedback.SendContextualEmbedResultAsync(errorEmbed, ct);
         }
 
-        var builder = new StringBuilder().Append("- ")
+        var builder = new StringBuilder().AppendBulletPointLine(string.Format(Messages.DescriptionActionReason, reason));
-            .AppendLine(string.Format(Messages.DescriptionActionReason, reason));
         if (duration is not null)
         {
-            builder.Append("- ").Append(
+            builder.AppendBulletPoint(
                 string.Format(
                     Messages.DescriptionActionExpiresAt,
                     Markdown.Timestamp(DateTimeOffset.UtcNow.Add(duration.Value))));
@@ -274,8 +273,7 @@ public class BanCommandGroup : CommandGroup
             .WithColour(ColorsList.Green).Build();
 
         var title = string.Format(Messages.UserUnbanned, target.GetTag());
-        var description = new StringBuilder().Append("- ")
+        var description = new StringBuilder().AppendBulletPoint(string.Format(Messages.DescriptionActionReason, reason));
-            .Append(string.Format(Messages.DescriptionActionReason, reason));
         var logResult = _utility.LogActionAsync(
             data.Settings, channelId, executor, title, description.ToString(), target, ColorsList.Green, ct: ct);
         if (!logResult.IsSuccess)

src/Commands/KickCommandGroup.cs

@@ -134,7 +134,7 @@ public class KickCommandGroup : CommandGroup
         {
             var dmEmbed = new EmbedBuilder().WithGuildTitle(guild)
                 .WithTitle(Messages.YouWereKicked)
-                .WithDescription($"- {string.Format(Messages.DescriptionActionReason, reason)}")
+                .WithDescription(MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason)))
                 .WithActionFooter(executor)
                 .WithCurrentTimestamp()
                 .WithColour(ColorsList.Red)
@@ -159,7 +159,7 @@ public class KickCommandGroup : CommandGroup
         data.GetOrCreateMemberData(target.ID).Roles.Clear();
 
         var title = string.Format(Messages.UserKicked, target.GetTag());
-        var description = $"- {string.Format(Messages.DescriptionActionReason, reason)}";
+        var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
         var logResult = _utility.LogActionAsync(
             data.Settings, channelId, executor, title, description, target, ColorsList.Red, ct: ct);
         if (!logResult.IsSuccess)

src/Commands/MuteCommandGroup.cs

@@ -136,8 +136,8 @@ public class MuteCommandGroup : CommandGroup
         }
 
         var title = string.Format(Messages.UserMuted, target.GetTag());
-        var description = new StringBuilder().Append("- ").AppendLine(string.Format(Messages.DescriptionActionReason, reason))
+        var description = new StringBuilder().AppendBulletPointLine(string.Format(Messages.DescriptionActionReason, reason))
-            .Append("- ").Append(string.Format(
+            .AppendBulletPoint(string.Format(
                 Messages.DescriptionActionExpiresAt, Markdown.Timestamp(until))).ToString();
 
         var logResult = _utility.LogActionAsync(
@@ -325,7 +325,7 @@ public class MuteCommandGroup : CommandGroup
         }
 
         var title = string.Format(Messages.UserUnmuted, target.GetTag());
-        var description = $"- {string.Format(Messages.DescriptionActionReason, reason)}";
+        var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
         var logResult = _utility.LogActionAsync(
             data.Settings, channelId, executor, title, description, target, ColorsList.Green, ct: ct);
         if (!logResult.IsSuccess)

src/Commands/RemindCommandGroup.cs

@@ -75,7 +75,7 @@ public class RemindCommandGroup : CommandGroup
         return await ListRemindersAsync(data.GetOrCreateMemberData(executorId), executor, bot, CancellationToken);
     }
 
-    private async Task<Result> ListRemindersAsync(MemberData data, IUser executor, IUser bot, CancellationToken ct)
+    private Task<Result> ListRemindersAsync(MemberData data, IUser executor, IUser bot, CancellationToken ct)
     {
         if (data.Reminders.Count == 0)
         {
@@ -83,17 +83,16 @@ public class RemindCommandGroup : CommandGroup
                 .WithColour(ColorsList.Red)
                 .Build();
 
-            return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
+            return _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
         }
 
         var builder = new StringBuilder();
         for (var i = 0; i < data.Reminders.Count; i++)
         {
             var reminder = data.Reminders[i];
-            builder.Append("- ").AppendLine(string.Format(Messages.ReminderPosition, Markdown.InlineCode((i + 1).ToString())))
+            builder.AppendBulletPointLine(string.Format(Messages.ReminderPosition, Markdown.InlineCode((i + 1).ToString())))
-                .Append(" - ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
+                .AppendSubBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
-                .Append(" - ")
+                .AppendSubBulletPointLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
-                .AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
         }
 
         var embed = new EmbedBuilder().WithSmallTitle(
@@ -102,7 +101,7 @@ public class RemindCommandGroup : CommandGroup
             .WithColour(ColorsList.Cyan)
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(
+        return _feedback.SendContextualEmbedResultAsync(
             embed, ct);
     }
 
@@ -140,7 +139,7 @@ public class RemindCommandGroup : CommandGroup
         return await AddReminderAsync(@in, text, data, channelId, executor, CancellationToken);
     }
 
-    private async Task<Result> AddReminderAsync(
+    private Task<Result> AddReminderAsync(
         TimeSpan @in, string text, GuildData data,
         Snowflake channelId, IUser executor, CancellationToken ct = default)
     {
@@ -155,9 +154,9 @@ public class RemindCommandGroup : CommandGroup
                 Text = text
             });
 
-        var builder = new StringBuilder().Append("- ").AppendLine(string.Format(
+        var builder = new StringBuilder().AppendBulletPointLine(string.Format(
                 Messages.ReminderText, Markdown.InlineCode(text)))
-            .Append("- ").Append(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
+            .AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
 
         var embed = new EmbedBuilder().WithSmallTitle(
                 string.Format(Messages.ReminderCreated, executor.GetTag()), executor)
@@ -166,7 +165,7 @@ public class RemindCommandGroup : CommandGroup
             .WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count))
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+        return _feedback.SendContextualEmbedResultAsync(embed, ct);
     }
 
     /// <summary>
@@ -200,7 +199,7 @@ public class RemindCommandGroup : CommandGroup
         return await DeleteReminderAsync(data.GetOrCreateMemberData(executorId), position - 1, bot, CancellationToken);
     }
 
-    private async Task<Result> DeleteReminderAsync(MemberData data, int index, IUser bot,
+    private Task<Result> DeleteReminderAsync(MemberData data, int index, IUser bot,
         CancellationToken ct)
     {
         if (index >= data.Reminders.Count)
@@ -209,14 +208,14 @@ public class RemindCommandGroup : CommandGroup
                 .WithColour(ColorsList.Red)
                 .Build();
 
-            return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
+            return _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
         }
 
         var reminder = data.Reminders[index];
 
         var description = new StringBuilder()
-            .Append("- ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
+            .AppendBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
-            .Append("- ").AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
+            .AppendBulletPointLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
 
         data.Reminders.RemoveAt(index);
 
@@ -225,7 +224,7 @@ public class RemindCommandGroup : CommandGroup
             .WithColour(ColorsList.Green)
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(
+        return _feedback.SendContextualEmbedResultAsync(
             embed, ct);
     }
 }

src/Commands/SettingsCommandGroup.cs

@@ -105,7 +105,7 @@ public class SettingsCommandGroup : CommandGroup
         return await SendSettingsListAsync(cfg, bot, page, CancellationToken);
     }
 
-    private async Task<Result> SendSettingsListAsync(JsonNode cfg, IUser bot, int page,
+    private Task<Result> SendSettingsListAsync(JsonNode cfg, IUser bot, int page,
         CancellationToken ct = default)
     {
         var description = new StringBuilder();
@@ -124,7 +124,7 @@ public class SettingsCommandGroup : CommandGroup
                 .WithColour(ColorsList.Red)
                 .Build();
 
-            return await _feedback.SendContextualEmbedResultAsync(errorEmbed, ct);
+            return _feedback.SendContextualEmbedResultAsync(errorEmbed, ct);
         }
 
         footer.Append($"{Messages.Page} {page}/{totalPages} ");
@@ -138,9 +138,9 @@ public class SettingsCommandGroup : CommandGroup
             var optionName = AllOptions[i].Name;
             var optionValue = AllOptions[i].Display(cfg);
 
-            description.AppendLine($"- {$"Settings{optionName}".Localized()}")
+            description.AppendBulletPointLine($"Settings{optionName}".Localized())
-                .Append($" - {Markdown.InlineCode(optionName)}: ")
+                .AppendSubBulletPoint(Markdown.InlineCode(optionName))
-                .AppendLine(optionValue);
+                .Append(": ").AppendLine(optionValue);
         }
 
         var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingsListTitle, bot)
@@ -149,7 +149,7 @@ public class SettingsCommandGroup : CommandGroup
             .WithFooter(footer.ToString())
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+        return _feedback.SendContextualEmbedResultAsync(embed, ct);
     }
 
     /// <summary>

src/Commands/ToolsCommandGroup.cs

@@ -102,11 +102,11 @@ public class ToolsCommandGroup : CommandGroup
 
         if (target.GlobalName is not null)
         {
-            builder.Append("- ").AppendLine(Messages.UserInfoDisplayName)
+            builder.AppendBulletPointLine(Messages.UserInfoDisplayName)
                 .AppendLine(Markdown.InlineCode(target.GlobalName));
         }
 
-        builder.Append("- ").AppendLine(Messages.UserInfoDiscordUserSince)
+        builder.AppendBulletPointLine(Messages.UserInfoDiscordUserSince)
             .AppendLine(Markdown.Timestamp(target.ID.Timestamp));
 
         var memberData = data.GetOrCreateMemberData(target.ID);
@@ -170,23 +170,23 @@ public class ToolsCommandGroup : CommandGroup
     {
         if (guildMember.Nickname.IsDefined(out var nickname))
         {
-            builder.Append("- ").AppendLine(Messages.UserInfoGuildNickname)
+            builder.AppendBulletPointLine(Messages.UserInfoGuildNickname)
                 .AppendLine(Markdown.InlineCode(nickname));
         }
 
-        builder.Append("- ").AppendLine(Messages.UserInfoGuildMemberSince)
+        builder.AppendBulletPointLine(Messages.UserInfoGuildMemberSince)
             .AppendLine(Markdown.Timestamp(guildMember.JoinedAt));
 
         if (guildMember.PremiumSince.IsDefined(out var premiumSince))
         {
-            builder.Append("- ").AppendLine(Messages.UserInfoGuildMemberPremiumSince)
+            builder.AppendBulletPointLine(Messages.UserInfoGuildMemberPremiumSince)
                 .AppendLine(Markdown.Timestamp(premiumSince.Value));
             color = ColorsList.Magenta;
         }
 
         if (guildMember.Roles.Count > 0)
         {
-            builder.Append("- ").AppendLine(Messages.UserInfoGuildRoles);
+            builder.AppendBulletPointLine(Messages.UserInfoGuildRoles);
             for (var i = 0; i < guildMember.Roles.Count - 1; i++)
             {
                 builder.Append($"<@&{guildMember.Roles[i]}>, ");
@@ -202,30 +202,30 @@ public class ToolsCommandGroup : CommandGroup
     {
         if (memberData.BannedUntil < DateTimeOffset.MaxValue)
         {
-            builder.Append("- ").AppendLine(Messages.UserInfoBanned)
+            builder.AppendBulletPointLine(Messages.UserInfoBanned)
-                .Append(" - ").AppendLine(string.Format(
+                .AppendSubBulletPointLine(string.Format(
                     Messages.DescriptionActionExpiresAt, Markdown.Timestamp(memberData.BannedUntil.Value)));
             return;
         }
 
-        builder.Append("- ").AppendLine(Messages.UserInfoBannedPermanently);
+        builder.AppendBulletPointLine(Messages.UserInfoBannedPermanently);
     }
 
     private static void AppendMuteInformation(
         MemberData memberData, DateTimeOffset? communicationDisabledUntil, StringBuilder builder)
     {
-        builder.Append("- ").AppendLine(Messages.UserInfoMuted);
+        builder.AppendBulletPointLine(Messages.UserInfoMuted);
         if (memberData.MutedUntil is not null && DateTimeOffset.UtcNow <= memberData.MutedUntil)
         {
-            builder.Append(" - ").AppendLine(Messages.UserInfoMutedByMuteRole)
+            builder.AppendSubBulletPointLine(Messages.UserInfoMutedByMuteRole)
-                .Append(" - ").AppendLine(string.Format(
+                .AppendSubBulletPointLine(string.Format(
                     Messages.DescriptionActionExpiresAt, Markdown.Timestamp(memberData.MutedUntil.Value)));
         }
 
         if (communicationDisabledUntil is not null)
         {
-            builder.Append(" - ").AppendLine(Messages.UserInfoMutedByTimeout)
+            builder.AppendSubBulletPointLine(Messages.UserInfoMutedByTimeout)
-                .Append(" - ").AppendLine(string.Format(
+                .AppendSubBulletPointLine(string.Format(
                     Messages.DescriptionActionExpiresAt, Markdown.Timestamp(communicationDisabledUntil.Value)));
         }
     }
@@ -276,19 +276,19 @@ public class ToolsCommandGroup : CommandGroup
         return await ShowGuildInfoAsync(bot, guild, CancellationToken);
     }
 
-    private async Task<Result> ShowGuildInfoAsync(IUser bot, IGuild guild, CancellationToken ct)
+    private Task<Result> ShowGuildInfoAsync(IUser bot, IGuild guild, CancellationToken ct)
     {
         var description = new StringBuilder().AppendLine($"## {guild.Name}");
 
         if (guild.Description is not null)
         {
-            description.Append("- ").AppendLine(Messages.GuildInfoDescription)
+            description.AppendBulletPointLine(Messages.GuildInfoDescription)
                 .AppendLine(Markdown.InlineCode(guild.Description));
         }
 
-        description.Append("- ").AppendLine(Messages.GuildInfoCreatedAt)
+        description.AppendBulletPointLine(Messages.GuildInfoCreatedAt)
             .AppendLine(Markdown.Timestamp(guild.ID.Timestamp))
-            .Append("- ").AppendLine(Messages.GuildInfoOwner)
+            .AppendBulletPointLine(Messages.GuildInfoOwner)
             .AppendLine(Mention.User(guild.OwnerID));
 
         var embedColor = ColorsList.Cyan;
@@ -296,9 +296,9 @@ public class ToolsCommandGroup : CommandGroup
         if (guild.PremiumTier > PremiumTier.None)
         {
             description.Append("### ").AppendLine(Messages.GuildInfoServerBoost)
-                .Append("- ").Append(Messages.GuildInfoBoostTier)
+                .AppendBulletPoint(Messages.GuildInfoBoostTier)
                 .Append(": ").AppendLine(Markdown.InlineCode(guild.PremiumTier.ToString()))
-                .Append("- ").Append(Messages.GuildInfoBoostCount)
+                .AppendBulletPoint(Messages.GuildInfoBoostCount)
                 .Append(": ").AppendLine(Markdown.InlineCode(guild.PremiumSubscriptionCount.ToString()));
             embedColor = ColorsList.Magenta;
         }
@@ -312,7 +312,7 @@ public class ToolsCommandGroup : CommandGroup
             .WithFooter($"ID: {guild.ID.ToString()}")
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+        return _feedback.SendContextualEmbedResultAsync(embed, ct);
     }
 
     /// <summary>
@@ -349,7 +349,7 @@ public class ToolsCommandGroup : CommandGroup
         return await SendRandomNumberAsync(first, second, executor, CancellationToken);
     }
 
-    private async Task<Result> SendRandomNumberAsync(long first, long? secondNullable,
+    private Task<Result> SendRandomNumberAsync(long first, long? secondNullable,
         IUser executor, CancellationToken ct)
     {
         const long secondDefault = 0;
@@ -362,14 +362,14 @@ public class ToolsCommandGroup : CommandGroup
 
         var description = new StringBuilder().Append("# ").Append(i);
 
-        description.AppendLine().Append("- ").Append(string.Format(
+        description.AppendLine().AppendBulletPoint(string.Format(
             Messages.RandomMin, Markdown.InlineCode(min.ToString())));
         if (secondNullable is null && first >= secondDefault)
         {
             description.Append(' ').Append(Messages.Default);
         }
 
-        description.AppendLine().Append("- ").Append(string.Format(
+        description.AppendLine().AppendBulletPoint(string.Format(
             Messages.RandomMax, Markdown.InlineCode(max.ToString())));
         if (secondNullable is null && first < secondDefault)
         {
@@ -389,7 +389,7 @@ public class ToolsCommandGroup : CommandGroup
             .WithColour(embedColor)
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+        return _feedback.SendContextualEmbedResultAsync(embed, ct);
     }
 
     private static readonly TimestampStyle[] AllStyles =
@@ -435,7 +435,7 @@ public class ToolsCommandGroup : CommandGroup
         return await SendTimestampAsync(offset, executor, CancellationToken);
     }
 
-    private async Task<Result> SendTimestampAsync(TimeSpan? offset, IUser executor, CancellationToken ct)
+    private Task<Result> SendTimestampAsync(TimeSpan? offset, IUser executor, CancellationToken ct)
     {
         var timestamp = DateTimeOffset.UtcNow.Add(offset ?? TimeSpan.Zero).ToUnixTimeSeconds();
 
@@ -449,7 +449,7 @@ public class ToolsCommandGroup : CommandGroup
 
         foreach (var markdownTimestamp in AllStyles.Select(style => Markdown.Timestamp(timestamp, style)))
         {
-            description.Append("- ").Append(Markdown.InlineCode(markdownTimestamp))
+            description.AppendBulletPoint(Markdown.InlineCode(markdownTimestamp))
                 .Append(" → ").AppendLine(markdownTimestamp);
         }
 
@@ -459,6 +459,6 @@ public class ToolsCommandGroup : CommandGroup
             .WithColour(ColorsList.Blue)
             .Build();
 
-        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+        return _feedback.SendContextualEmbedResultAsync(embed, ct);
     }
 }

src/Data/MemberData.cs

@@ -18,6 +18,6 @@ public sealed class MemberData
     public ulong Id { get; }
     public DateTimeOffset? BannedUntil { get; set; }
     public DateTimeOffset? MutedUntil { get; set; }
-    public List<ulong> Roles { get; set; } = new();
+    public List<ulong> Roles { get; set; } = [];
-    public List<Reminder> Reminders { get; } = new();
+    public List<Reminder> Reminders { get; } = [];
 }

src/Extensions/CollectionExtensions.cs

@@ -8,7 +8,7 @@ public static class CollectionExtensions
         this IEnumerable<TSource> source, Func<TSource, TResult> selector)
     {
         var list = source.ToList();
-        return list.Any() ? list.Max(selector) : default;
+        return list.Count > 0 ? list.Max(selector) : default;
     }
 
     public static void AddIfFailed(this List<Result> list, Result result)

src/Extensions/MarkdownExtensions.cs

@@ -0,0 +1,16 @@
+namespace Octobot.Extensions;
+
+public static class MarkdownExtensions
+{
+    /// <summary>
+    /// Formats a string to use Markdown Bullet formatting.
+    /// </summary>
+    /// <param name="text">The input text to format.</param>
+    /// <returns>
+    /// A markdown-formatted bullet string.
+    /// </returns>
+    public static string BulletPoint(string text)
+    {
+        return $"- {text}";
+    }
+}

src/Extensions/StringBuilderExtensions.cs

@@ -0,0 +1,62 @@
+using System.Text;
+
+namespace Octobot.Extensions;
+
+public static class StringBuilderExtensions
+{
+    /// <summary>
+    ///     Appends the input string with Markdown Bullet formatting to the specified <see cref="StringBuilder" /> object.
+    /// </summary>
+    /// <param name="builder">The <see cref="StringBuilder" /> object.</param>
+    /// <param name="value">The string to append with bullet point.</param>
+    /// <returns>
+    ///     The builder with the appended string with Markdown Bullet formatting.
+    /// </returns>
+    public static StringBuilder AppendBulletPoint(this StringBuilder builder, string? value)
+    {
+        return builder.Append("- ").Append(value);
+    }
+
+    /// <summary>
+    ///     Appends the input string with Markdown Sub-Bullet formatting to the specified <see cref="StringBuilder" /> object.
+    /// </summary>
+    /// <param name="builder">The <see cref="StringBuilder" /> object.</param>
+    /// <param name="value">The string to append with sub-bullet point.</param>
+    /// <returns>
+    ///     The builder with the appended string with Markdown Sub-Bullet formatting.
+    /// </returns>
+    public static StringBuilder AppendSubBulletPoint(this StringBuilder builder, string? value)
+    {
+        return builder.Append(" - ").Append(value);
+    }
+
+    /// <summary>
+    ///     Appends the input string with Markdown Bullet formatting followed by
+    ///     the default line terminator to the end of specified <see cref="StringBuilder" /> object.
+    /// </summary>
+    /// <param name="builder">The <see cref="StringBuilder" /> object.</param>
+    /// <param name="value">The string to append with bullet point.</param>
+    /// <returns>
+    ///     The builder with the appended string with Markdown Bullet formatting
+    ///     and default line terminator at the end.
+    /// </returns>
+    public static StringBuilder AppendBulletPointLine(this StringBuilder builder, string? value)
+    {
+        return builder.Append("- ").AppendLine(value);
+    }
+
+    /// <summary>
+    ///     Appends the input string with Markdown Sub-Bullet formatting followed by
+    ///     the default line terminator to the end of specified <see cref="StringBuilder" /> object.
+    /// </summary>
+    /// <param name="builder">The <see cref="StringBuilder" /> object.</param>
+    /// <param name="value">The string to append with sub-bullet point.</param>
+    /// <returns>
+    ///     The builder with the appended string with Markdown Sub-Bullet formatting
+    ///     and default line terminator at the end.
+    /// </returns>
+    public static StringBuilder AppendSubBulletPointLine(this StringBuilder builder, string? value)
+    {
+        return builder.Append(" - ").AppendLine(value);
+    }
+}

src/Extensions/StringExtensions.cs

@@ -45,7 +45,7 @@ public static class StringExtensions
     {
         s = s.SanitizeForBlockCode();
         return
-            $"```{language}\n{s.SanitizeForBlockCode()}{(s.EndsWith("`", StringComparison.Ordinal) || string.IsNullOrWhiteSpace(s) ? " " : "")}```";
+            $"```{language}\n{s.SanitizeForBlockCode()}{(s.EndsWith('`') || string.IsNullOrWhiteSpace(s) ? " " : "")}```";
     }
 
     public static string Localized(this string key)

src/Messages.Designer.cs

@@ -534,9 +534,9 @@ namespace Octobot {
             }
         }
 
-        internal static string EventDetailsButton {
+        internal static string OpenEventInfoButton {
             get {
-                return ResourceManager.GetString("EventDetailsButton", resourceCulture);
+                return ResourceManager.GetString("OpenEventInfoButton", resourceCulture);
             }
         }
 

src/Services/GuildDataService.cs

@@ -39,7 +39,7 @@ public sealed class GuildDataService : IHostedService
         SaveAsync(CancellationToken.None).GetAwaiter().GetResult();
     }
 
-    public async Task SaveAsync(CancellationToken ct)
+    public Task SaveAsync(CancellationToken ct)
     {
         var tasks = new List<Task>();
         var datas = _datas.Values.ToArray();
@@ -53,7 +53,7 @@ public sealed class GuildDataService : IHostedService
                 SerializeObjectSafelyAsync(memberData, $"{data.MemberDataPath}/{memberData.Id}.json", ct)));
         }
 
-        await Task.WhenAll(tasks);
+        return Task.WhenAll(tasks);
     }
 
     private static async Task SerializeObjectSafelyAsync<T>(T obj, string path, CancellationToken ct)

src/Services/Update/ScheduledEventUpdateService.cs

@@ -126,7 +126,7 @@ public sealed class ScheduledEventUpdateService : BackgroundService
     {
         var filtered = from.Where(schEvent => schEvent.ID == id);
         var filteredArray = filtered.ToArray();
-        return filteredArray.Any()
+        return filteredArray.Length > 0
             ? Result<IGuildScheduledEvent>.FromSuccess(filteredArray.Single())
             : new NotFoundError();
     }
@@ -226,7 +226,7 @@ public sealed class ScheduledEventUpdateService : BackgroundService
 
         var button = new ButtonComponent(
             ButtonComponentStyle.Link,
-            Messages.EventDetailsButton,
+            Messages.OpenEventInfoButton,
             new PartialEmoji(Name: "📋"),
             URL: $"https://discord.com/events/{scheduledEvent.GuildID}/{scheduledEvent.ID}"
         );

src/Services/Update/SongUpdateService.cs

@@ -10,26 +10,29 @@ public sealed class SongUpdateService : BackgroundService
 {
     private static readonly (string Author, string Name, TimeSpan Duration)[] SongList =
     {
-        ("Yoko & the Gold Bazookas", "Rockagilly Blues", new TimeSpan(0, 3, 37)),
+        ("Yoko & the Gold Bazookas", "Rockagilly Blues", new TimeSpan(0, 2, 52)),
-        ("Splatoon 3", "Seep and Destroy", new TimeSpan(0, 2, 42)),
+        ("Deep Cut", "Big Betrayal", new TimeSpan(0, 5, 55)),
-        ("Deep Cut", "Big Betrayal", new TimeSpan(0, 1, 42)),
+        ("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 3, 7)),
-        ("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 2, 8)),
+        ("Deep Cut", "Anarchy Rainbow", new TimeSpan(0, 3, 20)),
-        ("Deep Cut", "Anarchy Rainbow", new TimeSpan(0, 1, 51)),
+        ("Squid Sisters feat. Ian BGM", "Liquid Sunshine", new TimeSpan(0, 2, 37)),
-        ("Squid Sisters feat. Ian BGM", "Liquid Sunshine", new TimeSpan(0, 1, 32)),
+        ("Damp Socks feat. Off the Hook", "Candy-Coated Rocks", new TimeSpan(0, 2, 58)),
-        ("Damp Socks feat. Off the Hook", "Candy-Coated Rocks", new TimeSpan(0, 1, 11)),
+        ("H2Whoa", "Aquasonic", new TimeSpan(0, 2, 51)),
-        ("H2Whoa", "Aquasonic", new TimeSpan(0, 1, 1)),
+        ("Yoko & the Gold Bazookas", "Ska-BLAM", new TimeSpan(0, 2, 57)),
-        ("Yoko & the Gold Bazookas", "Ska-BLAM", new TimeSpan(0, 4, 4)),
+        ("Off the Hook", "Muck Warfare", new TimeSpan(0, 3, 20)),
-        ("Off the Hook", "Muck Warfare", new TimeSpan(0, 3, 39)),
+        ("Off the Hook", "Acid Hues", new TimeSpan(0, 3, 15)),
-        ("Off the Hook", "Acid Hues", new TimeSpan(0, 3, 39)),
+        ("Off the Hook", "Shark Bytes", new TimeSpan(0, 3, 34)),
-        ("Off the Hook", "Shark Bytes", new TimeSpan(0, 3, 48)),
+        ("Squid Sisters", "Calamari Inkantation", new TimeSpan(0, 2, 14)),
-        ("DJ Octavio feat. Squid Sisters & Deep Cut", "Calamari Inkantation 3MIX", new TimeSpan(0, 7, 9)),
+        ("Squid Sisters", "Ink Me Up", new TimeSpan(0, 2, 13)),
-        ("Squid Sisters", "Ink Me Up", new TimeSpan(0, 2, 13))
+        ("Chirpy Chips", "No Quarters", new TimeSpan(0, 2, 36)),
+        ("Chirpy Chips", "Shellfie", new TimeSpan(0, 2, 1)),
+        ("Dedf1sh", "#11 above", new TimeSpan(0, 2, 10)),
+        ("Callie", "Bomb Rush Blush", new TimeSpan(0, 2, 18)),
+        ("Turquoise October", "Octoling Rendezvous", new TimeSpan(0, 1, 57)),
+        ("Damp Socks feat. Off the Hook", "Tentacle to the Metal", new TimeSpan(0, 2, 51)),
+        ("Off the Hook", "Fly Octo Fly ~ Ebb & Flow (Octo)", new TimeSpan(0, 3, 5))
     };
 
-    private readonly List<Activity> _activityList = new(1)
+    private readonly List<Activity> _activityList = [new Activity("with Remora.Discord", ActivityType.Game)];
-    {
-        new Activity("with Remora.Discord", ActivityType.Game)
-    };
 
     private readonly DiscordGatewayClient _client;
     private readonly GuildDataService _guildData;