From 21c00f51bd3bb1fee4fbfe5337107bac97b7a387 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Wed, 13 Oct 2021 11:29:15 -0500
Subject: [PATCH] Improve reaction types

---
 ts/messageModifiers/Reactions.ts | 2 +-
 ts/model-types.d.ts              | 2 +-
 ts/models/conversations.ts       | 2 +-
 ts/models/messages.ts            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ts/messageModifiers/Reactions.ts b/ts/messageModifiers/Reactions.ts
index f13273e285a..5d5fa190080 100644
--- a/ts/messageModifiers/Reactions.ts
+++ b/ts/messageModifiers/Reactions.ts
@@ -13,7 +13,7 @@ export class ReactionModel extends Model<ReactionAttributesType> {}
 
 let singleton: Reactions | undefined;
 
-export class Reactions extends Collection {
+export class Reactions extends Collection<ReactionModel> {
   static getSingleton(): Reactions {
     if (!singleton) {
       singleton = new Reactions();
diff --git a/ts/model-types.d.ts b/ts/model-types.d.ts
index 9664d6bb0d8..9da3b92f503 100644
--- a/ts/model-types.d.ts
+++ b/ts/model-types.d.ts
@@ -373,7 +373,7 @@ export type ReactionAttributesType = {
   remove?: boolean;
   targetAuthorUuid: string;
   targetTimestamp: number;
-  fromId?: string;
+  fromId: string;
   timestamp: number;
   fromSync?: boolean;
 };
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index c3224bacc5e..02d1a6e6a06 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4870,7 +4870,7 @@ export class ConversationModel extends window.Backbone
 
   async notify(
     message: Readonly<MessageModel>,
-    reaction?: WhatIsThis
+    reaction?: Readonly<ReactionModel>
   ): Promise<void> {
     // As a performance optimization don't perform any work if notifications are
     // disabled.
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 2e6c1f12f44..eb913b95fec 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -108,7 +108,7 @@ import {
   MessageReceiptType,
 } from '../messageModifiers/MessageReceipts';
 import { Deletes } from '../messageModifiers/Deletes';
-import { Reactions } from '../messageModifiers/Reactions';
+import { Reactions, ReactionModel } from '../messageModifiers/Reactions';
 import { ReadSyncs } from '../messageModifiers/ReadSyncs';
 import { ViewSyncs } from '../messageModifiers/ViewSyncs';
 import { ViewOnceOpenSyncs } from '../messageModifiers/ViewOnceOpenSyncs';
@@ -3167,7 +3167,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   async handleReaction(
-    reaction: typeof window.WhatIsThis,
+    reaction: ReactionModel,
     shouldPersist = true
   ): Promise<ReactionAttributesType | undefined> {
     const { attributes } = this;