bug: Remove Error form IHttpResponseError; Fixup field names on IHttp…

…ResponseError; Fixup IHttpResponseSuccess name (#324)
nyxx-discord · Apr 9, 2022 · fc438e4 · fc438e4
1 parent 4528797
commit fc438e4
Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/lib/nyxx.dart b/lib/nyxx.dart
@@ -138,7 +138,7 @@ export 'src/internal/exceptions/invalid_shard_exception.dart' show InvalidShardE
 export 'src/internal/exceptions/invalid_snowflake_exception.dart' show InvalidSnowflakeException;
 export 'src/internal/exceptions/missing_token_error.dart' show MissingTokenError;
 export 'src/internal/exceptions/unrecoverable_nyxx_error.dart' show UnrecoverableNyxxError;
-export 'src/internal/http/http_response.dart' show IHttpResponse, IHttpResponseError, IHttpResponseSucess;
+export 'src/internal/http/http_response.dart' show IHttpResponse, IHttpResponseError, IHttpResponseSuccess;
 export 'src/internal/interfaces/convertable.dart' show Convertable;
 export 'src/internal/interfaces/disposable.dart' show Disposable;
 export 'src/internal/interfaces/message_author.dart' show IMessageAuthor;

diff --git a/lib/src/internal/connection_manager.dart b/lib/src/internal/connection_manager.dart
@@ -30,7 +30,7 @@ class ConnectionManager {
     final httpResponse = await (client.httpEndpoints as HttpEndpoints).getGatewayBot();
 
     if (httpResponse is HttpResponseError) {
-      throw UnrecoverableNyxxError("Cannot get gateway url: [${httpResponse.errorCode}; ${httpResponse.errorMessage}]");
+      throw UnrecoverableNyxxError("Cannot get gateway url: [${httpResponse.code}; ${httpResponse.message}]");
     }
 
     final response = httpResponse as HttpResponseSuccess;

diff --git a/lib/src/internal/http/http_handler.dart b/lib/src/internal/http/http_handler.dart
@@ -97,7 +97,7 @@ class HttpHandler {
     await responseError.finalize();
 
     (client.eventsRest as RestEventController).onHttpErrorController.add(HttpErrorEvent(responseError));
-    logger.finer("Got failure http response for endpoint: [${response.request?.url.toString()}]; Response: [${responseError.errorMessage}]");
+    logger.finer("Got failure http response for endpoint: [${response.request?.url.toString()}]; Response: [${responseError.message}]");
 
     return responseError;
   }

diff --git a/lib/src/internal/http/http_response.dart b/lib/src/internal/http/http_response.dart
@@ -39,7 +39,7 @@ abstract class HttpResponse implements IHttpResponse {
   }
 }
 
-abstract class IHttpResponseSucess implements IHttpResponse {
+abstract class IHttpResponseSuccess implements IHttpResponse {
   /// Body of response
   List<int> get body;
 
@@ -48,7 +48,7 @@ abstract class IHttpResponseSucess implements IHttpResponse {
 }
 
 /// Returned when http request is successfully executed.
-class HttpResponseSuccess extends HttpResponse implements IHttpResponseSucess {
+class HttpResponseSuccess extends HttpResponse implements IHttpResponseSuccess {
   /// Body of response
   @override
   List<int> get body => _body;
@@ -61,50 +61,47 @@ class HttpResponseSuccess extends HttpResponse implements IHttpResponseSucess {
   HttpResponseSuccess(http.StreamedResponse response) : super(response);
 }
 
-abstract class IHttpResponseError implements IHttpResponse, Error, Exception {
+abstract class IHttpResponseError implements IHttpResponse, Exception {
   /// Message why http request failed
-  String get errorMessage;
+  String get message;
 
   /// Error code of response
-  int get errorCode;
+  int get code;
 }
 
 /// Returned when client fails to execute http request.
 /// Will contain reason why request failed.
 class HttpResponseError extends HttpResponse implements IHttpResponseError {
   /// Message why http request failed
   @override
-  late String errorMessage;
+  late String message;
 
   /// Error code of response
   @override
-  late int errorCode;
+  late int code;
 
   /// Creates an instance of [HttpResponseError]
   HttpResponseError(http.StreamedResponse response) : super(response) {
     if (response.headers["Content-Type"] == "application/json") {
-      errorCode = _jsonBody["code"] as int;
-      errorMessage = _jsonBody["message"] as String;
+      code = _jsonBody["code"] as int;
+      message = _jsonBody["message"] as String;
     } else {
-      errorMessage = "";
-      errorCode = response.statusCode;
+      message = "";
+      code = response.statusCode;
     }
   }
 
   @override
   Future<void> finalize() async {
     await super.finalize();
 
-    if (errorMessage.isEmpty) {
+    if (message.isEmpty) {
       try {
-        errorMessage = utf8.decode(_body);
+        message = utf8.decode(_body);
       } on Exception {} // ignore: empty_catches
     }
   }
 
   @override
-  String toString() => "[Code: $errorCode] [Message: $errorMessage]";
-
-  @override
-  StackTrace? get stackTrace => null;
+  String toString() => "[Code: $code] [Message: $message]";
 }
diff --git a/lib/src/internal/http_endpoints.dart b/lib/src/internal/http_endpoints.dart
@@ -1596,7 +1596,7 @@ class HttpEndpoints implements IHttpEndpoints {
       return Future.error(result);
     }
 
-    return ThreadMember(client, (result as IHttpResponseSucess).jsonBody as RawApiMap, GuildCacheable(client, guildId));
+    return ThreadMember(client, (result as IHttpResponseSuccess).jsonBody as RawApiMap, GuildCacheable(client, guildId));
   }
 
   @override
@@ -1618,7 +1618,7 @@ class HttpEndpoints implements IHttpEndpoints {
       return Future.error(response);
     }
 
-    return GuildEvent((response as IHttpResponseSucess).jsonBody as RawApiMap, client);
+    return GuildEvent((response as IHttpResponseSuccess).jsonBody as RawApiMap, client);
   }
 
   @override
@@ -1633,7 +1633,7 @@ class HttpEndpoints implements IHttpEndpoints {
       return Future.error(response);
     }
 
-    return GuildEvent((response as IHttpResponseSucess).jsonBody as RawApiMap, client);
+    return GuildEvent((response as IHttpResponseSuccess).jsonBody as RawApiMap, client);
   }
 
   @override
@@ -1644,7 +1644,7 @@ class HttpEndpoints implements IHttpEndpoints {
       return Future.error(response);
     }
 
-    return GuildEvent((response as IHttpResponseSucess).jsonBody as RawApiMap, client);
+    return GuildEvent((response as IHttpResponseSuccess).jsonBody as RawApiMap, client);
   }
 
   @override
@@ -1661,7 +1661,7 @@ class HttpEndpoints implements IHttpEndpoints {
       yield* Stream.error(response);
     }
 
-    for (final rawGuildEventUser in (response as IHttpResponseSucess).jsonBody as RawApiList) {
+    for (final rawGuildEventUser in (response as IHttpResponseSuccess).jsonBody as RawApiList) {
       yield GuildEventUser(rawGuildEventUser as RawApiMap, client, guildId);
     }
   }
@@ -1675,7 +1675,7 @@ class HttpEndpoints implements IHttpEndpoints {
       yield* Stream.error(response);
     }
 
-    for (final rawGuildEvent in (response as IHttpResponseSucess).jsonBody as RawApiList) {
+    for (final rawGuildEvent in (response as IHttpResponseSuccess).jsonBody as RawApiList) {
       yield GuildEvent(rawGuildEvent as RawApiMap, client);
     }
   }