From aa806ce400445e488435effcdc2935c5b18bfa59 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Mon, 16 Jul 2018 12:18:31 -0400
Subject: [PATCH] Allow topics to be optional when pubKey/privKey is used

---
 lib/modules/whisper/js/embarkjs.js | 38 +++++++++++++++++-------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/lib/modules/whisper/js/embarkjs.js b/lib/modules/whisper/js/embarkjs.js
index 18dd22a2..ea72b9d0 100644
--- a/lib/modules/whisper/js/embarkjs.js
+++ b/lib/modules/whisper/js/embarkjs.js
@@ -32,33 +32,34 @@ __embarkWhisperNewWeb3.setProvider = function (options) {
 
 __embarkWhisperNewWeb3.sendMessage = function (options) {
   var topics, data, ttl, payload;
-  topics = options.topic || options.topics;
+  topics = options.topic;
   data = options.data || options.payload;
   ttl = options.ttl || 100;
   var powTime = options.powTime || 3;
   var powTarget = options.powTarget || 0.5;
 
-  if (topics === undefined) {
-    throw new Error("missing option: topic");
-  }
-
   if (data === undefined) {
     throw new Error("missing option: data");
   }
 
-  topics = this.web3.utils.toHex(topics).slice(0, 10);
+  if (topics) {
+    topics = this.web3.utils.toHex(topics).slice(0, 10);
+  }
 
   payload = JSON.stringify(data);
 
   let message = {
     sig: this.sig, // signs the message using the keyPair ID
     ttl: ttl,
-    topic: topics,
     payload: EmbarkJS.Utils.fromAscii(payload),
     powTime: powTime,
     powTarget: powTarget
   };
 
+  if (topics) {
+    message.topic = topics;
+  }
+
   if (options.pubKey) {
     message.pubKey = options.pubKey; // encrypt using a given pubKey
   } else if(options.symKeyID) {
@@ -67,24 +68,29 @@ __embarkWhisperNewWeb3.sendMessage = function (options) {
     message.symKeyID = this.symKeyID; // encrypts using the sym key ID
   }
 
+  if (topics === undefined && message.symKeyID && !message.pubKey) {
+    throw new Error("missing option: topic");
+  }
+
   this.web3.shh.post(message, function () {
   });
 };
 
 __embarkWhisperNewWeb3.listenTo = function (options, callback) {
-  var topics = options.topic || options.topics;
+  var topics = options.topic;
 
   let promise = new __MessageEvents();
 
-  if (typeof topics === 'string') {
-    topics = [this.web3.utils.toHex(topics).slice(0, 10)];
-  } else {
-    topics = topics.map((t) => this.web3.utils.toHex(t).slice(0, 10));
-  }
+  let subOptions = {};
 
-  let subOptions = {
-    topics: topics
-  };
+  if(topics){
+    if (typeof topics === 'string') {
+      topics = [this.web3.utils.toHex(topics).slice(0, 10)];
+    } else {
+      topics = topics.map((t) => this.web3.utils.toHex(t).slice(0, 10));
+    }
+    subOptions.topics = topics;
+  }
 
   if (options.minPow) {
     subOptions.minPow = options.minPow;