Skip to content

Commit 43b20bc

Browse files
author
AlFas
authored
Simplify code in DiscordComparers (#1713)
1 parent b45aebf commit 43b20bc

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/Discord.Net.Core/Utils/Comparers.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,23 @@ public static class DiscordComparers
1111
/// <summary>
1212
/// Gets an <see cref="IEqualityComparer{T}"/> to be used to compare users.
1313
/// </summary>
14-
public static IEqualityComparer<IUser> UserComparer => _userComparer ??= new EntityEqualityComparer<IUser, ulong>();
14+
public static IEqualityComparer<IUser> UserComparer { get; } = new EntityEqualityComparer<IUser, ulong>();
1515
/// <summary>
1616
/// Gets an <see cref="IEqualityComparer{T}"/> to be used to compare guilds.
1717
/// </summary>
18-
public static IEqualityComparer<IGuild> GuildComparer => _guildComparer ??= new EntityEqualityComparer<IGuild, ulong>();
18+
public static IEqualityComparer<IGuild> GuildComparer { get; } = new EntityEqualityComparer<IGuild, ulong>();
1919
/// <summary>
2020
/// Gets an <see cref="IEqualityComparer{T}"/> to be used to compare channels.
2121
/// </summary>
22-
public static IEqualityComparer<IChannel> ChannelComparer => _channelComparer ??= new EntityEqualityComparer<IChannel, ulong>();
22+
public static IEqualityComparer<IChannel> ChannelComparer { get; } = new EntityEqualityComparer<IChannel, ulong>();
2323
/// <summary>
2424
/// Gets an <see cref="IEqualityComparer{T}"/> to be used to compare roles.
2525
/// </summary>
26-
public static IEqualityComparer<IRole> RoleComparer => _roleComparer ??= new EntityEqualityComparer<IRole, ulong>();
26+
public static IEqualityComparer<IRole> RoleComparer { get; } = new EntityEqualityComparer<IRole, ulong>();
2727
/// <summary>
2828
/// Gets an <see cref="IEqualityComparer{T}"/> to be used to compare messages.
2929
/// </summary>
30-
public static IEqualityComparer<IMessage> MessageComparer => _messageComparer ??= new EntityEqualityComparer<IMessage, ulong>();
31-
32-
private static IEqualityComparer<IUser> _userComparer;
33-
private static IEqualityComparer<IGuild> _guildComparer;
34-
private static IEqualityComparer<IChannel> _channelComparer;
35-
private static IEqualityComparer<IRole> _roleComparer;
36-
private static IEqualityComparer<IMessage> _messageComparer;
30+
public static IEqualityComparer<IMessage> MessageComparer { get; } = new EntityEqualityComparer<IMessage, ulong>();
3731

3832
private sealed class EntityEqualityComparer<TEntity, TId> : EqualityComparer<TEntity>
3933
where TEntity : IEntity<TId>
@@ -46,7 +40,7 @@ public override bool Equals(TEntity x, TEntity y)
4640
(null, null) => true,
4741
(null, _) => false,
4842
(_, null) => false,
49-
var (l, r) => l.Id.Equals(r.Id)
43+
_ => x.Id.Equals(y.Id)
5044
};
5145
}
5246

0 commit comments

Comments
 (0)