Merge pull request #1357 from black-puppydog/master

Version bumps take 2

Author: black-puppydog

lib/depject/app/sync/external-handler/git.js

@@ -27,15 +27,14 @@ exports.create = () => {
 }
 
 function portInUse (port, cb) {
-  /* eslint-disable standard/no-callback-literal */
   // super hacky check!
   const server = net.createServer(function () {})
   server.listen(port, '127.0.0.1')
   server.on('error', function () {
-    cb(true)
+    cb(true) // eslint-disable-line node/no-callback-literal
   })
   server.on('listening', function () {
     server.close()
-    cb(false)
+    cb(false) // eslint-disable-line node/no-callback-literal
   })
 }

lib/depject/feed/html/rollup.js

@@ -209,10 +209,11 @@ exports.create = function (api) {
         abortable,
         pull.filter(item => {
           // don't show the same threads again (repeats due to pull-resume)
-          if (!seen.has(item.key)) {
-            seen.add(item.key)
-            return true
+          if (seen.has(item.key)) {
+            return false
           }
+          seen.add(item.key)
+          return true
         }),
         pull.filter(canRenderMessage),
 
@@ -298,15 +299,18 @@ exports.create = function (api) {
       }, [
         meta,
         renderedMessage,
-        item.totalReplies > item.latestReplies.length ? h('a.full', {
-          href: item.key,
-          anchor: {
-            // highlight unread messages in thread view
-            unread: unreadBumps,
-            // only drop to latest messages if there are more new messages not visible in thread summary
-            anchor: hasMoreNewReplies ? unreadBumps[unreadBumps.length - 1] : null
-          }
-        }, [i18n('View full thread') + ' (', item.totalReplies, ')']) : null,
+        item.totalReplies > item.latestReplies.length
+          ? h('a.full',
+              {
+                href: item.key,
+                anchor: {
+                // highlight unread messages in thread view
+                  unread: unreadBumps,
+                  // only drop to latest messages if there are more new messages not visible in thread summary
+                  anchor: hasMoreNewReplies ? unreadBumps[unreadBumps.length - 1] : null
+                }
+              }, [i18n('View full thread') + ' (', item.totalReplies, ')'])
+          : null,
         h('div.replies', [
           item.latestReplies.map(msg => {
             const result = api.message.html.render(msg, {

lib/depject/message/html/actions.js

@@ -46,15 +46,17 @@ exports.create = (api) => {
   })
 
   function publishLike (msg, status = true) {
-    const like = status ? {
-      type: 'vote',
-      channel: msg.value.content.channel,
-      vote: { link: msg.key, value: 1, expression: 'Like' }
-    } : {
-      type: 'vote',
-      channel: msg.value.content.channel,
-      vote: { link: msg.key, value: 0, expression: 'Unlike' }
-    }
+    const like = status
+      ? {
+          type: 'vote',
+          channel: msg.value.content.channel,
+          vote: { link: msg.key, value: 1, expression: 'Like' }
+        }
+      : {
+          type: 'vote',
+          channel: msg.value.content.channel,
+          vote: { link: msg.key, value: 0, expression: 'Unlike' }
+        }
     if (msg.value.content.recps) {
       like.recps = msg.value.content.recps.map(function (e) {
         return e && typeof e !== 'string' ? e.link : e

lib/depject/message/html/layout/default.js

@@ -90,12 +90,12 @@ exports.create = function (api) {
       messageHeader(msg, { replyInfo, priority }),
       cw
         ? h('a.contentWarning',
-          {
-            href: '#',
-            'ev-click': toggleAndTrack(expanded)
-          },
-          cw
-        )
+            {
+              href: '#',
+              'ev-click': toggleAndTrack(expanded)
+            },
+            cw
+          )
         : undefined,
       h('section.content', {
         classList: [when(expanded, '-expanded')],

lib/depject/message/html/render/gathering.js

@@ -38,14 +38,16 @@ exports.create = function (api) {
       const suppliedGathering = msg.gathering || {}
 
       // allow override of resolved about messages for preview in modules/gathering/sheet/edit.js
-      const about = msg.key ? extend({
-        hidden: api.about.obs.valueFrom(msg.key, 'hidden', yourId),
-        image: suppliedGathering.image || api.about.obs.latestValue(msg.key, 'image'),
-        title: suppliedGathering.title || api.about.obs.latestValue(msg.key, 'title'),
-        description: suppliedGathering.description || api.about.obs.latestValue(msg.key, 'description'),
-        location: suppliedGathering.location || api.about.obs.latestValue(msg.key, 'location'),
-        startDateTime: suppliedGathering.startDateTime || api.about.obs.latestValue(msg.key, 'startDateTime')
-      }, msg.previewAbout) : msg.previewAbout
+      const about = msg.key
+        ? extend({
+            hidden: api.about.obs.valueFrom(msg.key, 'hidden', yourId),
+            image: suppliedGathering.image || api.about.obs.latestValue(msg.key, 'image'),
+            title: suppliedGathering.title || api.about.obs.latestValue(msg.key, 'title'),
+            description: suppliedGathering.description || api.about.obs.latestValue(msg.key, 'description'),
+            location: suppliedGathering.location || api.about.obs.latestValue(msg.key, 'location'),
+            startDateTime: suppliedGathering.startDateTime || api.about.obs.latestValue(msg.key, 'startDateTime')
+          }, msg.previewAbout)
+        : msg.previewAbout
 
       const attendees = msg.key ? computed([api.about.obs.socialValues(msg.key, 'attendee')], getAttendees) : []
       const disableActions = !!msg.previewAbout

lib/depject/message/sheet/preview.js

@@ -61,10 +61,12 @@ exports.create = function (api) {
           ),
           when(isPrivate,
             h('div.info -private', [
-              recps.length ? when(!exists && isRoot,
-                plural('Only visible to you and %s people that have been mentioned', recps.length),
-                plural('Only visible to you and %s other thread participants', recps.length)
-              ) : i18n('This message will only be visible to you')
+              recps.length
+                ? when(!exists && isRoot,
+                    plural('Only visible to you and %s people that have been mentioned', recps.length),
+                    plural('Only visible to you and %s other thread participants', recps.length)
+                  )
+                : i18n('This message will only be visible to you')
             ]),
             h('div.info -public', [
               when(msg.publiclyEditable,

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

@@ -343,6 +343,7 @@ function normalizedRecps (recps) {
     if (typeof recp === 'object') {
       return recp.link
     }
+    return null
   })
 }
 

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

@@ -110,12 +110,14 @@ exports.create = function (api) {
           item.key
         ])
       }),
-      isYou ? null : h('a -add', {
-        'ev-click': () => {
-          rename(id)
-        },
-        href: '#'
-      }, ['+'])
+      isYou
+        ? null
+        : h('a -add', {
+          'ev-click': () => {
+            rename(id)
+          },
+          href: '#'
+        }, ['+'])
     ])
 
     const imagePicker = h('div', { className: 'Picker' }, [
@@ -142,15 +144,17 @@ exports.create = function (api) {
           })
         ])
       }),
-      isYou ? null : h('span.add', [
-        api.blob.html.input((err, file) => {
-          if (err) return
-          assignImage(id, file.link)
-        }, {
-          accept: 'image/*',
-          resize: { width: 500, height: 500 }
-        })
-      ])
+      isYou
+        ? null
+        : h('span.add', [
+          api.blob.html.input((err, file) => {
+            if (err) return
+            assignImage(id, file.link)
+          }, {
+            accept: 'image/*',
+            resize: { width: 500, height: 500 }
+          })
+        ])
     ])
 
     const prepend = h('header', { className: 'ProfileHeader' }, [

lib/depject/sbot.js

@@ -104,7 +104,7 @@ exports.create = function (api) {
       pull(
         sbot.conn.peers(),
         pull.drain(entries => {
-          var peers = entries.filter(([, x]) => !!x.key).map(([address, data]) => ({ address, data }))
+          const peers = entries.filter(([, x]) => !!x.key).map(([address, data]) => ({ address, data }))
           localPeers.set(peers.filter(peer => peer.data.type === 'lan'))
           connectedPeers.set(peers.filter(peer => peer.data.state === 'connected'))
         })
@@ -113,7 +113,7 @@ exports.create = function (api) {
       pull(
         sbot.conn.stagedPeers(),
         pull.drain(entries => {
-          var peers = entries.filter(([, x]) => !!x.key).map(([address, data]) => ({ address, data }))
+          const peers = entries.filter(([, x]) => !!x.key).map(([address, data]) => ({ address, data }))
           stagedPeers.set(peers)
         })
       )

lib/main-window.js

@@ -407,9 +407,9 @@ module.exports = function (config) {
       ]
     }, [
       name,
-      instance ? when(instance.pendingUpdates, [
-        ' (', instance.pendingUpdates, ')'
-      ]) : null
+      instance
+        ? when(instance.pendingUpdates, [' (', instance.pendingUpdates, ')'])
+        : null
     ])
   }