From ba60c164fece33a126fdfd3957ad501c5790d923 Mon Sep 17 00:00:00 2001
From: Tommy Chow <tommyxchow@gmail.com>
Date: Sun, 22 Aug 2021 23:57:02 -0400
Subject: [PATCH] Fix twitch badge JSON decoding

---
 lib/models/badges.dart   | 7 +++++--
 lib/models/badges.g.dart | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/models/badges.dart b/lib/models/badges.dart
index dcc81169..d7b13fb3 100644
--- a/lib/models/badges.dart
+++ b/lib/models/badges.dart
@@ -3,11 +3,14 @@ import 'package:json_annotation/json_annotation.dart';
 part 'badges.g.dart';
 
 // Twitch Badges
-@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+@JsonSerializable(createToJson: false)
 class BadgeImagesTwitch {
   final String id;
+  @JsonKey(name: 'image_url_1x')
   final String imageUrl1x;
+  @JsonKey(name: 'image_url_2x')
   final String imageUrl2x;
+  @JsonKey(name: 'image_url_4x')
   final String imageUrl4x;
 
   const BadgeImagesTwitch(this.id, this.imageUrl1x, this.imageUrl2x, this.imageUrl4x);
@@ -15,7 +18,7 @@ class BadgeImagesTwitch {
   factory BadgeImagesTwitch.fromJson(Map<String, dynamic> json) => _$BadgeImagesTwitchFromJson(json);
 }
 
-@JsonSerializable(createToJson: false)
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
 class BadgesTwitch {
   final String setId;
   final List<BadgeImagesTwitch> versions;
diff --git a/lib/models/badges.g.dart b/lib/models/badges.g.dart
index 3b16afda..49ccec05 100644
--- a/lib/models/badges.g.dart
+++ b/lib/models/badges.g.dart
@@ -9,15 +9,15 @@ part of 'badges.dart';
 BadgeImagesTwitch _$BadgeImagesTwitchFromJson(Map<String, dynamic> json) {
   return BadgeImagesTwitch(
     json['id'] as String,
-    json['image_url1x'] as String,
-    json['image_url2x'] as String,
-    json['image_url4x'] as String,
+    json['image_url_1x'] as String,
+    json['image_url_2x'] as String,
+    json['image_url_4x'] as String,
   );
 }
 
 BadgesTwitch _$BadgesTwitchFromJson(Map<String, dynamic> json) {
   return BadgesTwitch(
-    json['setId'] as String,
+    json['set_id'] as String,
     (json['versions'] as List<dynamic>)
         .map((e) => BadgeImagesTwitch.fromJson(e as Map<String, dynamic>))
         .toList(),