mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-04-20 00:43:36 +03:00
Merge branch 'master' into use-regular-classes
This commit is contained in:
commit
365b8043f5
8 changed files with 15 additions and 14 deletions
|
@ -400,7 +400,7 @@
|
||||||
<value>Octobot's source code</value>
|
<value>Octobot's source code</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutBot" xml:space="preserve">
|
<data name="AboutBot" xml:space="preserve">
|
||||||
<value>About Octobot</value>
|
<value>About {0}</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutDeveloper@mctaylors" xml:space="preserve">
|
<data name="AboutDeveloper@mctaylors" xml:space="preserve">
|
||||||
<value>developer & designer, Octobot's Wiki creator</value>
|
<value>developer & designer, Octobot's Wiki creator</value>
|
||||||
|
|
|
@ -400,7 +400,7 @@
|
||||||
<value>Исходный код Octobot</value>
|
<value>Исходный код Octobot</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutBot" xml:space="preserve">
|
<data name="AboutBot" xml:space="preserve">
|
||||||
<value>Об Octobot</value>
|
<value>О боте {0}</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutDeveloper@neroduckale" xml:space="preserve">
|
<data name="AboutDeveloper@neroduckale" xml:space="preserve">
|
||||||
<value>разработчик</value>
|
<value>разработчик</value>
|
||||||
|
|
|
@ -400,7 +400,7 @@
|
||||||
<value>репа Octobot (тык)</value>
|
<value>репа Octobot (тык)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutBot" xml:space="preserve">
|
<data name="AboutBot" xml:space="preserve">
|
||||||
<value>немного об Octobot</value>
|
<value>немного об {0}</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="AboutDeveloper@mctaylors" xml:space="preserve">
|
<data name="AboutDeveloper@mctaylors" xml:space="preserve">
|
||||||
<value>скучный девелопер + дизайнер создавший Octobot's Wiki</value>
|
<value>скучный девелопер + дизайнер создавший Octobot's Wiki</value>
|
||||||
|
|
|
@ -28,11 +28,11 @@ namespace Octobot.Commands;
|
||||||
public class AboutCommandGroup : CommandGroup
|
public class AboutCommandGroup : CommandGroup
|
||||||
{
|
{
|
||||||
private static readonly (string Username, Snowflake Id)[] Developers =
|
private static readonly (string Username, Snowflake Id)[] Developers =
|
||||||
{
|
[
|
||||||
("Octol1ttle", new Snowflake(504343489664909322)),
|
("Octol1ttle", new Snowflake(504343489664909322)),
|
||||||
("mctaylors", new Snowflake(326642240229474304)),
|
("mctaylors", new Snowflake(326642240229474304)),
|
||||||
("neroduckale", new Snowflake(474943797063843851))
|
("neroduckale", new Snowflake(474943797063843851))
|
||||||
};
|
];
|
||||||
|
|
||||||
private readonly ICommandContext _context;
|
private readonly ICommandContext _context;
|
||||||
private readonly IFeedbackService _feedback;
|
private readonly IFeedbackService _feedback;
|
||||||
|
@ -96,7 +96,8 @@ public class AboutCommandGroup : CommandGroup
|
||||||
builder.AppendBulletPointLine($"{tag} — {$"AboutDeveloper@{dev.Username}".Localized()}");
|
builder.AppendBulletPointLine($"{tag} — {$"AboutDeveloper@{dev.Username}".Localized()}");
|
||||||
}
|
}
|
||||||
|
|
||||||
var embed = new EmbedBuilder().WithSmallTitle(Messages.AboutBot, bot)
|
var embed = new EmbedBuilder()
|
||||||
|
.WithSmallTitle(string.Format(Messages.AboutBot, bot.Username), bot)
|
||||||
.WithDescription(builder.ToString())
|
.WithDescription(builder.ToString())
|
||||||
.WithColour(ColorsList.Cyan)
|
.WithColour(ColorsList.Cyan)
|
||||||
.WithImageUrl("https://cdn.mctaylors.ru/octobot-banner.png")
|
.WithImageUrl("https://cdn.mctaylors.ru/octobot-banner.png")
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class SettingsCommandGroup : CommandGroup
|
||||||
/// that the orders match.
|
/// that the orders match.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
private static readonly IOption[] AllOptions =
|
private static readonly IOption[] AllOptions =
|
||||||
{
|
[
|
||||||
GuildSettings.Language,
|
GuildSettings.Language,
|
||||||
GuildSettings.WelcomeMessage,
|
GuildSettings.WelcomeMessage,
|
||||||
GuildSettings.ReceiveStartupMessages,
|
GuildSettings.ReceiveStartupMessages,
|
||||||
|
@ -51,7 +51,7 @@ public class SettingsCommandGroup : CommandGroup
|
||||||
GuildSettings.MuteRole,
|
GuildSettings.MuteRole,
|
||||||
GuildSettings.EventNotificationRole,
|
GuildSettings.EventNotificationRole,
|
||||||
GuildSettings.EventEarlyNotificationOffset
|
GuildSettings.EventEarlyNotificationOffset
|
||||||
};
|
];
|
||||||
|
|
||||||
private readonly ICommandContext _context;
|
private readonly ICommandContext _context;
|
||||||
private readonly IFeedbackService _feedback;
|
private readonly IFeedbackService _feedback;
|
||||||
|
|
|
@ -393,7 +393,7 @@ public class ToolsCommandGroup : CommandGroup
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly TimestampStyle[] AllStyles =
|
private static readonly TimestampStyle[] AllStyles =
|
||||||
{
|
[
|
||||||
TimestampStyle.ShortDate,
|
TimestampStyle.ShortDate,
|
||||||
TimestampStyle.LongDate,
|
TimestampStyle.LongDate,
|
||||||
TimestampStyle.ShortTime,
|
TimestampStyle.ShortTime,
|
||||||
|
@ -401,7 +401,7 @@ public class ToolsCommandGroup : CommandGroup
|
||||||
TimestampStyle.ShortDateTime,
|
TimestampStyle.ShortDateTime,
|
||||||
TimestampStyle.LongDateTime,
|
TimestampStyle.LongDateTime,
|
||||||
TimestampStyle.RelativeTime
|
TimestampStyle.RelativeTime
|
||||||
};
|
];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A slash command that shows the current timestamp with an optional offset in all styles supported by Discord.
|
/// A slash command that shows the current timestamp with an optional offset in all styles supported by Discord.
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace Octobot.Services.Update;
|
||||||
public sealed partial class MemberUpdateService : BackgroundService
|
public sealed partial class MemberUpdateService : BackgroundService
|
||||||
{
|
{
|
||||||
private static readonly string[] GenericNicknames =
|
private static readonly string[] GenericNicknames =
|
||||||
{
|
[
|
||||||
"Albatross", "Alpha", "Anchor", "Banjo", "Bell", "Beta", "Blackbird", "Bulldog", "Canary",
|
"Albatross", "Alpha", "Anchor", "Banjo", "Bell", "Beta", "Blackbird", "Bulldog", "Canary",
|
||||||
"Cat", "Calf", "Cyclone", "Daisy", "Dalmatian", "Dart", "Delta", "Diamond", "Donkey", "Duck",
|
"Cat", "Calf", "Cyclone", "Daisy", "Dalmatian", "Dart", "Delta", "Diamond", "Donkey", "Duck",
|
||||||
"Emu", "Eclipse", "Flamingo", "Flute", "Frog", "Goose", "Hatchet", "Heron", "Husky", "Hurricane",
|
"Emu", "Eclipse", "Flamingo", "Flute", "Frog", "Goose", "Hatchet", "Heron", "Husky", "Hurricane",
|
||||||
|
@ -24,7 +24,7 @@ public sealed partial class MemberUpdateService : BackgroundService
|
||||||
"Nautilus", "Ostrich", "Octopus", "Pelican", "Puffin", "Pyramid", "Rattle", "Robin", "Rose",
|
"Nautilus", "Ostrich", "Octopus", "Pelican", "Puffin", "Pyramid", "Rattle", "Robin", "Rose",
|
||||||
"Salmon", "Seal", "Shark", "Sheep", "Snake", "Sonar", "Stump", "Sparrow", "Toaster", "Toucan",
|
"Salmon", "Seal", "Shark", "Sheep", "Snake", "Sonar", "Stump", "Sparrow", "Toaster", "Toucan",
|
||||||
"Torus", "Violet", "Vortex", "Vulture", "Wagon", "Whale", "Woodpecker", "Zebra", "Zigzag"
|
"Torus", "Violet", "Vortex", "Vulture", "Wagon", "Whale", "Woodpecker", "Zebra", "Zigzag"
|
||||||
};
|
];
|
||||||
|
|
||||||
private readonly IDiscordRestChannelAPI _channelApi;
|
private readonly IDiscordRestChannelAPI _channelApi;
|
||||||
private readonly IDiscordRestGuildAPI _guildApi;
|
private readonly IDiscordRestGuildAPI _guildApi;
|
||||||
|
|
|
@ -9,7 +9,7 @@ namespace Octobot.Services.Update;
|
||||||
public sealed class SongUpdateService : BackgroundService
|
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, 2, 52)),
|
("Yoko & the Gold Bazookas", "Rockagilly Blues", new TimeSpan(0, 2, 52)),
|
||||||
("Deep Cut", "Big Betrayal", new TimeSpan(0, 5, 55)),
|
("Deep Cut", "Big Betrayal", new TimeSpan(0, 5, 55)),
|
||||||
("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 3, 7)),
|
("Squid Sisters", "Tomorrow's Nostalgia Today", new TimeSpan(0, 3, 7)),
|
||||||
|
@ -30,7 +30,7 @@ public sealed class SongUpdateService : BackgroundService
|
||||||
("Turquoise October", "Octoling Rendezvous", new TimeSpan(0, 1, 57)),
|
("Turquoise October", "Octoling Rendezvous", new TimeSpan(0, 1, 57)),
|
||||||
("Damp Socks feat. Off the Hook", "Tentacle to the Metal", new TimeSpan(0, 2, 51)),
|
("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))
|
("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)];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue