fix: allow topicCIDs from older peers (#631)

ipfs-inactive · Nov 20, 2017 · fe7cc22 · fe7cc22
1 parent 5782b2d
commit fe7cc22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/pubsub.js b/src/pubsub.js
@@ -121,6 +121,7 @@ module.exports = (arg) => {
   function subscribe (topic, options, handler, callback) {
     ps.on(topic, handler)
     if (subscriptions[topic]) {
+      // TODO: should a callback error be returned?
       return callback()
     }
 

diff --git a/src/utils/pubsub-message-utils.js b/src/utils/pubsub-message-utils.js
@@ -30,10 +30,10 @@ function deserializeFromBase64 (obj) {
     from: bs58.encode(Buffer.from(obj.from, 'base64')).toString(),
     seqno: Buffer.from(obj.seqno, 'base64'),
     data: Buffer.from(obj.data, 'base64'),
-    topicIDs: obj.topicIDs
+    topicIDs: obj.topicIDs || obj.topicCIDs
   }
 }
 
 function isPubsubMessage (obj) {
-  return obj && obj.from && obj.seqno && obj.data && obj.topicIDs
+  return obj && obj.from && obj.seqno && obj.data && (obj.topicIDs || obj.topicCIDs)
 }