Merge branch 'dev'

# Conflicts:
#	lib/src/http/request.dart
#	lib/src/models/user/user.dart
#	pubspec.yaml
#	test/unit/cache/cache_test.dart

Author: randommodder

README.md

@@ -1,3 +1,5 @@
+Made web possible, by using a cors proxy. This is NOT encouraged, but it works (in many cases). The code is really janky, so don't expect too much.
+
 # nyxx
 
 [![Discord](https://discordapp.com/api/guilds/846136758470443069/widget.png?style=shield)](https://discord.gg/nyxx)

lib/src/api_options.dart

@@ -2,6 +2,7 @@ import 'package:nyxx/src/builders/presence.dart';
 import 'package:nyxx/src/intents.dart';
 import 'package:nyxx/src/utils/flags.dart';
 import 'package:oauth2/oauth2.dart';
+import 'package:universal_platform/universal_platform.dart';
 
 /// Options for connecting to the Discord API.
 abstract class ApiOptions {
@@ -17,7 +18,7 @@ abstract class ApiOptions {
   /// The host at which the API can be found.
   ///
   /// This is always `discord.com`.
-  String get host => 'discord.com';
+  String get host => UniversalPlatform.isWeb ? 'cors2.discordworker-cfb.workers.dev' : "discord.com";//'discord.com'; cors.discordworker-cfb.workers.dev
 
   /// The base URI relative to the [host] where the API can be found.
   String get baseUri => '/api/v$apiVersion';

lib/src/gateway/gateway.dart

@@ -221,7 +221,7 @@ class Gateway extends GatewayManager with EventParser {
   }
 
   /// Compute the ID of the shard that handles events for [guildId].
-  int shardIdFor(Snowflake guildId) => (guildId.value >> 22) % totalShards;
+  BigInt shardIdFor(Snowflake guildId) => (guildId.value >> 22) % BigInt.from(totalShards);
 
   /// Return the shard that handles events for [guildId].
   ///

lib/src/http/managers/audit_log_manager.dart

@@ -61,7 +61,7 @@ class AuditLogManager extends ReadOnlyManager<AuditLogEntry> {
   @override
   Future<AuditLogEntry> fetch(Snowflake id) async {
     // Add one because before and after are exclusive.
-    final entries = await list(before: Snowflake(id.value + 1));
+    final entries = await list(before: Snowflake.fromBigInt(id.value + BigInt.one));
 
     return entries.firstWhere(
       (entry) => entry.id == id,

lib/src/http/managers/entitlement_manager.dart

@@ -70,7 +70,7 @@ class EntitlementManager extends ReadOnlyManager<Entitlement> {
 
   @override
   Future<Entitlement> fetch(Snowflake id) async {
-    final entitlements = await list(before: Snowflake(id.value + 1));
+    final entitlements = await list(before: Snowflake.fromBigInt(id.value + BigInt.one));
 
     return entitlements.firstWhere(
       (entitlement) => entitlement.id == id,

lib/src/http/request.dart

@@ -72,8 +72,8 @@ abstract class HttpRequest {
         queryParameters.isNotEmpty ? queryParameters : null,
       );
 
-  Map<String, String> _getHeaders(Nyxx client) => {
-        userAgent: client.apiOptions.userAgent,
+  Map<String, String> _getHeaders(Nyxx client) => {// Apply userAgent, only when not in web
+        if (!const bool.fromEnvironment('dart.library.js_util')) userAgent: client.apiOptions.userAgent,
         if (auditLogReason != null) xAuditLogReason: Uri.encodeComponent(auditLogReason!),
         if (authenticated) authorization: client.apiOptions.authorizationHeader,
         ...headers,

lib/src/models/snowflake.dart

@@ -23,47 +23,49 @@ class Snowflake implements Comparable<Snowflake> {
   static const bulkDeleteLimit = Duration(days: 14);
 
   /// A snowflake with a value of 0.
-  static const zero = Snowflake(0);
+  static var zero = Snowflake(0);
 
   /// The value of this snowflake.
   ///
   /// While this is stored in a signed [int], Discord treats this as an unsigned value.
-  final int value;
+  final BigInt value;
 
   /// The time at which this snowflake was created.
-  DateTime get timestamp => epoch.add(Duration(milliseconds: millisecondsSinceEpoch));
+  DateTime get timestamp => epoch.add(Duration(milliseconds: millisecondsSinceEpoch.toInt()));
 
   /// The number of milliseconds since the [epoch].
   ///
   /// Discord uses a non-standard epoch for their snowflakes. As such,
   /// [DateTime.fromMillisecondsSinceEpoch] will not work with this value. Users should instead use
   /// the [timestamp] getter.
-  int get millisecondsSinceEpoch => value >> 22;
+  BigInt get millisecondsSinceEpoch => value >> 22;
 
   /// The internal worker ID for this snowflake.
   ///
   /// {@template internal_field}
   /// This is an internal field and has no practical application.
   /// {@endtemplate}
-  int get workerId => (value & 0x3E0000) >> 17;
+  BigInt get workerId => (value & BigInt.parse("0x3E0000")) >> 17;
 
   /// The internal process ID for this snowflake.
   ///
   /// {@macro internal_field}
-  int get processId => (value & 0x1F000) >> 12;
+  BigInt get processId => (value & BigInt.parse("0x1F000")) >> 12;
 
   /// The internal increment value for this snowflake.
   ///
   /// {@macro internal_field}
-  int get increment => value & 0xFFF;
+  BigInt get increment => value & BigInt.parse("0xFFF");
 
   /// Whether this snowflake has a value of `0`.
-  bool get isZero => value == 0;
+  bool get isZero => value.toInt() == 0;
 
   /// Create a new snowflake from an integer value.
   ///
   /// {@macro snowflake}
-  const Snowflake(this.value);
+  const Snowflake.fromBigInt(this.value);
+
+  Snowflake(int value): value = BigInt.from(value);
 
   /// Parse a string or integer value to a snowflake.
   ///
@@ -75,13 +77,13 @@ class Snowflake implements Comparable<Snowflake> {
   // TODO: This method will fail once snowflakes become larger than 2^63.
   // We need to parse the unsigned [value] into a signed [int].
   factory Snowflake.parse(Object /* String | int */ value) {
-    assert(value is String || value is int);
+    assert(value is String || value is int || value is BigInt);
 
-    if (value is! int) {
-      value = int.parse(value.toString());
+    if (value is! BigInt) {
+      value = BigInt.parse(value.toString());
     }
 
-    return Snowflake(value);
+    return Snowflake.fromBigInt(value);
   }
 
   /// Create a snowflake with a timestamp equal to the current time.
@@ -100,7 +102,7 @@ class Snowflake implements Comparable<Snowflake> {
       'Cannot create a Snowflake before the epoch.',
     );
 
-    return Snowflake(dateTime.difference(epoch).inMilliseconds << 22);
+    return Snowflake.parse(dateTime.difference(epoch).inMilliseconds << 22);
   }
 
   /// Create a snowflake representing the oldest time at which bulk delete operations will work.

lib/src/models/user/user.dart

@@ -115,8 +115,8 @@ class User extends PartialUser implements MessageAuthor, CommandOptionMentionabl
 
   /// This user's default avatar.
   CdnAsset get defaultAvatar {
-    final parsedDiscriminator = int.tryParse(discriminator);
-    final hash = parsedDiscriminator == null || parsedDiscriminator == 0 ? (id.value >> 22) % 6 : parsedDiscriminator % 5;
+    final parsedDiscriminator = BigInt.tryParse(discriminator);
+    final hash = parsedDiscriminator == null || parsedDiscriminator == 0 ? (id.value >> 22) % BigInt.from(6) : parsedDiscriminator.modInverse(BigInt.from(5));
 
     return CdnAsset(
       client: manager.client,

pubspec.yaml

@@ -17,6 +17,7 @@ dependencies:
   runtime_type: ^1.1.0
   meta: ^1.16.0
   oauth2: ^2.0.3
+  universal_platform: ^1.1.0
 
 dev_dependencies:
   test: ^1.25.14

test/test_endpoint.dart

@@ -29,7 +29,7 @@ Future<void> testEndpoint(
 
       final interceptor = Interceptor(RequestMatcher(
         method,
-        UriMatcher('https://discord.com/api/v${client.apiOptions.apiVersion}', endpointMatcher),
+        UriMatcher('https://${client.apiOptions.host}/api/v${client.apiOptions.apiVersion}', endpointMatcher),
         BodyMatcher((_, __) => true),
       ))
         ..reply(400, jsonEncode({'message': 'Intentional testing error', 'code': -1}));
@@ -47,7 +47,7 @@ Future<void> testEndpoint(
 
       final interceptor = Interceptor(RequestMatcher(
         method,
-        UriMatcher('https://discord.com/api/v${client.apiOptions.apiVersion}', endpointMatcher),
+        UriMatcher('https://${client.apiOptions.host}/api/v${client.apiOptions.apiVersion}', endpointMatcher),
         BodyMatcher((_) => true),
       ))
         ..reply(200, jsonEncode(response));