From bdba3c08d2affa037e2cfc45d8d1532288bcf484 Mon Sep 17 00:00:00 2001
From: Tommy Chow <tommyxchow@gmail.com>
Date: Tue, 28 Nov 2023 06:15:00 -0500
Subject: [PATCH] Make `Owner7TV` nullable Some emotes don't have an owner,
 causing parsing errors and resulting in emotes not showing in chat.

---
 lib/models/emotes.dart   | 6 +++---
 lib/models/emotes.g.dart | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/models/emotes.dart b/lib/models/emotes.dart
index 79c137d4..e5a00edc 100644
--- a/lib/models/emotes.dart
+++ b/lib/models/emotes.dart
@@ -156,7 +156,7 @@ class Emote7TVData {
   final String id;
   final String name;
   final int flags;
-  final Owner7TV owner;
+  final Owner7TV? owner;
   final Emote7TVHost host;
 
   const Emote7TVData(
@@ -277,8 +277,8 @@ class Emote {
       zeroWidth: isZeroWidth,
       url: 'https:$url/${file.name}',
       type: type,
-      ownerDisplayName: emoteData.owner.displayName,
-      ownerUsername: emoteData.owner.username,
+      ownerDisplayName: emoteData.owner?.displayName,
+      ownerUsername: emoteData.owner?.username,
     );
   }
 
diff --git a/lib/models/emotes.g.dart b/lib/models/emotes.g.dart
index 83a5b9bc..1204679b 100644
--- a/lib/models/emotes.g.dart
+++ b/lib/models/emotes.g.dart
@@ -74,7 +74,9 @@ Emote7TVData _$Emote7TVDataFromJson(Map<String, dynamic> json) => Emote7TVData(
       json['id'] as String,
       json['name'] as String,
       json['flags'] as int,
-      Owner7TV.fromJson(json['owner'] as Map<String, dynamic>),
+      json['owner'] == null
+          ? null
+          : Owner7TV.fromJson(json['owner'] as Map<String, dynamic>),
       Emote7TVHost.fromJson(json['host'] as Map<String, dynamic>),
     );