Merge pull request #1153 from ssbc/remove-unused

Refactor to remove unused code

Author: Powersource

index.js

@@ -3,21 +3,21 @@ process.on('uncaughtException', function (err) {
   process.exit()
 })
 
-var electron = require('electron')
-var openWindow = require('./lib/window')
+const electron = require('electron')
+const openWindow = require('./lib/window')
 
-var Path = require('path')
-var defaultMenu = require('electron-default-menu')
-var WindowState = require('electron-window-state')
-var Menu = electron.Menu
-var extend = require('xtend')
-var ssbKeys = require('ssb-keys')
+const Path = require('path')
+const defaultMenu = require('electron-default-menu')
+const WindowState = require('electron-window-state')
+const Menu = electron.Menu
+const extend = require('xtend')
+const ssbKeys = require('ssb-keys')
 
-var windows = {
+const windows = {
   dialogs: new Set()
 }
-var ssbConfig = null
-var quitting = false
+let ssbConfig = null
+let quitting = false
 
 /**
  * It's not possible to run two instances of patchwork as it would create two
@@ -31,7 +31,7 @@ function quitIfAlreadyRunning () {
     console.log('Please close the existing instance before starting a new one.')
     return electron.app.quit()
   }
-  electron.app.on('second-instance', (event, commandLine, workingDirectory) => {
+  electron.app.on('second-instance', () => {
     // Someone tried to run a second instance, we should focus our window.
     if (windows.main) {
       if (windows.main.isMinimized()) windows.main.restore()
@@ -40,7 +40,7 @@ function quitIfAlreadyRunning () {
   })
 }
 
-var config = {
+const config = {
   server: !(process.argv.includes('-g') || process.argv.includes('--use-global-ssb'))
 }
 // a flag so we don't start git-ssb-web if a custom path is passed in
@@ -54,8 +54,8 @@ electron.app.on('ready', () => {
   setupContext(process.env.ssb_appname || 'ssb', {
     server: !(process.argv.includes('-g') || process.argv.includes('--use-global-ssb'))
   }, () => {
-    var browserWindow = openMainWindow()
-    var menu = defaultMenu(electron.app, electron.shell)
+    const browserWindow = openMainWindow()
+    const menu = defaultMenu(electron.app, electron.shell)
 
     menu.splice(4, 0, {
       label: 'Navigation',
@@ -84,7 +84,7 @@ electron.app.on('ready', () => {
       ]
     })
 
-    var view = menu.find(x => x.label === 'View')
+    const view = menu.find(x => x.label === 'View')
     view.submenu = [
       { role: 'reload' },
       { role: 'toggledevtools' },
@@ -95,15 +95,15 @@ electron.app.on('ready', () => {
       { type: 'separator' },
       { role: 'togglefullscreen' }
     ]
-    var help = menu.find(x => x.label === 'Help')
+    const help = menu.find(x => x.label === 'Help')
     help.submenu = [
       {
         label: 'Learn More',
         click () { require('electron').shell.openExternal('https://scuttlebutt.nz') }
       }
     ]
     if (process.platform === 'darwin') {
-      var win = menu.find(x => x.label === 'Window')
+      const win = menu.find(x => x.label === 'Window')
       win.submenu = [
         { role: 'minimize' },
         { role: 'zoom' },
@@ -116,7 +116,7 @@ electron.app.on('ready', () => {
     Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
   })
 
-  electron.app.on('activate', function (e) {
+  electron.app.on('activate', function () {
     if (windows.main) {
       windows.main.show()
     }
@@ -126,7 +126,7 @@ electron.app.on('ready', () => {
     quitting = true
   })
 
-  electron.ipcMain.on('open-background-devtools', function (ev, config) {
+  electron.ipcMain.on('open-background-devtools', function () {
     if (windows.background) {
       windows.background.webContents.openDevTools({ mode: 'detach' })
     }
@@ -135,7 +135,7 @@ electron.app.on('ready', () => {
 
 function openMainWindow () {
   if (!windows.main) {
-    var windowState = WindowState({
+    const windowState = WindowState({
       defaultWidth: 1024,
       defaultHeight: 768
     })

lib/anchor-hook.js

@@ -1,4 +1,4 @@
-var watch = require('mutant/watch')
+const watch = require('mutant/watch')
 
 module.exports = AnchorHook
 
@@ -13,7 +13,7 @@ function AnchorHook (name, current, cb) {
 
           // HACK: due to a browser bug, sometimes the window scrolls down below the top bar
           // Why not just hack it!!!
-          var topBar = document.querySelector('.MainWindow > div.top')
+          const topBar = document.querySelector('.MainWindow > div.top')
           if (topBar) {
             topBar.scrollIntoViewIfNeeded()
           }

lib/catch-links.js

@@ -5,22 +5,23 @@ module.exports = function (root, cb) {
       return true
     }
 
-    var anchor = null
-    for (var n = ev.target; n.parentNode; n = n.parentNode) {
+    let anchor = null
+    for (let n = ev.target; n.parentNode; n = n.parentNode) {
       if (n.nodeName === 'A') {
         anchor = n
         break
       }
     }
     if (!anchor) return true
 
-    var href = anchor.getAttribute('href')
+    const href = anchor.getAttribute('href')
 
     if (href) {
-      var isUrl
+      let isUrl
+      let url
 
       try {
-        var url = new URL(href)
+        url = new URL(href)
         isUrl = true
       } catch (e) {
         isUrl = false

lib/context-menu-and-spellcheck.js

@@ -1,9 +1,9 @@
-var { remote, shell, clipboard, ipcRenderer } = require('electron')
-var { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker')
-var { MenuItem, Menu } = remote
-var ref = require('ssb-ref')
+const { remote, shell, clipboard, ipcRenderer } = require('electron')
+const { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } = require('electron-spellchecker')
+const { MenuItem, Menu } = remote
+const ref = require('ssb-ref')
 
-var navigateHandler = null
+let navigateHandler = null
 module.exports = setupContextMenuAndSpellCheck
 
 function setupContextMenuAndSpellCheck (config, { navigate, get }) {
@@ -14,7 +14,7 @@ function setupContextMenuAndSpellCheck (config, { navigate, get }) {
   // Start off as US English, America #1 (lol)
   spellCheckHandler.switchLanguage('en-US')
 
-  var contextMenuBuilder = new ContextMenuBuilder(spellCheckHandler, null, true, (menu, menuInfo) => {
+  const contextMenuBuilder = new ContextMenuBuilder(spellCheckHandler, null, true, (menu, menuInfo) => {
     const ddg = new MenuItem({
       label: 'Search with DuckDuckGo',
       click: () => {
@@ -38,25 +38,25 @@ function setupContextMenuAndSpellCheck (config, { navigate, get }) {
   })
 
   contextMenuBuilder.buildMenuForLink = function (menuInfo) {
-    var element = document.elementFromPoint(menuInfo.x, menuInfo.y)
+    const element = document.elementFromPoint(menuInfo.x, menuInfo.y)
 
-    var menu = new Menu()
-    var isEmailAddress = menuInfo.linkURL.startsWith('mailto:')
-    var isFile = menuInfo.linkURL.startsWith('file:')
+    const menu = new Menu()
+    const isEmailAddress = menuInfo.linkURL.startsWith('mailto:')
+    const isFile = menuInfo.linkURL.startsWith('file:')
 
     // use the anchor of a link if it directly references an ID
-    var extractedRef = element && ref.isLink(element.anchor) ? element.anchor : ref.extract(menuInfo.linkURL)
+    const extractedRef = element && ref.isLink(element.anchor) ? element.anchor : ref.extract(menuInfo.linkURL)
 
     if (!isFile) {
-      var copyLink = new MenuItem({
+      const copyLink = new MenuItem({
         label: isEmailAddress ? this.stringTable.copyMail() : this.stringTable.copyLinkUrl(),
         click: () => {
           // Omit the mailto: portion of the link; we just want the address
           clipboard.writeText(isEmailAddress ? menuInfo.linkText : menuInfo.linkURL)
         }
       })
 
-      var openLink = new MenuItem({
+      const openLink = new MenuItem({
         label: this.stringTable.openLinkUrl(),
         click: () => {
           shell.openExternal(menuInfo.linkURL)
@@ -77,7 +77,7 @@ function setupContextMenuAndSpellCheck (config, { navigate, get }) {
         }))
         this.addSeparator(menu)
       }
-      var copyRef = new MenuItem({
+      const copyRef = new MenuItem({
         label: `Copy Link Ref (${extractedRef.slice(0, 10)}...)`,
         click: () => {
           // Omit the mailto: portion of the link; we just want the address
@@ -87,7 +87,7 @@ function setupContextMenuAndSpellCheck (config, { navigate, get }) {
       menu.append(copyRef)
 
       if (ref.isBlob(extractedRef) && menuInfo.hasImageContents) {
-        var copyEmbed = new MenuItem({
+        const copyEmbed = new MenuItem({
           label: `Copy Embed Markdown`,
           click: () => {
             // Omit the mailto: portion of the link; we just want the address
@@ -111,7 +111,7 @@ function setupContextMenuAndSpellCheck (config, { navigate, get }) {
 
   module.exports.menu = new ContextMenuListener((info) => {
     contextMenuBuilder.buildMenuForElement(info).then((menu) => {
-      var element = document.elementFromPoint(info.x, info.y)
+      let element = document.elementFromPoint(info.x, info.y)
       while (element && !element.msg) {
         element = element.parentNode
       }

lib/depject/about/async/latest-values.js

@@ -1,5 +1,5 @@
-var nest = require('depnest')
-var { onceTrue } = require('mutant')
+const nest = require('depnest')
+const { onceTrue } = require('mutant')
 
 exports.needs = nest({
   'sbot.obs.connection': 'first'

lib/depject/about/html/image.js

@@ -1,5 +1,5 @@
-var h = require('mutant/h')
-var nest = require('depnest')
+const h = require('mutant/h')
+const nest = require('depnest')
 
 exports.needs = nest({
   'about.obs.imageUrl': 'first',

lib/depject/about/html/link.js

@@ -1,5 +1,5 @@
-var h = require('mutant/h')
-var nest = require('depnest')
+const h = require('mutant/h')
+const nest = require('depnest')
 
 exports.needs = nest({
   'about.obs.name': 'first'

lib/depject/about/obs.js

@@ -1,10 +1,10 @@
-var { computed } = require('mutant')
-var nest = require('depnest')
-var ref = require('ssb-ref')
-var colorHash = new (require('color-hash'))()
-var fallbackImageUrl = 'data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='
-var MutantPullValue = require('../../mutant-pull-value')
-var MutantPullDict = require('../../mutant-pull-dict')
+const { computed } = require('mutant')
+const nest = require('depnest')
+const ref = require('ssb-ref')
+const colorHash = new (require('color-hash'))()
+const fallbackImageUrl = 'data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='
+const MutantPullValue = require('../../mutant-pull-value')
+const MutantPullDict = require('../../mutant-pull-dict')
 
 exports.needs = nest({
   'sbot.pull.stream': 'first',
@@ -31,7 +31,7 @@ exports.gives = nest({
 })
 
 exports.create = function (api) {
-  var socialValueCache = {}
+  const socialValueCache = {}
   return nest({
     'about.obs': {
       // quick helpers, probably should deprecate!
@@ -71,7 +71,7 @@ exports.create = function (api) {
   function socialValue (id, key, defaultValue) {
     if (!ref.isLink(id)) throw new Error('About requires an ssb ref!')
     if (!socialValueCache[id + '/' + key]) {
-      var obs = socialValueCache[id + '/' + key] = MutantPullValue(() => {
+      const obs = socialValueCache[id + '/' + key] = MutantPullValue(() => {
         return api.sbot.pull.stream((sbot) => sbot.about.socialValueStream({ dest: id, key }))
       }, {
         onListen: () => { socialValueCache[id + '/' + key] = obs },
@@ -99,9 +99,9 @@ function checkDelete (msg) {
 }
 
 function getGroupedValues (lookup) {
-  var values = {}
-  for (var author in lookup) {
-    var value = getValue(lookup[author])
+  const values = {}
+  for (const author in lookup) {
+    const value = getValue(lookup[author])
     if (value != null) {
       values[value] = values[value] || []
       values[value].push(author)

lib/depject/about/sync.js

@@ -1,8 +1,8 @@
-var nest = require('depnest')
+const nest = require('depnest')
 
 exports.gives = nest('about.sync.shortFeedId')
 
-exports.create = function (api) {
+exports.create = function () {
   return nest('about.sync.shortFeedId', function (id) {
     return id.slice(1, 10)
   })

lib/depject/about/sync/short-feed-id.js

@@ -1,8 +1,8 @@
-var nest = require('depnest')
+const nest = require('depnest')
 
 exports.gives = nest('about.sync.shortFeedId')
 
-exports.create = function (api) {
+exports.create = function () {
   return nest('about.sync.shortFeedId', function (id) {
     return `${id.slice(0, 10)}...`
   })