From 42ab11d2533f60d816d0e6dee332b45786febf4b Mon Sep 17 00:00:00 2001 From: Macintxsh II <95250141+mctaylors@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:06:50 +0300 Subject: [PATCH 1/2] Rename "Event details" button to "Open Event Info" (#209) The correct phrasing used by Discord is "Event Info" ![image](https://github.com/LabsDevelopment/Octobot/assets/95250141/8165b70d-4c81-4b85-8251-db2de6a7f4ca) Signed-off-by: mctaylors --- locale/Messages.resx | 4 ++-- locale/Messages.ru.resx | 4 ++-- locale/Messages.tt-ru.resx | 4 ++-- src/Messages.Designer.cs | 8 ++++---- src/Services/Update/ScheduledEventUpdateService.cs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/Messages.resx b/locale/Messages.resx index a9367f7..f145ab2 100644 --- a/locale/Messages.resx +++ b/locale/Messages.resx @@ -348,8 +348,8 @@ The event will start at {0} until {1} in {2} - - Event details + + Open Event Info The event has lasted for `{0}` diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx index d0cbd79..5b97eda 100644 --- a/locale/Messages.ru.resx +++ b/locale/Messages.ru.resx @@ -345,8 +345,8 @@ Событие пройдёт с {0} до {1} в {2} - - Подробнее о событии + + Открыть сведения о событии Событие длилось `{0}` diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx index 3bed232..2761827 100644 --- a/locale/Messages.tt-ru.resx +++ b/locale/Messages.tt-ru.resx @@ -348,8 +348,8 @@ движуха будет происходить с {0} до {1} в {2} - - побольше о движухе + + открыть ивент все это длилось `{0}` diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs index e2184d7..33ba7b3 100644 --- a/src/Messages.Designer.cs +++ b/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 diff --git a/src/Services/Update/ScheduledEventUpdateService.cs b/src/Services/Update/ScheduledEventUpdateService.cs index af940c8..9ec9fcf 100644 --- a/src/Services/Update/ScheduledEventUpdateService.cs +++ b/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}" ); From eeaff23fb537a8d1ba7b68f55721a5db8adf1db7 Mon Sep 17 00:00:00 2001 From: Macintxsh II <95250141+mctaylors@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:15:44 +0300 Subject: [PATCH 2/2] Rewrite music list (#210) Changes: - Use timestamps from [Splatunes](https://splatoonwiki.org/wiki/Splatune_(Splatoon_Original_Soundtrack)) - Increase track count to 20 - Replace Calamari Inkantation 3MIX with OG Calamari Inkantation due to long duration Signed-off-by: mctaylors --- src/Services/Update/SongUpdateService.cs | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/Services/Update/SongUpdateService.cs b/src/Services/Update/SongUpdateService.cs index c8221fc..391c416 100644 --- a/src/Services/Update/SongUpdateService.cs +++ b/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)), - ("Splatoon 3", "Seep and Destroy", new TimeSpan(0, 2, 42)), - ("Deep Cut", "Big Betrayal", new TimeSpan(0, 1, 42)), - ("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 2, 8)), - ("Deep Cut", "Anarchy Rainbow", new TimeSpan(0, 1, 51)), - ("Squid Sisters feat. Ian BGM", "Liquid Sunshine", new TimeSpan(0, 1, 32)), - ("Damp Socks feat. Off the Hook", "Candy-Coated Rocks", new TimeSpan(0, 1, 11)), - ("H2Whoa", "Aquasonic", new TimeSpan(0, 1, 1)), - ("Yoko & the Gold Bazookas", "Ska-BLAM", new TimeSpan(0, 4, 4)), - ("Off the Hook", "Muck Warfare", new TimeSpan(0, 3, 39)), - ("Off the Hook", "Acid Hues", new TimeSpan(0, 3, 39)), - ("Off the Hook", "Shark Bytes", new TimeSpan(0, 3, 48)), - ("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)) + ("Yoko & the Gold Bazookas", "Rockagilly Blues", new TimeSpan(0, 2, 52)), + ("Deep Cut", "Big Betrayal", new TimeSpan(0, 5, 55)), + ("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 3, 7)), + ("Deep Cut", "Anarchy Rainbow", new TimeSpan(0, 3, 20)), + ("Squid Sisters feat. Ian BGM", "Liquid Sunshine", new TimeSpan(0, 2, 37)), + ("Damp Socks feat. Off the Hook", "Candy-Coated Rocks", new TimeSpan(0, 2, 58)), + ("H2Whoa", "Aquasonic", new TimeSpan(0, 2, 51)), + ("Yoko & the Gold Bazookas", "Ska-BLAM", new TimeSpan(0, 2, 57)), + ("Off the Hook", "Muck Warfare", new TimeSpan(0, 3, 20)), + ("Off the Hook", "Acid Hues", new TimeSpan(0, 3, 15)), + ("Off the Hook", "Shark Bytes", new TimeSpan(0, 3, 34)), + ("Squid Sisters", "Calamari Inkantation", new TimeSpan(0, 2, 14)), + ("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 _activityList = [new Activity("with Remora.Discord", ActivityType.Game)];