git ssb


10+

Dominic / patchbay



This fixes a few things I've noticed in Bay over the past week

%Za1v/TTX+psSMxQXAZ71sMJQ49/hhvDOxeo9S3lISCc=.sha256
Closed ev wants to merge commits into master from ev-fixes
ev · 12/23/2016, 3:30:13 PM

This fixes a few things I've noticed in Bay over the past week

  • add a 'delete' option to the Import/Export key dialog in lite client
  • turn private messages on in the remote lite client (because I keep doing this manually)
  • forward lite client to root if they are already being followed by remote

The last fix makes it possible to close %Ac9psaT...

%CrcSk6ae+DEwkcoPyg4Swi5c9g2Miy/mw8ouLMd13vQ=.sha256 dinosaur · 12/24/2016, 2:48:03 PM

sweeet! i'm not sure i understand the following changes:

diff --git a/modules_basic/invite.js b/modules_basic/invite.js
index d4f9ef5..8500f9c 100644
--- a/modules_basic/invite.js
+++ b/modules_basic/invite.js
@@ -52,7 +52,7 @@ exports.create = function (api) {

           //if they already follow us, just check we actually follow them.
           if(err) api.follower_of(id, data.key, function (_err, follows) {
-              if(follows) cb(err)
+              if(follows) { location.hash = '' }
               else next()
             })
           else next()

what's this about?

diff --git a/modules_basic/private.js b/modules_basic/private.js
index ce99f1c..33283f9 100644
--- a/modules_basic/private.js
+++ b/modules_basic/private.js
         pull(
-          u.next(api.sbot_log, {old: false, limit: 100}),
+          api.sbot_log({old: false}),

why remove u.next?

diff --git a/package.json b/package.json
index 943a0af..e1890ba 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "depject": "^3.0.0",
     "hjson": "^2.0.3",
     "human-time": "0.0.1",
-    "hypercombo": "^0.1.2",
+    "hypercombo": "0.1.0",
     "hypercrop": "^1.0.1",
     "hyperfile": "^1.1.0",
     "hyperlightbox": "^0.1.3"

why the downgrade?

churrrrr :cat:

%6SUVs5cI/NAaOT07Emc5wE7zjV7ltTHlQ0eMHyz9Kto=.sha256 ev · 12/24/2016, 3:01:59 PM

@dinosaur

  1. Solves issue %Ac9psaT... by forwarding lite client uxers to root if they are already followed by the pub.

2 + 3. Not sure, maybe we're using slightly different branches? There's no need for these two changes. Feel free to strip them, or I can re-push.

· 12/25/2016, 4:44:34 PM
%xjrxRX1yhOsA2l06O7Ud3MrTxA+jRV+8oCb8uPmL/0g=.sha256 ev · 12/25/2016, 4:45:46 PM

Closing because I started working on invites in a separate pull %iddD0oE...


Built with git-ssb-web