From a6f12af8da0ad3043c57e28449b1b5aebbba5e5b Mon Sep 17 00:00:00 2001
From: Adriano Rogowski <rogowski.adriano@gmail.com>
Date: Thu, 10 Jan 2019 20:16:35 -0200
Subject: [PATCH] Revert changes in gun to solve peer.id undefined. Don't need
 this change now because we are not using the peer.id in the subscriptions.
 Maybe will add this in the future.

---
 gun.js               | 15 +++++----------
 src/adapters/mesh.js | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/gun.js b/gun.js
index be5dbbb8..699887ce 100644
--- a/gun.js
+++ b/gun.js
@@ -2119,10 +2119,10 @@
 					mesh.say({dam: '?'}, opt.peers[tmp] = peer);
 				}
 				if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) }
-				// tmp = peer.queue; peer.queue = [];
-				// Type.obj.map(tmp, function(msg){
-				// 	mesh.say(msg, peer);
-				// });
+				tmp = peer.queue; peer.queue = [];
+				Type.obj.map(tmp, function(msg){
+					mesh.say(msg, peer);
+				});
 			}
 			mesh.bye = function(peer){
 				Type.obj.del(opt.peers, peer.id); // assume if peer.url then reconnect
@@ -2132,12 +2132,7 @@
 			mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) }
 			mesh.hear['?'] = function(msg, peer){
 				if(!msg.pid){
-					mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer)
-					var tmp = peer.queue; peer.queue = [];
-					Type.obj.map(tmp, function(msg){
-						mesh.say(msg, peer);
-					});
-					return;
+					return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
 				}
 				peer.id = peer.id || msg.pid;
 				mesh.hi(peer);
diff --git a/src/adapters/mesh.js b/src/adapters/mesh.js
index 1de2aa5a..2363c19f 100644
--- a/src/adapters/mesh.js
+++ b/src/adapters/mesh.js
@@ -193,10 +193,10 @@ function Mesh(ctx){
 			mesh.say({dam: '?'}, opt.peers[tmp] = peer);
 		}
 		if(!tmp.hied){ ctx.on(tmp.hied = 'hi', peer) }
-		// tmp = peer.queue; peer.queue = [];
-		// Type.obj.map(tmp, function(msg){
-		// 	mesh.say(msg, peer);
-		// });
+		tmp = peer.queue; peer.queue = [];
+		Type.obj.map(tmp, function(msg){
+			mesh.say(msg, peer);
+		});
 	}
 	mesh.bye = function(peer){
 		Type.obj.del(opt.peers, peer.id); // assume if peer.url then reconnect
@@ -206,12 +206,7 @@ function Mesh(ctx){
 	mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) }
 	mesh.hear['?'] = function(msg, peer){
 		if(!msg.pid){
-			mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer)
-			var tmp = peer.queue; peer.queue = [];
-			Type.obj.map(tmp, function(msg){
-				mesh.say(msg, peer);
-			});
-			return;
+			return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
 		}
 		peer.id = peer.id || msg.pid;
 		mesh.hi(peer);