mirror of
https://github.com/NoiTheCat/WorldTime.git
synced 2024-10-16 08:29:57 +00:00
Merge pull request #24 from NoiTheCat/dev/new-usernames
Support new username format
This commit is contained in:
commit
c2de69c236
3 changed files with 16 additions and 7 deletions
|
@ -58,7 +58,7 @@ public class CommandsBase : InteractionModuleBase<ShardedInteractionContext> {
|
|||
static string escapeFormattingCharacters(string input) {
|
||||
var result = new StringBuilder();
|
||||
foreach (var c in input) {
|
||||
if (c is '\\' or '_' or '~' or '*' or '@') {
|
||||
if (c is '\\' or '_' or '~' or '*' or '@' or '`') {
|
||||
result.Append('\\');
|
||||
}
|
||||
result.Append(c);
|
||||
|
@ -66,11 +66,19 @@ public class CommandsBase : InteractionModuleBase<ShardedInteractionContext> {
|
|||
return result.ToString();
|
||||
}
|
||||
|
||||
var username = escapeFormattingCharacters(user.Username);
|
||||
if (user.Nickname != null) {
|
||||
return $"**{escapeFormattingCharacters(user.Nickname)}** ({username}#{user.Discriminator})";
|
||||
if (user.DiscriminatorValue == 0) {
|
||||
var username = escapeFormattingCharacters(user.GlobalName ?? user.Username);
|
||||
if (user.Nickname != null) {
|
||||
return $"{escapeFormattingCharacters(user.Nickname)} ({username})";
|
||||
}
|
||||
return username;
|
||||
} else {
|
||||
var username = escapeFormattingCharacters(user.Username);
|
||||
if (user.Nickname != null) {
|
||||
return $"{escapeFormattingCharacters(user.Nickname)} ({username}#{user.Discriminator})";
|
||||
}
|
||||
return $"{username}#{user.Discriminator}";
|
||||
}
|
||||
return $"**{username}**#{user.Discriminator}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -41,7 +41,8 @@ internal class WorldTime : IDisposable {
|
|||
MessageCacheSize = 0, // disable message cache
|
||||
GatewayIntents = GatewayIntents.Guilds | GatewayIntents.GuildMembers,
|
||||
SuppressUnknownDispatchWarnings = true,
|
||||
LogGatewayIntentWarnings = false
|
||||
LogGatewayIntentWarnings = false,
|
||||
FormatUsersInBidirectionalUnicode = false
|
||||
};
|
||||
_services = new ServiceCollection()
|
||||
.AddSingleton(new DiscordShardedClient(clientConf))
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||
<PackageReference Include="Discord.Net" Version="3.9.0" />
|
||||
<PackageReference Include="Discord.Net" Version="3.12.0" />
|
||||
<PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.2" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
|
||||
|
|
Loading…
Reference in a new issue