Merge branch 'master' into re-enable-ssb-ebt

Author: mmckegg

.travis.yml

@@ -3,18 +3,18 @@ matrix:
     - os: osx
       osx_image: xcode9.4
       language: node_js
-      node_js: 10
+      node_js: lts/*
       env:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
 
     - os: linux
       language: node_js
-      node_js: 10
+      node_js: lts/*
 
     - os: windows
       language: node_js
-      node_js: 10
+      node_js: lts/*
       filter_secrets: false
 
 cache:
@@ -43,3 +43,4 @@ script: npm test && npm run dist
 branches:
   only:
   - master
+  - "/^v\\d+\\.\\d+\\.\\d+$/"

docs/CHANGELOG.md

@@ -14,10 +14,70 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 -->
 
-## [Unreleased]
+## v3.16.2 - 2019-08-21
+
+### Fixed
+- Infinite indexing bug related to ssb-legacy-conn upgrade (#1172)
+- Message click not working related to URI component decoding (#1171)
+
+## v3.16.0 - 2019-08-20
+
+### Added
+- Content warning support (#1159)
+- Recent changes from changelog to release notes (#1155)
+- Unicode hashtag support with ssb-markdown upgrade (#1168)
+
+### Changed
+- Refactor to remove unused code (#1153)
+- Refactor to remove bulk-require module (#1158)
+- Switch from ssb-gossip to ssb-legacy-conn
+
+### Fixed
+- "Could not get message" bug on gatherings (#1166)
+- Your gatherings not showing in gathering feed (#1167)
+- Encoded URI bug when previewing profile with hover (#1169)
+
+## v3.15.0 - 2019-08-08
+
+### Added
+- Developer script to output release notes (#1095)
+- Documentation for which versions of Node we can support (#1115)
+- Esperanto translation (#1126)
+- Option to delete feeds from blocked authors (#1026)
+- Traditional Chinese translation (#1130)
+
+### Changed
+- Encode emoji as unicode character instead of `:shortcode` (#1105)
+- Switch input textarea font from monospace to sans-serif (#1120)
+- Refactor to remove unused code (#1122)
+- Increase size of emoji in helper (#1139)
+- Upgrade JavaScript dependencies (#1141)
+
+### Fixed
+- Fixed corners of avatar images in private messages not matching up (#1075)
+- Spanish typo for public messages (#1113)
+- Bug where gathering was showing as "private" in preview (#1131)
+- Mistranslations in Simplified Chinese (#1137)
+
+## v3.14.1 - 2019-06-17
+
+### Fixed
+- Resolved inconsistent emoji rendering from `:shortcode:` inconsistencies.
+
+## v3.14.0 - 2019-06-17
+
+### Added
+- Improved emoji support, Patchwork now has more emoji in a better font.
+- Developer warning when trying to start Patchwork twice.
+
+### Changed
+- Reorganized directory structure,, improved readme and contributor guide.
+- Update check on startup now happens every 24 hours.
+- Switched to system font instead of using Arial everywhere.
 
 ### Fixed
 - Stopped automatically turning ascii emoji like ":)" into their respective image emoji.
+- Liberated code in posts from its tiny box with a scroll bar.
 
 ## v3.13.0 - 2019-06-10
 

docs/INSTALL.md

@@ -3,11 +3,10 @@
 The readme contains some information on the simplest installation methods, but
 you can also install Patchwork by fetching from Git and building from source.
 
-
 ## Dependencies
 
 - Git
-- Node.js (>= 6)
+- Node.js ([Active LTS][node-active-lts])
 - npm or Yarn
 
 ### Debian / Ubuntu
@@ -63,3 +62,5 @@ With yarn:
 ```shell
 yarn
 ```
+
+[node-active-lts]: https://github.com/nodejs/Release#release-schedule

docs/release-notes-template.md

@@ -0,0 +1,25 @@
+:tada: **Thanks for downloading Patchwork!** :tada:
+
+## Install
+
+- **Windows:** [`ssb-patchwork-setup-$$VERSION.exe`][exe]
+- **macOS:** [`Patchwork-$$VERSION.dmg`][dmg] (you may need to [allow apps from "unidentified" developers](https://support.apple.com/kb/PH25088))
+- **Linux:** [`ssb-patchwork-$$VERSION-x86_64.AppImage`][appimage] (you will need to [make it executable](https://docs.appimage.org/user-guide/run-appimages.html))
+
+## Getting started
+
+If this is your first time on Scuttlebutt you may need an invite to get connected. After installing Patchwork and choosing your name you should select the **Join Pub** button. You'll need to [get a pub invite](https://github.com/ssbc/ssb-server/wiki/Pub-Servers#public-pubs), paste it into the prompt, and select **Redeem invite**.
+
+You can find more information in the [Getting Started Guide](https://www.scuttlebutt.nz/getting-started).
+
+## Changes
+$$CHANGES
+## Support
+
+:thinking:  [Any questions? Check out the Scuttlebutt FAQ!](https://www.scuttlebutt.nz/faq/)
+
+:sos: [Need help? Please create an issue!](https://github.com/ssbc/patchwork/issues/new)
+
+[dmg]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/Patchwork-$$VERSION.dmg
+[exe]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/ssb-patchwork-setup-$$VERSION.exe
+[appimage]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/ssb-patchwork-$$VERSION-x86_64.AppImage

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
     })
@@ -200,7 +200,7 @@ function setupContext (appName, opts, cb) {
     ssbConfig.remote = `net:127.0.0.1:${ssbConfig.port}~shs:${pubkey}`
   } else {
     const socketPath = Path.join(ssbConfig.path, 'socket')
-    ssbConfig.connections.incoming.unix = [{ 'scope': 'device', 'transform': 'noauth' }]
+    ssbConfig.connections.incoming.unix = [{ scope: 'device', transform: 'noauth' }]
     ssbConfig.remote = `unix:${socketPath}:~noauth:${pubkey}`
   }
 

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,31 @@ 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')
+    let href = anchor.getAttribute('href')
+
+    if (href.startsWith('#')) {
+      try {
+        href = decodeURIComponent(href)
+      } catch (e) {
+        // Safely ignore error because href isn't URI-encoded.
+      }
+    }
 
     if (href) {
-      var isUrl
+      let isUrl
+      let url
 
       try {
-        var url = new URL(href)
+        url = new URL(href)
         isUrl = true
       } catch (e) {
         isUrl = false