github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/issues/667' into dev

Browse Source
This commit is contained in:
Christopher F
2017-06-23 10:42:19 -04:00
parent 5601d00285 33e765f8f5
commit 256af0b269
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net.Rest/API/Common/Embed.cs
View File

@@ -1,6 +1,7 @@
#pragma warning disable CS1591
using System;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace Discord.API
{
@@ -8,14 +9,14 @@ namespace Discord.API
{
[JsonProperty("title")]
public string Title { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
[JsonProperty("description")]
public string Description { get; set; }
[JsonProperty("url")]
public Uri Url { get; set; }
[JsonProperty("color")]
public uint? Color { get; set; }
[JsonProperty("type"), JsonConverter(typeof(StringEnumConverter))]
public EmbedType Type { get; set; }
[JsonProperty("timestamp")]
public DateTimeOffset? Timestamp { get; set; }
[JsonProperty("author")]