new features

- Tray is back
- Smooth scroll in thread view
- New root message cache

Author: soapdog

app.js

@@ -1,4 +1,12 @@
-const { Menu, app, dialog, shell, protocol, BrowserWindow, ipcMain } = require("electron")
+const { 
+  Menu, 
+  app, 
+  dialog, 
+  shell, 
+  protocol, 
+  BrowserWindow,
+  Tray,
+  ipcMain } = require("electron")
 const path = require("path")
 const defaultMenu = require("electron-default-menu")
 const windowStateKeeper = require("electron-window-state")
@@ -7,6 +15,7 @@ const queryString = require("query-string")
 
 let windows = new Set()
 let sbot = null
+let tray = null
 
 const createWindow = (data = false, windowState = false) => {
   let win
@@ -18,6 +27,7 @@ const createWindow = (data = false, windowState = false) => {
     win = new BrowserWindow({
       width: 800,
       height: 800,
+      show: false,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: false,
@@ -27,6 +37,7 @@ const createWindow = (data = false, windowState = false) => {
     win = new BrowserWindow({
       x: windowState.x,
       y: windowState.y,
+      show: false,
       width: windowState.width,
       height: windowState.height,
       webPreferences: {
@@ -49,6 +60,10 @@ const createWindow = (data = false, windowState = false) => {
     win.webContents.send("window:focus")
   })
 
+  win.once("ready-to-show", () => {
+    win.show()
+  })
+
   win.webContents.on("will-navigate", (event, url) => {
     console.log("event", event)
     console.log("url", url)
@@ -152,6 +167,9 @@ ipcMain.on("menu:set", (event, group) => {
           createWindow()
         },
       },
+      {
+        role: "shareMenu"
+      }
     ],
   }
 
@@ -180,11 +198,95 @@ ipcMain.on("menu:set", (event, group) => {
   Menu.setApplicationMenu(finalMenu)
 })
 
+ipcMain.on("tray:set", (event, group) => {
+  // console.log("received menu", JSON.stringify(group, null, 2))
+  let menu = []
+  let keys = Object.keys(group)
+
+  // console.log(JSON.stringify(menu,null,2))
+
+  const makeSubmenu = subgroup => {
+    let toPush = []
+    subgroup.forEach(m => {
+      m.items.forEach(i => {
+        let m = {
+          label: i.label,
+          click: (item, win) => {
+            win.webContents.send("menu:trigger", {
+              event: i.event,
+              data: i.data,
+            })
+          },
+        }
+
+        if (i?.shortcut) {
+          m.accelerator = i.shortcut
+        }
+
+        toPush.push(m)
+      })
+      toPush.push({ type: "separator" })
+    })
+    toPush.pop()
+    return toPush
+  }
+
+  keys.forEach(k => {
+    let m = {
+      label: k,
+      submenu: makeSubmenu(group[k]),
+    }
+
+    if (k.toLowerCase() == "help") {
+      m.role = "help"
+    }
+
+    menu.push(m)
+  })
+
+  // FIXME: menu has wrong order for toplevel items.
+  let topItems = [
+    {
+      label: "New Window",
+      accelerator: "CmdOrCtrl+Shift+N",
+      click: () => {
+        createWindow()
+      },
+    }
+  ]
+
+  let bottomItems = [
+    {
+      type: "separator"
+    },
+    {
+      label: "Quit",
+      click() { app.quit() }
+    }
+  ]
+
+  let finalMenu = Menu.buildFromTemplate([...topItems, ...menu, ...bottomItems])
+
+  tray.setContextMenu(finalMenu)
+})
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on("ready", () => {
   console.log("Attempting to start server...")
+
+  tray = new Tray(`${__dirname}/ui/assets/images/patchfox_pixel_16.png`)
+  tray.setToolTip("Patchfox")
+
+  const initialMenu = Menu.buildFromTemplate([
+    {
+      label: "Quit",
+      click() { app.quit() }
+    }
+  ])
+  tray.setContextMenu(initialMenu)
+
   startDefaultPatchfoxServer((err, ssb) => {
     console.log("Server started!", ssb.id)
     sbot = ssb

package-lock.json

@@ -111,6 +111,7 @@
     "localbuild": "run-s build builder:*"
   },
   "dependencies": {
+    "hashlru": "^2.3.0",
     "ssb-about": "^2.0.1",
     "ssb-blobs": "^2.0.1",
     "ssb-conn": "^6.0.3",

package.json

@@ -4078,6 +4078,10 @@ html {
   flex: 1 1 0%;
 }
 
+.flex-auto {
+  flex: 1 1 auto;
+}
+
 .flex-initial {
   flex: 0 1 auto;
 }

ui/assets/css/tailwind.css

@@ -42,7 +42,10 @@ const Card = {
     }
 
 
-    return m("div", {"class": cardCss()}, [
+    return m("div", {
+      "class": cardCss(),
+      "data-key": msg.key
+    }, [
       m(".card-title",
         [
           m(".navbar",

ui/assets/images/bg.jpg

@@ -43,7 +43,12 @@ const MessageDropdown = {
         view: "thread",
         thread: msg.key
       })
-     
+    }
+
+    const shareItem = () => {
+      vnode.state.dropdownActive = false
+      console.log(msg)
+      ipcRenderer.send("share", ssbUri.fromMessageSigil(msg.key))
     }
 
     const menuRight = {
@@ -82,6 +87,11 @@ const MessageDropdown = {
             icon: "copy",
             onclick: copyHash,
           }),
+          m(MenuItem, {
+            label: "Share SSB URI",
+            icon: "share",
+            onclick: shareItem,
+          }),
           m(".divider", "FOR THE CURIOUS"),
           m(MenuItem, {
             label: "Raw Message",

ui/assets/images/logo.svg

@@ -42,7 +42,7 @@ const MessageRenderer = {
     if (typeof msg.value.content === "string") {
       type = "private"
     } else {
-      type = msg.value.content.type
+      type = msg.value.content.type ?? "unknown"
     }
 
     for (let p of messageTypes) {

ui/assets/images/patchfox_pixel_16.png

@@ -13,10 +13,10 @@ function _package(pkg) {
   let name = pkg.name
   let ssb = global.ssb
   if (pkg.supportedPlatforms.includes("all")) {
-    console.log(`Loading package ${pkg.name} because it supports *all* platforms.`)
+    // console.log(`Loading package ${pkg.name} because it supports *all* platforms.`)
     _.set(packages, name, pkg)
   } else if (pkg.supportedPlatforms.includes(ssb?.platform)) {
-    console.log(`Loading package ${pkg.name}`)
+    // console.log(`Loading package ${pkg.name}`)
     _.set(packages, name, pkg)
   } else {
     console.error(`Not loading package ${pkg.name}`, ssb)

ui/core/components/Card.js

@@ -10,6 +10,15 @@ function menus() {
   return _.flatten(result)
 }
 
+function trayItems() {
+  let result = []
+  let packagesWithGlobalMenuEntries = _.filter(patchfox.packages, (p) => p.tray)
+  packagesWithGlobalMenuEntries.forEach((p) => {
+    result.push(p.menu)
+  })
+  return _.flatten(result)
+}
+
 function menuGroups() {
   let ms = menus()
   let groups = {}
@@ -23,6 +32,19 @@ function menuGroups() {
   return groups
 }
 
+function trayGroups() {
+  let ms = trayItems()
+  let groups = {}
+  ms.forEach((m) => {
+    if (m.group && !groups[m.group]) {
+      groups[m.group] = []
+    }
+
+    groups[m.group].push(m)
+  })
+  return groups
+}
+
 function triggerMenu(menuItem) {
   let { event, data } = menuItem
   console.log("menu event:", event)
@@ -32,5 +54,6 @@ function triggerMenu(menuItem) {
 module.exports = {
   menus,
   menuGroups,
+  trayGroups,
   triggerMenu,
 }

ui/core/components/MessageDropdown.js

@@ -1,3 +1,5 @@
+const HLRU = require("hashlru")
+const rootCache = HLRU(200) 
 
 const caches = {}
 let avatarCache = {}
@@ -29,21 +31,15 @@ const resultFromCache = (kind, msgId, falseIfOlderThan) => {
 
 
 const getMsgCache = (id) => {
-  let data = sessionStorage.getItem(id)
-  if (data) {
-    try {
-      return JSON.parse(data)
-    } catch (n) {
-      sessionStorage.removeItem(id)
-      return false
-    }
+  if (rootCache.has(id)) {
+    return rootCache.get(id)
   } else {
     return false
   }
 }
 
 const setMsgCache = (id, data) => {
-  sessionStorage.setItem(id, JSON.stringify(data))
+  rootCache.set(id, data)
 }
 
 function setAvatarCache(feed, data) {