Client updates [archiving support]

cli.js

@@ -159,29 +159,29 @@ const client = new Client({
     // todo: custom commands
     panes: {
       help: () => 'set pane to navigate up and down in. panes: channels, cabals',
-      category: ["misc"],
+      category: ['misc'],
       call: (cabal, res, arg) => {
         if (arg === '' || !['channels', 'cabals'].includes(arg)) return
         fe.setPane(arg)
       }
     },
     quit: {
       help: () => 'exit the cabal process',
-      category: ["basics"],
+      category: ['basics'],
       call: (cabal, res, arg) => {
         process.exit(0)
       }
     },
     exit: {
       help: () => 'exit the cabal process',
-      category: ["basics"],
+      category: ['basics'],
       call: (cabal, res, arg) => {
         process.exit(0)
       }
     },
     help: {
       help: () => 'display this help message',
-      category: ["basics"],
+      category: ['basics'],
       call: (cabal, res, arg) => {
         const hotkeysExplanation = `
 ctrl-l  
@@ -221,12 +221,12 @@ ctrl-{n,p}
 alt-l  
   toggle id suffixes on/off  
 `
-        let categories = new Set(["hotkeys"])
+        const categories = new Set(['hotkeys'])
 
         function printCategories () {
           for (const cat of Array.from(categories).sort((a, b) => a.localeCompare(b))) {
             fe.writeLine(`/help ${chalk.cyan(cat)}`)
-          } 
+          }
         }
         var foundAliases = {}
         const commands = {}
@@ -239,16 +239,14 @@ alt-l
           })
         }
         if (!arg) {
-          fe.writeLine("the help command is split into sections:")
+          fe.writeLine('the help command is split into sections:')
           printCategories()
-          return
         } else if (arg && !categories.has(arg)) {
           fe.writeLine(`${arg} is not a help section, try:`)
           printCategories()
-          return
         } else {
           fe.writeLine(`help: ${chalk.cyan(arg)}`)
-          if (arg === "hotkeys") {
+          if (arg === 'hotkeys') {
             fe.writeLine(hotkeysExplanation)
             return
           }
@@ -308,7 +306,7 @@ if (args.clear) {
 if (args.forget) {
   let success = false
   /* eslint no-inner-declarations: "off" */
-  function forgetCabal(k) {
+  function forgetCabal (k) {
     const index = config.cabals.indexOf(k)
     if (index >= 0) {
       config.cabals.splice(index, 1)
@@ -372,15 +370,14 @@ if (args.alias && args.key) {
 }
 
 if (args.port) {
-  let port = parseInt(args.port)
+  const port = parseInt(args.port)
   if (isNaN(port) || port < 0 || port > 65535) {
     logError(`${args.port} is not a valid port number`)
     process.exit(1)
   }
   args.port = port
 }
 
-
 if (args.key) {
   // If a key is provided, place it at the top of the keys provided from the config
   cabalKeys.unshift(args.key)
@@ -441,7 +438,7 @@ if (args.qr) {
   process.exit(1)
 }
 
-function start(keys, frontendConfig) {
+function start (keys, frontendConfig) {
   if (args.key && args.message) {
     publishSingleMessage({
       key: args.key,
@@ -491,13 +488,13 @@ function start(keys, frontendConfig) {
   })
 }
 
-function trackAndPrintEvents(cabal) {
+function trackAndPrintEvents (cabal) {
   cabal.ready(() => {
     // Listen for feeds
     cabal.kcore._logs.feeds().forEach(listen)
     cabal.kcore._logs.on('feed', listen)
 
-    function listen(feed) {
+    function listen (feed) {
       feed.on('download', idx => {
         process.stdout.write('.')
       })
@@ -516,18 +513,18 @@ function trackAndPrintEvents(cabal) {
   })
 }
 
-function getKey(str) {
+function getKey (str) {
   // return key if what was passed in was a saved alias
   if (str in config.aliases) { return config.aliases[str] }
   // else assume it's a cabal key
   return str
 }
 
-function logError(msg) {
+function logError (msg) {
   console.error(`${chalk.red('cabal:')} ${msg}`)
 }
 
-function findConfigPath() {
+function findConfigPath () {
   var currentDirConfigFilename = '.cabal.yml'
   if (args.config && fs.statSync(args.config).isDirectory()) {
     return path.join(args.config, `v${Client.getDatabaseVersion()}`, 'config.yml')
@@ -539,7 +536,7 @@ function findConfigPath() {
   return rootconfig
 }
 
-function saveConfig(path, config) {
+function saveConfig (path, config) {
   // make sure config is well-formatted (contains all config options)
   if (!config.cabals) { config.cabals = [] }
   config.cabals = Array.from(new Set(config.cabals)) // dedupe array entries
@@ -550,13 +547,13 @@ function saveConfig(path, config) {
   fs.writeFileSync(path, data, 'utf8')
 }
 
-function saveKeyAsAlias(key, alias) {
+function saveKeyAsAlias (key, alias) {
   config.aliases[alias] = key
   saveConfig(configFilePath, config)
   console.log(`${chalk.magentaBright('cabal:')} saved ${chalk.greenBright(key)} as ${chalk.blueBright(alias)}`)
 }
 
-function publishSingleMessage({ key, channel, message, messageType, timeout }) {
+function publishSingleMessage ({ key, channel, message, messageType, timeout }) {
   console.log(`Publishing message to channel - ${channel || 'default'}: ${message}`)
   client.addCabal(key).then(cabal => cabal.publishMessage({
     type: messageType || 'chat/text',
@@ -569,7 +566,7 @@ function publishSingleMessage({ key, channel, message, messageType, timeout }) {
   setTimeout(function () { process.exit(0) }, timeout || 5000)
 }
 
-function getClientVersion() {
+function getClientVersion () {
   if (packageJSONVersion) {
     return packageJSONVersion
   }

commands.js

@@ -1,5 +1,6 @@
 var util = require('./util')
 var chalk = require('chalk')
+var views = require('./views')
 
 function Commander (view, client) {
   if (!(this instanceof Commander)) return new Commander(view, client)
@@ -10,7 +11,7 @@ function Commander (view, client) {
   this.view = view
   this.pattern = (/^\/(\w*)\s*(.*)/)
   this.history = []
-  this.historyIndex = -1 // negative: new msg. >=0: index from the last item
+  this.historyIndex = -1 // negative: new msg, >=0: index from the last item
 }
 
 Commander.prototype.setActiveCabal = function (cabal) {
@@ -19,17 +20,20 @@ Commander.prototype.setActiveCabal = function (cabal) {
   this.cabal.on('info', (msg) => {
     var txt = typeof msg === 'string' ? msg : (msg && msg.text ? msg.text : '')
     txt = util.sanitizeString(txt)
-    if (msg.command) {
-      switch (msg.command) {
-          case "channels":
-            var {joined, channel, userCount, topic} = msg
-            var userPart = `${userCount} ${userCount === 1 ? 'person' : 'people'}` 
-            userPart = userCount > 0 ? ": " + chalk.cyan(userPart) : ''
-            var shortTopic = topic.length > 40 ? topic.slice(0, 40) + '..' : topic || ''
-            shortTopic = util.sanitizeString(shortTopic)
-            channel = util.sanitizeString(channel)
-            txt = `${joined ? '*' : ' '} ${channel}${userPart} ${shortTopic}`
-            break
+    const meta = msg.meta
+    if (meta.command) {
+      switch (meta.command) {
+        case 'channels':
+          if (meta.seq === 0) break // don't rewrite the payload of the first `/channels` message
+          var { joined, channel, userCount, topic } = msg
+          var userPart = `${userCount} ${userCount === 1 ? 'person' : 'people'}`
+          userPart = userCount > 0 ? ': ' + chalk.cyan(userPart) : ''
+          var maxTopicLength = views.getChatWidth() - `00:00:00 -status-   ${channel}: 999 people `.length - 2 /* misc unknown padding that just makes it work v0v */
+          var shortTopic = topic && topic.length > maxTopicLength ? topic.slice(0, maxTopicLength - 2) + '..' : topic || ''
+          shortTopic = util.sanitizeString(shortTopic)
+          channel = util.sanitizeString(channel)
+          txt = `${joined ? '*' : ' '} ${channel}${userPart} ${shortTopic}`
+          break
       }
     }
     this.view.writeLine(txt)

neat-screen.js

@@ -233,7 +233,7 @@ function NeatScreen (props) {
 
   // redraw the screen
   this.neat.input.on('ctrl-l', () => {
-      this.neat.clear()
+    this.neat.clear()
   })
 
   // cycle to next unread channel
@@ -397,6 +397,19 @@ NeatScreen.prototype.registerUpdateHandler = function (cabal) {
   }
   // register an event handler for all updates from the cabal
   cabal.on('update', this._updateHandler[cabal.key])
+  // create & register event handlers for channel archiving events
+  const processChannelArchiving = (type, { channel, reason, key, isLocal }) => {
+    const issuer = this.client.getUsers()[key]
+    if (!issuer || isLocal) { return }
+    reason = reason ? `(${chalk.cyan('reason:')} ${reason})` : ''
+    const issuerName = issuer && issuer.name ? issuer.name : key.slice(0, 8)
+    const action = type === 'archive' ? 'archived' : 'unarchived'
+    const text = `${issuerName} ${chalk.magenta(action)} channel ${chalk.cyan(channel)} ${reason}`
+    this.client.addStatusMessage({ text })
+    this.bus.emit('render')
+  }
+  cabal.on('channel-archive', (envelope) => { processChannelArchiving('archive', envelope) })
+  cabal.on('channel-unarchive', (envelope) => { processChannelArchiving('unarchive', envelope) })
 }
 
 NeatScreen.prototype._pagesize = function () {
@@ -415,7 +428,7 @@ NeatScreen.prototype.processMessages = function (opts, cb) {
     this.state.messages = []
     msgs.forEach((msg, i) => {
       const user = this.client.getUsers()[msg.key]
-      if (user && user.isHidden()) return
+      if (user && user.isHidden(opts.channel)) return
       this.state.messages.push(this.formatMessage(msg))
     })
     this.bus.emit('render')