Merge pull request #559 from BeaudanBrown/mention-bug

Check against null message body when detecting mentions
oxen-io · Oct 15, 2019 · 6eef0b6 · 6eef0b6
2 parents 9c7168d + 29e83ca
commit 6eef0b6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 });
               }