tray failing: every time something starts working everything else falls apart :/

CHANGELOG.md

@@ -0,0 +1,101 @@
+# changelog
+
+if something is ~~crossed out~~, then it is no longer a feature included by default,
+but can still easily be enabled by following instructions in the [docs](README.md).
+
+### v0.8.0 (wip)
+
+complete rewrite with node.js.
+
+- new: simpler cli installation system (inc. commands: `apply`, `remove`, and `check`).
+- new: mod loading system (easier to create new mods, adds to notion rather than overwriting).
+- bugfix: non-reproducable errors with python.
+- bugfix: better launcher patching on linux.
+
+//todo
+
+- improved: greater choice of emoji sets.
+- improved: better colour coverage for theming variables.
+- new: menu for configuring mods.
+- new: syncing dark/light theme with the system.
+
+### v0.7.0 (2020-07-09)
+
+- new: tray option to use system default emojis (instead of twitter's emojiset).
+- new: mac support (identical functionality to others platforms with the
+  exception of the native minimise/maximise/close buttons being kept, as they integrate
+  better with the OS while not being out-of-place in notion).
+- new: notion-deb-builder support for linux.
+- improved: replaced button symbols with svgs for multi-platform support.
+- improved: window close button is now red on hover (thanks to [@torchatlas](https://github.com/torchatlas)).
+- bugfix: `cleaner.py` patched for linux.
+- bugfix: tray now operates as expected on linux.
+- bugfix: odd mix of `\\` and `/` being used for windows filepaths.
+- bugfix: app no longer crashes when sidebar is toggled.
+
+### v0.6.0 (2020-06-30)
+
+- style: custom fonts.
+- style: font resizing.
+- style: hide discussions (thanks to [u/Roosmaryn](https://www.reddit.com/user/Roosmaryn/)).
+- new: custom colour theming, demonstrated via the dark+ theme.
+- new: linux support (thanks to [@Blacksuan19](https://github.com/Blacksuan19)).
+- improved: if hotkey is pressed while notion is unfocused, it will bring it to the front rather than hiding it.
+- improved: stop window buttons breaking at smaller widths.
+- improved: more obviously visible drag area.
+- bugfix: specify UTF-8 encoding to prevent multibyte/gbk codec errors (thanks to [@etnperlong](https://github.com/etnperlong)).
+
+> 📥 [notion-enhancer.v0.6.0.zip](https://github.com/dragonwocky/notion-enhancer/archive/v0.6.0.zip)
+
+### v0.5.0 (2020-05-23)
+
+- new: running from the wsl.
+- new: reload window with f5.
+- improved: code has been refactored and cleaned up,
+  inc. file renaming and a `customiser.py` that doesn't require
+  a run of `cleaner.py` to build modifications.
+  improved: scrollbar colours that fit better with notion's theming.
+- bugfix: un-break having multiple notion windows open.
+
+> 📥 [notion-enhancer.v0.5.0.zip](https://github.com/dragonwocky/notion-enhancer/archive/v0.5.0.zip)
+
+_(forked by [@dragonwocky](https://github.com/dragonwocky).)_
+
+### v0.4.1 (2020-02-13)
+
+- bugfix: wider table & the "+" button not working in database pages.
+
+> 📥 [notion-enhancer.v4.1.zip](https://s3-us-west-2.amazonaws.com/secure.notion-static.com/d239a3cf-d553-4ef3-ab04-8b47892d9f9a/Notion_Customization_v4.1.zip)
+
+### v0.4.0
+
+- new: tray icon.
+- new: app startup options (+ saving).
+- new: `Reset.py`
+- improved: better output from `Customization Patcher.py`.
+- bugfix: wider tables in "short page" mode.
+- bugfix: unclickable buttons/draggable area (of titlebar).
+
+### v0.3.0
+
+- new: show/hide window hotkey.
+- new: app startup options.
+- ~~style: smaller table icons.~~
+
+> 📥 [notion-enhancer.v3.zip](https://s3-us-west-2.amazonaws.com/secure.notion-static.com/b01aa446-5727-476a-a25e-395472bfb1be/NotionScriptsV3.zip)
+
+### v0.2.0
+
+- new: light/dark theme support for window control buttons + scrollbars.
+- new: custom styles directly linked to the enhancer resources + compatible with web version.
+- ~~improved: making table column width go below 100px.~~
+
+### v0.1.0
+
+- new: custom window control buttons.
+- removed: default titlebar/menubar.
+- ~~removed: huge padding of board view.~~
+- ~~removed: huge padding of table view.~~
+- ~~optional: making table column width go below 100px.~~
+- ~~style: thinner cover image + higher content block.~~
+- style: scrollbars.

DOCUMENTATION.md

@@ -4,15 +4,18 @@ ended up here? this is a wip version of the enhancer, and this file is yet to be
 if you're interested in using the project, switch back to the [master branch](https://github.com/dragonwocky/notion-enhancer).
 for support, contact me on discord `dragonwocky#8449` or open an issue here in the repo.
 
-want to contribute? check the the [contribution guidelines](CONTRIBUTING.md).
+want to contribute? check the [contribution guidelines](CONTRIBUTING.md).
 
 ## module creation
 
 _to understand best how notion's app works, check out [the electron docs](https://www.electronjs.org/docs/)_
 _and explore the contents of your local extracted `app.asar`._
 
-_explore [the existing modules](https://github.com/dragonwocky/notion-enhancer/tree/js/mods/)_
-_for examples of implementing what's described below._
+_look through [the existing modules](https://github.com/dragonwocky/notion-enhancer/tree/js/mods/)_
+_for examples of implementing the stuff described below._
+
+_testing modules requires running a dev version of the enhancer_
+_(again, see the [contribution guidelines](CONTRIBUTING.md)). a better system is in the works._
 
 each directory in the `mods` folder is considered a module, with the entry points `mod.js` and `styles.css`.
 

README.md

@@ -4,22 +4,19 @@ ended up here? this is a wip version of the enhancer, and this file is yet to be
 if you're interested in using the project, switch back to the [master branch](https://github.com/dragonwocky/notion-enhancer).
 for support, contact me on discord `dragonwocky#8449` or open an issue here in the repo.
 
-want to contribute? check the the [contribution guidelines](CONTRIBUTING.md).
+notion.so's ui/ux is pretty awesome, but there's always room for improvement.
+this script enhances your experience, making the tool smoother to use and nicer on the eyes,
+and adding some handy extra functionality too.
 
-<!--
-what?
-why?
-how?
-support?
-extension?
--->
+want to contribute? check the the [contribution guidelines](CONTRIBUTING.md).
 
 ## installation
 
 1. install node.js: [windows/macOS](https://nodejs.org/en/download/), [linux/WSL](https://github.com/mklement0/n-install).
 2. install notion-enhancer globally via yarn or npm:
    `npm i -g notion-enhancer` or `yarn global add notion-enhancer`
-3. ensure no notion processes are running (you may want to check the task manager to make sure), and try running one of these commands:
+3. ensure no notion processes are running (you may want to check the task manager to make sure),
+   and try running one of these commands:
 
    ```
    Usage:
@@ -59,9 +56,21 @@ mobile clients are not supported and due to system limitations/restrictions cann
 
 **is this against notion's terms of service? can i get in trouble for using it?**
 
-absolutely not! i contacted notion to check, and their response was awesome:
+definitely not! i contacted notion to check, and their response was awesome:
 
-"Thanks for taking the time to share this with us. Userscripts and userstyles are definitely cool ideas and would be helpful for many users! ... I'll also share this with the rest of the team to take to heart for future improvements."
+"Thanks for taking the time to share this with us. Userscripts and userstyles are definitely
+cool ideas and would be helpful for many users! ... I'll also share this with the rest of the
+team to take to heart for future improvements."
+
+**can i enhance the web version of notion too?**
+
+yes, and no. styling can be copy/pasted into a web extension like
+[stylus](https://chrome.google.com/webstore/detail/stylus/clngdbkpkpeebahjckkjfobafhncgmne),
+and some scripts could be used with greasemonkey (untested). however, most hacks
+aren't in a form that can simply be ported for use in a browser.
+
+after i've gotten to enhancer to a reasonably high level of robustness/functionalality/stableness,
+i may create a notion-enhancer chrome extension.
 
 ## contributors
 
@@ -69,6 +78,7 @@ this project was started by [@TarasokUA](https://github.com/TarasokUA/) in early
 a couple months after, they decided they didn't have any motivation to continue work on it and
 the enhancer was picked up by [@dragonwocky](https://github.com/dragonwocky/).
 
-since then, various community members have helped out heaps here on github or in more extended discussions on discord (with code, feedback and testing):
+since then, various community members have helped out heaps here on github or in more extended
+discussions on discord (with code, feedback and testing):
 
 [![](https://contributors-img.web.app/image?repo=dragonwocky/notion-enhancer)](https://github.com/dragonwocky/notion-enhancer/graphs/contributors)

mods/core/mod.js

@@ -4,6 +4,13 @@
  * (https://dragonwocky.me/) under the MIT license
  */
 
+const defaults = {
+  openhidden: false,
+  maximized: false,
+  tray: false,
+  hotkey: 'CmdOrCtrl+Shift+A',
+};
+
 module.exports = {
   id: '0f0bf8b6-eae6-4273-b307-8fc43f2ee082',
   type: 'core',
@@ -16,6 +23,7 @@ module.exports = {
     'https://camo.githubusercontent.com/5c5bca9e987d986b8cc7e51066f90c6f8a84af08/68747470733a2f2f63646e2e646973636f72646170702e636f6d2f6174746163686d656e74732f3733313634373938343332333931393933332f3733313732373235393239353032333132342f494d475f323137302e6a7067',
   options: [],
   hacks: {
+    // 'main/main.js': require('./tray.js')(defaults),
     'renderer/preload.js': function (store) {
       const data = store({ name: 'dragonwocky' });
       console.log(data.name);

mods/core/tray.js

@@ -0,0 +1,81 @@
+/*
+ * notion-enhancer
+ * (c) 2020 dragonwocky <thedragonring.bod@gmail.com>
+ * (c) 2020 TarasokUA
+ * (https://dragonwocky.me/) under the MIT license
+ */
+
+let tray;
+const electron = require('electron'),
+  path = require('path'),
+  is_mac = process.platform === 'darwin',
+  is_win = process.platform === 'win32',
+  settings = {};
+
+electron.app.on('ready', () => {
+  tray = new electron.Tray(
+    is_win
+      ? path.resolve(__dirname, 'windows.ico')
+      : new electron.nativeImage.createFromPath(
+          path.resolve(__dirname, 'mac+linux.png')
+        ).resize({
+          width: 16,
+          height: 16,
+        })
+  );
+
+  const contextMenu = electron.Menu.buildFromTemplate([
+    {
+      type: 'normal',
+      label: 'Bug Report',
+    },
+    {
+      type: 'normal',
+      label: 'Feature Request',
+    },
+    {
+      type: 'separator',
+    },
+    {
+      type: 'normal',
+      label: 'Docs',
+    },
+    {
+      type: 'normal',
+      label: 'Enhancements',
+    },
+    {
+      type: 'separator',
+    },
+    {
+      label: 'Quit',
+      role: 'quit',
+    },
+  ]);
+  tray.setContextMenu(contextMenu);
+  tray.setToolTip('Notion');
+
+  function showWindows() {
+    const windows = electron.BrowserWindow.getAllWindows();
+    if (is_mac) electron.app.show();
+    if (settings.maximized) windows.forEach((win) => [win.maximize()]);
+    else windows.forEach((win) => win.show());
+    electron.app.focus({ steal: true });
+  }
+  function hideWindows() {
+    const windows = electron.BrowserWindow.getAllWindows();
+    windows.forEach((win) => [win.isFocused() && win.blur(), win.hide()]);
+    if (is_mac) electron.app.hide();
+  }
+  tray.on('click', () => {
+    const windows = electron.BrowserWindow.getAllWindows();
+    if (windows.some((win) => win.isVisible())) hideWindows();
+    else showWindows();
+  });
+  electron.globalShortcut.register(settings.hotkey, () => {
+    const windows = electron.BrowserWindow.getAllWindows();
+    if (windows.some((win) => win.isFocused() && win.isVisible()))
+      hideWindows();
+    else showWindows();
+  });
+});

package.json

@@ -33,6 +33,7 @@
   "dependencies": {
     "asar": "^3.0.3",
     "cac": "^6.5.12",
+    "caller-path": "^3.0.0",
     "fs-extra": "^9.0.1",
     "readdir-enhanced": "^6.0.3"
   }

pkg/apply.js

@@ -109,7 +109,7 @@ module.exports = async function ({ overwrite_version } = {}) {
         insertion_target,
         `\n\n//notion-enhancer\nrequire('${helpers.realpath(
           __dirname
-        )}/loader.js')(__filename);`
+        )}/loader.js')();`
       );
     }
 

pkg/loader.js

@@ -8,10 +8,12 @@
 const fs = require('fs-extra'),
   path = require('path'),
   helpers = require('./helpers.js'),
-  store = require('./store.js');
+  store = require('./store.js'),
+  caller = require('caller-path');
 
 let __notion = helpers.getNotion();
-module.exports = async function (__file) {
+module.exports = async function () {
+  let __file = caller();
   __notion = await __notion;
   __file = __file
     .slice(path.resolve(__notion, 'app').length + 1)
@@ -35,7 +37,9 @@ module.exports = async function (__file) {
         throw Error;
       if (mod.type === 'core' || store('mods', { [mod.id]: false })[mod.id]) {
         if (mod.hacks && mod.hacks[__file])
-          mod.hacks[__file]((defaults) => store(mod.id, defaults));
+          mod.hacks[__file]((...args) =>
+            args.length === 1 ? store(mod.id, args[0]) : store(args[0], args[1])
+          );
         if (
           __file === 'renderer/preload.js' &&
           (await fs.pathExists(

yarn.lock

@@ -69,6 +69,25 @@ cac@^6.5.12:
   resolved "https://registry.yarnpkg.com/cac/-/cac-6.6.1.tgz#3dde3f6943f45d42a56729ea3573c08b3e7b6a6d"
   integrity sha512-uhki4T3Ax68hw7Dufi0bATVAF8ayBSwOKUEJHjObPrUN4tlQ8Lf7oljpTje/mArLxYN0D743c2zJt4C1bVTCqg==
 
+caller-callsite@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-4.1.0.tgz#3e33cb1d910e7b09332d59a3503b9af7462f7295"
+  integrity sha512-99nnnGlJexTc41xwQTr+mWl15OI5PPczUJzM4YRE7QjkefMKCXGa5gfQjCOuVrD+1TjI/fevIDHg2nz3iYN5Ig==
+  dependencies:
+    callsites "^3.1.0"
+
+caller-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-3.0.0.tgz#a13cbec75eea1b355e3f92dc0df4288b7eebdc5f"
+  integrity sha512-8nvMBmBgTmEfAXywJf27jbPZlURi5xUWLwkTXa3hZFcEZa5iRnMP4sF0p00CstWNHKBENVyYWDRSByNRdshdgQ==
+  dependencies:
+    caller-callsite "^4.1.0"
+
+callsites@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"