From 29e83cadbf4ee0938edad3938e6e6e99e97649c1 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Mon, 14 Oct 2019 13:38:40 +1100
Subject: [PATCH] Check against null message body when detecting mentions

---
 js/models/messages.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 7c2022fe6..cb5927484 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1971,7 +1971,10 @@
             } else {
               const ourNumber = textsecure.storage.user.getNumber();
 
-              if (message.attributes.body.indexOf(`@${ourNumber}`) !== -1) {
+              if (
+                message.attributes.body &&
+                message.attributes.body.indexOf(`@${ourNumber}`) !== -1
+              ) {
                 conversation.set({ mentionedUs: true });
               }