Use a single Response class

example/main.dart

@@ -26,16 +26,21 @@ main() async {
   client.token = bearerToken;
 
   try {
-    var currentAccount = await client.verifyCredentials();
+    final currentAccount = await client.verifyCredentials();
     print('Hello ${currentAccount.username}!');
     print('\n');
   } on MastodonException catch (e) {
     print(e.message);
     exit(1);
   }
 
-  var timeline = await client.timeline(limit: 5);
-  for (var status in timeline) {
+  final response = await client.timeline(limit: 5);
+  for (final model in response.data) {
+    final status = model.data;
+    if (status == null) {
+      print('Error parsing status: ${model.error!.exception}');
+      continue;
+    }
     print('@${status.account.acct}: ${_stripHtml(status.content)}');
   }
 }

lib/src/endpoints/search.dart

@@ -3,16 +3,18 @@ import 'dart:convert';
 import '../authentication.dart';
 import '../exception.dart';
 import '../model.dart';
-import '../model_response.dart';
+import '../response.dart';
 import '../models/results.dart';
 import '../utilities.dart';
 
+typedef SearchResponse = Response<Model<Results>>;
+
 mixin Search on Authentication, Utilities {
   /// GET /api/v2/search
   ///
   /// - authenticated
   /// - read read:search
-  Future<ModelResponse<Results>> search(
+  Future<SearchResponse> search(
     String q, {
     bool resolve = false,
   }) async {
@@ -27,13 +29,13 @@ mixin Search on Authentication, Utilities {
     );
 
     try {
-      return ModelResponse(
+      return Response(
         Model.success(
           Results.fromJson(json.decode(response.body)),
         ),
       );
     } on Exception catch (e) {
-      return ModelResponse(
+      return Response(
         Model.failure(
           ModelException(
             exception: e,

lib/src/endpoints/statuses.dart

@@ -1,37 +1,39 @@
 import 'dart:convert';
 
-import 'package:http/http.dart';
+import 'package:http/http.dart' as http;
 
 import '../authentication.dart';
 import '../exception.dart';
 import '../model.dart';
-import '../model_response.dart';
+import '../response.dart';
 import '../models/account.dart';
 import '../models/card.dart';
 import '../models/context.dart';
 import '../models/status.dart';
 import '../models/visibility.dart';
 import '../utilities.dart';
 
+typedef StatusResponse = Response<Model<Status>>;
+
 mixin Statuses on Authentication, Utilities {
   /// GET /api/v1/statuses/:id
   ///
   /// - public
   /// - read read:statuses
-  Future<ModelResponse<Status>> status(String id) async {
+  Future<StatusResponse> status(String id) async {
     final response = await request(
       Method.get,
       "/api/v1/statuses/$id",
     );
 
     try {
-      return ModelResponse(
+      return Response(
         Model.success(
           Status.fromJson(json.decode(response.body)),
         ),
       );
     } on Exception catch (e) {
-      return ModelResponse(
+      return Response(
         Model.failure(
           ModelException(
             exception: e,
@@ -174,7 +176,7 @@ mixin Statuses on Authentication, Utilities {
   /// - authenticated
   /// - write write:statuses
   Future<Status> reblog(String id) async {
-    late final Response response;
+    late final http.Response response;
 
     try {
       response = await request(

lib/src/endpoints/timelines.dart

@@ -5,15 +5,17 @@ import '../exception.dart';
 import '../model.dart';
 import '../models/conversation.dart';
 import '../models/status.dart';
-import '../models_response.dart';
+import '../response.dart';
 import '../utilities.dart';
 
+typedef TimelineResponse = Response<List<Model<Status>>>;
+
 mixin Timelines on Authentication, Utilities {
   /// GET /api/v1/timelines/home
   ///
   /// - authenticated
   /// - read read:statuses
-  Future<ModelsResponse<Status>> timeline({
+  Future<TimelineResponse> timeline({
     String? maxId,
     String? sinceId,
     String? minId,
@@ -47,7 +49,7 @@ mixin Timelines on Authentication, Utilities {
       }),
     );
 
-    return ModelsResponse(models);
+    return Response(models);
   }
 
   /// GET /api/v1/conversations

lib/src/response.dart

@@ -0,0 +1,5 @@
+class Response<D> {
+  final D data;
+
+  Response(this.data);
+}