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

Changed GameId from string to nullable int

Browse Source
This commit is contained in:
RogueException
2015-11-23 03:44:49 -04:00
parent 97c4a1cca9
commit c910523788
5 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Net45/Discord.Net.csproj
View File

@@ -82,9 +82,6 @@
<Compile Include="..\Discord.Net\API\Converters\LongStringConverter.cs"> <Compile Include="..\Discord.Net\API\Converters\LongStringConverter.cs">
<Link>API\Converters\LongStringConverter.cs</Link> <Link>API\Converters\LongStringConverter.cs</Link>
</Compile> </Compile>
<Compile Include="..\Discord.Net\API\Converters\ShortStringConverter.cs">
<Link>API\Converters\ShortStringConverter.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\API\Endpoints.cs"> <Compile Include="..\Discord.Net\API\Endpoints.cs">
<Link>API\Endpoints.cs</Link> <Link>API\Endpoints.cs</Link>
</Compile> </Compile>

37
src/Discord.Net/API/Converters/ShortStringConverter.cs
View File

@@ -1,37 +0,0 @@
using Newtonsoft.Json;
using System;
namespace Discord.API.Converters
{
/*internal class ShortStringConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
{
return objectType == typeof(short);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
return IdConvert.ToShort((string)reader.Value);
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
writer.WriteValue(IdConvert.ToString((short)value));
}
}
internal class NullableShortStringConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
{
return objectType == typeof(short?);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
return IdConvert.ToNullableShort((string)reader.Value);
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
writer.WriteValue(IdConvert.ToString((short?)value));
}
}*/
}

2
src/Discord.Net/API/Members.cs
View File

@@ -49,7 +49,7 @@ namespace Discord.API
public class PresenceInfo : MemberReference public class PresenceInfo : MemberReference
{ {
[JsonProperty("game_id")] [JsonProperty("game_id")]
public string GameId; public int? GameId;
[JsonProperty("status")] [JsonProperty("status")]
public string Status; public string Status;
[JsonProperty("roles")] //TODO: Might be temporary [JsonProperty("roles")] //TODO: Might be temporary

12
src/Discord.Net/Helpers/IdConvert.cs
View File

@@ -6,20 +6,12 @@ namespace Discord
internal static class IdConvert internal static class IdConvert
{ {
internal static readonly IFormatProvider _format = CultureInfo.InvariantCulture; internal static readonly IFormatProvider _format = CultureInfo.InvariantCulture;
public static short ToShort(string value)
=> short.Parse(value, NumberStyles.None, _format);
public static short? ToNullableShort(string value)
=> value == null ? (short?)null : short.Parse(value, NumberStyles.None, _format);
public static long ToLong(string value) public static long ToLong(string value)
=> long.Parse(value, NumberStyles.None, _format); => long.Parse(value, NumberStyles.None, _format);
public static long? ToNullableLong(string value) public static long? ToNullableLong(string value)
=> value == null ? (long?)null : long.Parse(value, NumberStyles.None, _format); => value == null ? (long?)null : long.Parse(value, NumberStyles.None, _format);
public static string ToString(short value)
=> value.ToString(_format);
public static string ToString(short? value)
=> value?.ToString(_format);
public static string ToString(long value) public static string ToString(long value)
=> value.ToString(_format); => value.ToString(_format);
public static string ToString(long? value) public static string ToString(long? value)

2
src/Discord.Net/Models/User.cs
View File

@@ -67,7 +67,7 @@ namespace Discord
public string Token { get; private set; } public string Token { get; private set; }
/// <summary> Returns the id for the game this user is currently playing. </summary> /// <summary> Returns the id for the game this user is currently playing. </summary>
public string GameId { get; private set; } public int? GameId { get; private set; }
/// <summary> Returns the current status for this user. </summary> /// <summary> Returns the current status for this user. </summary>
public UserStatus Status { get; private set; } public UserStatus Status { get; private set; }
/// <summary> Returns the time this user last sent/edited a message, started typing or sent voice data in this server. </summary> /// <summary> Returns the time this user last sent/edited a message, started typing or sent voice data in this server. </summary>