Browse Source

code rework for net4.6.1 & standart2.0 compatibility

pull/2347/head
Misha133 3 years ago
parent
commit
f11d2c5b9c
9 changed files with 12 additions and 50 deletions
  1. +1
    -21
      src/Discord.Net.Core/Entities/Messages/Embed.cs
  2. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs
  3. +4
    -22
      src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
  4. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedField.cs
  5. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs
  6. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedImage.cs
  7. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs
  8. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs
  9. +1
    -1
      src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs

+ 1
- 21
src/Discord.Net.Core/Entities/Messages/Embed.cs View File

@@ -109,26 +109,6 @@ namespace Discord
=> GetHashCode() == embed.GetHashCode();

public override int GetHashCode()
{
var hashCode = new HashCode();
hashCode.Add(Type);
hashCode.Add(Title);
hashCode.Add(Description);
hashCode.Add(Timestamp);
hashCode.Add(Color);
hashCode.Add(Image);
hashCode.Add(Video);
hashCode.Add(Author);
hashCode.Add(Footer);
hashCode.Add(Provider);
hashCode.Add(Thumbnail);

foreach (var field in Fields)
{
hashCode.Add(field);
}

return hashCode.ToHashCode();
}
=> new { Type, Title, Description, Timestamp, Color, Image, Video, Author, Footer, Provider, Thumbnail, Fields }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs View File

@@ -57,6 +57,6 @@ namespace Discord
=> GetHashCode() == embedAuthor.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Name, Url, IconUrl);
=> new { Name, Url, IconUrl }.GetHashCode();
}
}

+ 4
- 22
src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs View File

@@ -496,25 +496,7 @@ namespace Discord
=> GetHashCode() == embedBuilder.GetHashCode();

public override int GetHashCode()
{
var hashCode = new HashCode();
hashCode.Add(_title);
hashCode.Add(_description);
hashCode.Add(_image);
hashCode.Add(_thumbnail);
hashCode.Add(Timestamp);
hashCode.Add(Color);
hashCode.Add(Author);
hashCode.Add(Footer);
hashCode.Add(Url);

foreach (var field in _fields)
{
hashCode.Add(field);
}

return hashCode.ToHashCode();
}
=> new {_title, _description, _image, _thumbnail, Timestamp, Color, Author, Footer, Url, _fields }.GetHashCode();
}

/// <summary>
@@ -646,7 +628,7 @@ namespace Discord
=> GetHashCode() == embedFieldBuilder.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Name, Value, IsInline);
=> new { Name, Value, IsInline }.GetHashCode();
}

/// <summary>
@@ -762,7 +744,7 @@ namespace Discord
=> GetHashCode() == embedAuthorBuilder.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Name, Url, IconUrl);
=> new { Name, Url, IconUrl }.GetHashCode();
}

/// <summary>
@@ -858,6 +840,6 @@ namespace Discord
=> GetHashCode() == embedFooterBuilder.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Text, IconUrl);
=> new { Text, IconUrl }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedField.cs View File

@@ -52,6 +52,6 @@ namespace Discord
=> GetHashCode() == embedField.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Name, Value, Inline);
=> new { Name, Value, Inline }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs View File

@@ -59,6 +59,6 @@ namespace Discord
=> GetHashCode() == embedFooter.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Text, IconUrl, ProxyUrl);
=> new { Text, IconUrl, ProxyUrl }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedImage.cs View File

@@ -69,6 +69,6 @@ namespace Discord
=> GetHashCode() == embedImage.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Height, Width, Url, ProxyUrl);
=> new { Height, Width, Url, ProxyUrl }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs View File

@@ -51,6 +51,6 @@ namespace Discord
=> GetHashCode() == embedProvider.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Name, Url);
=> new { Name, Url }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs View File

@@ -69,6 +69,6 @@ namespace Discord
=> GetHashCode() == embedThumbnail.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Width, Height, Url, ProxyUrl);
=> new { Width, Height, Url, ProxyUrl }.GetHashCode();
}
}

+ 1
- 1
src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs View File

@@ -63,6 +63,6 @@ namespace Discord
=> GetHashCode() == embedVideo.GetHashCode();

public override int GetHashCode()
=> HashCode.Combine(Width, Height, Url);
=> new { Width, Height, Url }.GetHashCode();
}
}

Loading…
Cancel
Save