Don't use member functions from keyring

.gitignore

@@ -44,6 +44,8 @@ build/Release
 node_modules/
 jspm_packages/
 
+pnpm-lock.yaml
+
 # TypeScript v1 declaration files
 typings/
 

README.md

@@ -176,7 +176,6 @@ _alias of `ssb.tribes.get`_
 These endpoints give you access to additional features, such as:
 - **registering groups or group-authors**:
     - `ssb.tribes.register(groupId, info, cb)`
-    - `ssb.tribes.registerAuthors(groupId, [authorId], cb)`
 - **linking your feed to a group**
     - `ssb.tribes.link.create({ group, name }, cb)`
 - **linking subGroups to a group**
@@ -207,19 +206,6 @@ where:
   - `scheme` *String* (optional) - a description of the key management scheme this key is part of
 - `cb`[ *Function* - a callback with signature `cb(err: Error, success: Boolean)`
 
-
-### `ssb.tribes.registerAuthors(groupId, [authorId], cb)`
-
-Makes an off-log note that some author(s) are part of a group.
-This is used to know which group keys to consider when you receive a private message from a particular author.
-
-_NOTE: mainly used internally_
-
-where:
-- `groupId` *String* - is a the id for the group you want to not these users are part of
-- `[authorId]` *Array* - is a connection of feedIds
-- `cb` *Function* - has signature `cb(err, success)`
-
 ### `ssb.tribes.poBox.create(opts, cb)`
 
 Creates a P.O. Box key-pair, which is like a one-way group messaging setup with a public and private curve25519 keypair.

index.js

@@ -1,3 +1,4 @@
+const { promisify: p } = require('util')
 const { join } = require('path')
 const set = require('lodash.set')
 const { isFeed, isCloakedMsg: isGroup } = require('ssb-ref')
@@ -135,13 +136,16 @@ function init (ssb, config) {
 
       state.loading.keystore.once((s) => {
         const peers = new Set()
-        keystore.group.list()
-          .map(groupId => keystore.group.listAuthors(groupId))
-          .forEach(authors => authors.forEach(author => peers.add(author)))
 
-        peers.delete(ssb.id)
-        Array.from(peers)
-          .forEach(id => ssb.replicate.request({ id, replicate: true }))
+        Promise.all(keystore.group.list()
+          .map(groupId => p(ssb.tribes.listAuthors)(groupId)))
+          .then((allGroupAuthors) => {
+            allGroupAuthors.forEach(authors => authors.forEach(author => peers.add(author)))
+
+            peers.delete(ssb.id)
+            Array.from(peers)
+              .forEach(id => ssb.replicate.request({ id, replicate: true }))
+          })
       })
     }
   })
@@ -259,9 +263,6 @@ function init (ssb, config) {
     register (groupId, info, cb) {
       keystore.group.register(groupId, info, cb)
     },
-    registerAuthors (groupId, authors, cb) {
-      keystore.group.registerAuthors(groupId, authors, (err) => err ? cb(err) : cb(null, true))
-    },
     create: tribeCreate,
     list: tribeList,
     get: tribeGet,
@@ -276,7 +277,7 @@ function init (ssb, config) {
       })
     },
     listAuthors (groupId, cb) {
-      onKeystoreReady(() => cb(null, keystore.group.listAuthors(groupId)))
+      scuttle.group.listAuthors(groupId, cb)
     },
 
     link: {

method/group.js

@@ -3,6 +3,7 @@ const { keySchemes } = require('private-group-spec')
 const { SecretKey } = require('ssb-private-group-keys')
 const bfe = require('ssb-bfe')
 const Crut = require('ssb-crut')
+const pull = require('pull-stream')
 
 const { groupId: buildGroupId, poBoxKeys } = require('../lib')
 const initSpec = require('../spec/group/init')
@@ -93,6 +94,32 @@ module.exports = function GroupMethods (ssb, keystore, state) {
 
       ssb.publish(content, cb)
     },
+    listAuthors (groupId, cb) {
+      const query = [{
+        $filter: {
+          value: {
+            content: {
+              type: 'group/add-member'
+            }
+          }
+        }
+      }]
+
+      pull(
+        ssb.query.read({ query }),
+        pull.filter(addMemberSpec.isValid),
+        pull.filter(msg =>
+          groupId === msg.value.content.recps[0]
+        ),
+        pull.map(msg => msg.value.content.recps.slice(1)),
+        pull.flatten(),
+        pull.collect((err, members) => {
+          if (err) return cb(err)
+
+          return cb(null, members)
+        })
+      )
+    },
     addPOBox (groupId, cb) {
       const info = keystore.group.get(groupId)
       if (!info) return cb(new Error('unknown groupId: ' + groupId))

method/index.js

@@ -9,6 +9,7 @@ module.exports = function Method (ssb, keystore, state) {
     group: {
       init: patient(group.init),
       addMember: patient(group.addMember),
+      listAuthors: patient(group.listAuthors),
       addPOBox: patient(group.addPOBox),
       getPOBox: group.getPOBox
     },