Merge branch 'master' into 200-add-link-to-original-message-in-listremind

.github/workflows/build-pr.yml

@@ -23,7 +23,7 @@ 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, ConvertToPrimaryConstructor

Octobot.csproj

@@ -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/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);
             }
         }
 
@@ -1012,7 +1012,7 @@ namespace Octobot {
                 return ResourceManager.GetString("DataLoadFailedDescription", resourceCulture);
             }
         }
-        
+
         internal static string CommandExecutionFailed
         {
             get
@@ -1020,7 +1020,7 @@ namespace Octobot {
                 return ResourceManager.GetString("CommandExecutionFailed", resourceCulture);
             }
         }
-        
+
         internal static string ContactDevelopers
         {
             get

src/Services/Update/ScheduledEventUpdateService.cs

@@ -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,20 +10,26 @@ 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 Activity("with Remora.Discord", ActivityType.Game)];