TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

Merge branch 'master' into addicon

Browse source
This commit is contained in:
Macintxsh 2023-12-08 14:20:30 +03:00 • committed by GitHub
commit e52b35ea62
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locale/Messages.resx
View file

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

4
locale/Messages.ru.resx
View file

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

4
locale/Messages.tt-ru.resx
View file

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

4
src/Messages.Designer.cs generated
View file

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

2
src/Services/Update/ScheduledEventUpdateService.cs
View file

@ -226,7 +226,7 @@ public sealed class ScheduledEventUpdateService : BackgroundService
var button = new ButtonComponent( var button = new ButtonComponent(
ButtonComponentStyle.Link, ButtonComponentStyle.Link,
Messages.EventDetailsButton, Messages.OpenEventInfoButton,
new PartialEmoji(Name: "📋"), new PartialEmoji(Name: "📋"),
URL: $"https://discord.com/events/{scheduledEvent.GuildID}/{scheduledEvent.ID}" URL: $"https://discord.com/events/{scheduledEvent.GuildID}/{scheduledEvent.ID}"
); );

34
src/Services/Update/SongUpdateService.cs
View file

@ -10,20 +10,26 @@ public sealed class SongUpdateService : BackgroundService
{ {
private static readonly (string Author, string Name, TimeSpan Duration)[] SongList = 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)]; private readonly List<Activity> _activityList = [new Activity("with Remora.Discord", ActivityType.Game)];