Prevent overflow when converting snowflake to datetime

Benny- · Nov 11, 2018 · 7e46786 · 7e46786
1 parent e05a32f
commit 7e46786
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/lib/src/nyxx/events/TypingEvent.dart b/lib/src/nyxx/events/TypingEvent.dart
@@ -17,6 +17,8 @@ class TypingEvent {
 
       this.channel = chan;
       this.user = client.users[Snowflake(json['d']['user_id'] as String)];
+      if(this.user == null) return;
+
       client._events.onTyping.add(this);
       channel._onTyping.add(this);
     });

diff --git a/lib/src/nyxx/objects/Snowflake.dart b/lib/src/nyxx/objects/Snowflake.dart
@@ -41,8 +41,7 @@ class Snowflake implements Comparable<Snowflake> {
   /// Returns timestamp included in [Snowflake]
   /// [Snowflake reference](https://discordapp.com/developers/docs/reference#snowflakes)
   DateTime get timestamp =>
-      DateTime.fromMillisecondsSinceEpoch((int.parse(_id) >> 22) + discordEpoch)
-          .toUtc();
+      DateTime.fromMillisecondsSinceEpoch((BigInt.parse(_id) >> 22).toInt() + discordEpoch, isUtc: true);
 
   @override
   String toString() => _id;

diff --git a/test/travis.dart b/test/travis.dart
@@ -94,6 +94,15 @@ void main() {
 
     print("TESTING CLIENT INTERNALS");
 
+    nyxx.Snowflake a = nyxx.Snowflake.fromDateTime(new DateTime(2017));
+    nyxx.Snowflake b = nyxx.Snowflake.fromDateTime(new DateTime(2018));
+
+    assert(a.compareTo(b) > 0);
+    assert(b.compareTo(a) < 0);
+
+    assert(a.timestamp == new DateTime(2017));
+    assert(b.timestamp == new DateTime(2018));
+
     assert(bot.channels.count > 0);
     assert(bot.users.count > 0);
     assert(bot.shards.length == 1);