Merge pull request #1428 from ssbc/fix-feeds

Fixes issues with following states for channels, feeds, timelines.

Author: black-puppydog

index.js

@@ -104,6 +104,13 @@ electron.app.on('ready', () => {
           click: () => {
             browserWindow.webContents.send('goToSettings')
           }
+        },
+        {
+          label: 'Status',
+          accelerator: 'CmdOrCtrl+.',
+          click: () => {
+            browserWindow.webContents.send('goToStatus')
+          }
         }
       ]
     })

lib/depject/index.js

@@ -138,6 +138,7 @@ module.exports = {
           public: require('./page/html/render/public.js'),
           search: require('./page/html/render/search.js'),
           settings: require('./page/html/render/settings.js'),
+          status: require('./page/html/render/status.js'),
           tag: require('./page/html/render/tag.js'),
           'your-posts': require('./page/html/render/your-posts.js'),
           'attending-gatherings': require('./page/html/render/attending-gatherings.js')

lib/depject/page/html/render/status.js

@@ -0,0 +1,47 @@
+const { computed, h } = require('mutant')
+const nest = require('depnest')
+const renderProgress = require('../../../../progress/html/render')
+
+exports.needs = nest({
+  'sbot.pull.stream': 'first',
+  'progress.obs': {
+    indexes: 'first',
+    plugins: 'first',
+    replicate: 'first',
+    migration: 'first'
+  },
+  'intl.sync.i18n': 'first'
+})
+
+exports.gives = nest('page.html.render')
+
+exports.create = function (api) {
+  return nest('page.html.render', function channel (path) {
+    const indexes = api.progress.obs.indexes()
+    const pluginIndexes = api.progress.obs.plugins()
+    const indexesJson = computed([indexes, pluginIndexes], (indexes, plugins) => {
+      return JSON.stringify({indexes, plugins}, null, 4)
+    })
+
+    if (path !== '/status') return
+    const i18n = api.intl.sync.i18n
+
+    const prepend = [
+      h('PageHeading', [
+        h('h1', [
+          h('strong', i18n('Status'))
+        ])
+      ])
+    ]
+
+    return h('Scroller', { style: { overflow: 'auto' } }, [
+      h('div.wrapper', [
+        h('section.prepend', prepend),
+        h('section.content', [
+          h('h2', i18n('Indexes')),
+          h('pre', [indexesJson])
+        ]),
+      ])
+    ])
+  })
+}

lib/depject/progress/obs.js

@@ -6,6 +6,7 @@ exports.gives = nest({
   'progress.obs': [
     'global',
     'indexes',
+    'plugins',
     'replicate',
     'migration',
     'peer'
@@ -19,6 +20,7 @@ exports.needs = nest({
 exports.create = function (api) {
   let syncStatus = null
   let progress = null
+  let pluginProgress = null
 
   return nest({
     'progress.obs': {
@@ -37,6 +39,10 @@ exports.create = function (api) {
         load()
         return progress.indexes
       },
+      plugins () {
+        load()
+        return pluginProgress.plugins
+      },
       migration () {
         load()
         return progress.migration
@@ -63,6 +69,11 @@ exports.create = function (api) {
         migration: Status()
       })
     }
+    if (!pluginProgress) {
+      pluginProgress = ProgressStatus(x => x.patchwork.progress(), {
+        plugins: Struct({}),
+      })
+    }
   }
 
   function ProgressStatus (keyFn, attrs) {

lib/main-window.js

@@ -118,7 +118,7 @@ module.exports = function (config) {
 
   const defaultViews = computed(includeParticipating, (includeParticipating) => {
     const result = [
-      '/public', '/private', '/mentions'
+      '/public', '/private', '/mentions', '/status'
     ]
 
     // allow user to choose in settings whether to show participating tab
@@ -141,6 +141,7 @@ module.exports = function (config) {
   electron.ipcRenderer.on('goBack', views.goBack)
 
   electron.ipcRenderer.on('goToSettings', () => api.app.navigate('/settings'))
+  electron.ipcRenderer.on('goTostatus', () => api.app.navigate('/status'))
 
   electron.ipcRenderer.on("navigate-to", (ev, target) => {
     navigate(target);
@@ -368,6 +369,11 @@ module.exports = function (config) {
         label: i18n("Settings"),
         target: "/settings",
       },
+      {
+        type: "normal",
+        label: i18n("Status"),
+        target: "/status",
+      },
     ];
     return dropTabItems
   }

lib/plugins/progress.js

@@ -4,12 +4,20 @@ const deepEqual = require('deep-equal')
 module.exports = function (ssb) {
   return {
     stream: function () {
-      let lastValue = deepClone(ssb.progress())
+      let lastValue = deepClone(ssb.status())
+      lastValue = {
+        ...lastValue.progress,
+        plugins: lastValue.sync.plugins,
+      }
 
       const timer = setInterval(() => {
-        const newValue = ssb.progress()
+        let newValue = deepClone(ssb.status())
+        newValue = {
+          ...newValue.progress,
+          plugins: newValue.sync.plugins,
+        }
         if (!deepEqual(newValue, lastValue)) {
-          lastValue = deepClone(newValue)
+          lastValue = newValue
           pushable.push(lastValue)
         }
       }, 200)

locales/en.json

@@ -304,5 +304,7 @@
 	"Connect": "Connect",
 	"In order to share with users on the internet, you need to be invited to a pub server or a room server.": "In order to share with users on the internet, you need to be invited to a pub server or a room server.",
 	"nl": "nl",
-	"Last activity": "Last activity"
+	"Last activity": "Last activity",
+	"Status": "Status",
+	"Indexes": "Indexes"
 }