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

Fixed DateTimeUtils on .Net Standard 1.1

Browse Source
This commit is contained in:
RogueException
2017-03-22 05:35:19 -03:00
parent 32cf7ba5e1
commit 13b9b15cf0
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Discord.Net.Core/Utils/DateTimeUtils.cs
View File

@@ -2,12 +2,13 @@
namespace Discord namespace Discord
{ {
//Source: https://github.com/dotnet/coreclr/blob/master/src/mscorlib/src/System/DateTimeOffset.cs
internal static class DateTimeUtils internal static class DateTimeUtils
{ {
#if !NETSTANDARD1_3 #if !NETSTANDARD1_3
//https://github.com/dotnet/coreclr/blob/master/src/mscorlib/src/System/DateTimeOffset.cs private const long UnixEpochTicks = 621_355_968_000_000_000;
private const long UnixEpochTicks = 621355968000000000; private const long UnixEpochSeconds = 62_135_596_800;
private const long UnixEpochSeconds = 62135596800; private const long UnixEpochMilliseconds = 62_135_596_800_000;
#endif #endif
public static DateTimeOffset FromSnowflake(ulong value) public static DateTimeOffset FromSnowflake(ulong value)
@@ -29,12 +30,12 @@ namespace Discord
return new DateTimeOffset(ticks, TimeSpan.Zero); return new DateTimeOffset(ticks, TimeSpan.Zero);
#endif #endif
} }
public static DateTimeOffset FromUnixMilliseconds(long seconds) public static DateTimeOffset FromUnixMilliseconds(long milliseconds)
{ {
#if NETSTANDARD1_3 #if NETSTANDARD1_3
return DateTimeOffset.FromUnixTimeMilliseconds(seconds); return DateTimeOffset.FromUnixTimeMilliseconds(milliseconds);
#else #else
long ticks = seconds * TimeSpan.TicksPerMillisecond + UnixEpochTicks; long ticks = milliseconds * TimeSpan.TicksPerMillisecond + UnixEpochTicks;
return new DateTimeOffset(ticks, TimeSpan.Zero); return new DateTimeOffset(ticks, TimeSpan.Zero);
#endif #endif
} }
@@ -53,8 +54,8 @@ namespace Discord
#if NETSTANDARD1_3 #if NETSTANDARD1_3
return dto.ToUnixTimeMilliseconds(); return dto.ToUnixTimeMilliseconds();
#else #else
long seconds = dto.UtcDateTime.Ticks / TimeSpan.TicksPerMillisecond; long milliseconds = dto.UtcDateTime.Ticks / TimeSpan.TicksPerMillisecond;
return seconds - UnixEpochSeconds; return milliseconds - UnixEpochMilliseconds;
#endif #endif
} }
} }