diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index b00284b7d..f00b52c0d 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -82,9 +82,6 @@
API\Converters\LongStringConverter.cs
-
- API\Converters\ShortStringConverter.cs
-
API\Endpoints.cs
diff --git a/src/Discord.Net/API/Converters/ShortStringConverter.cs b/src/Discord.Net/API/Converters/ShortStringConverter.cs
deleted file mode 100644
index 1cfb1a7a2..000000000
--- a/src/Discord.Net/API/Converters/ShortStringConverter.cs
+++ /dev/null
@@ -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));
- }
- }*/
-}
diff --git a/src/Discord.Net/API/Members.cs b/src/Discord.Net/API/Members.cs
index b25d4d143..9d120dd18 100644
--- a/src/Discord.Net/API/Members.cs
+++ b/src/Discord.Net/API/Members.cs
@@ -49,7 +49,7 @@ namespace Discord.API
public class PresenceInfo : MemberReference
{
[JsonProperty("game_id")]
- public string GameId;
+ public int? GameId;
[JsonProperty("status")]
public string Status;
[JsonProperty("roles")] //TODO: Might be temporary
diff --git a/src/Discord.Net/Helpers/IdConvert.cs b/src/Discord.Net/Helpers/IdConvert.cs
index 6721d7de9..81343662b 100644
--- a/src/Discord.Net/Helpers/IdConvert.cs
+++ b/src/Discord.Net/Helpers/IdConvert.cs
@@ -6,20 +6,12 @@ namespace Discord
internal static class IdConvert
{
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)
=> long.Parse(value, NumberStyles.None, _format);
public static long? ToNullableLong(string value)
=> 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)
=> value.ToString(_format);
public static string ToString(long? value)
diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index c1fea7b9e..3f8ac6d41 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -67,7 +67,7 @@ namespace Discord
public string Token { get; private set; }
/// Returns the id for the game this user is currently playing.
- public string GameId { get; private set; }
+ public int? GameId { get; private set; }
/// Returns the current status for this user.
public UserStatus Status { get; private set; }
/// Returns the time this user last sent/edited a message, started typing or sent voice data in this server.