Use electron-spellchecker instead of electron-hunspell

3 files changed, 29 insertions, 54 deletions

diff --git a/src/config.js b/src/config.js
index b1dbab1ff..e762f879f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -116,7 +116,6 @@ export const LOCAL_SERVER = 'You are using Ferdi without a server';
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
-export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries'));
 export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
 
 export const ALLOWED_PROTOCOLS = [
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index c64830574..678554c05 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -54,7 +54,6 @@
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
   "locked.submit.label": "Unlock",
-  "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "電子郵件信箱",
@@ -187,7 +186,6 @@
   "services.getStarted": "開始使用",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "歡迎使用 Ferdi",
   "settings.account.account.editButton": "更改帳戶資訊",
   "settings.account.accountType.basic": "基本帳戶",
@@ -356,8 +354,6 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "公司",
   "settings.user.form.accountType.individual": "個人",
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 1cb449110..2062429fd 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,36 +1,21 @@
 import { webFrame } from 'electron';
-import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
-import path from 'path';
-import { readFileSync } from 'fs';
+import {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} from 'electron-spellchecker';
 
-import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Ferdi:spellchecker');
+const debug = require('debug')('Franz:spellchecker');
 
-let provider;
+let handler;
 let currentDict;
+let contextMenuBuilder;
 let _isEnabled = false;
-let attached;
 
-const DEFAULT_LOCALE = 'en-us';
-
-async function loadDictionary(locale) {
-  try {
-    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    debug('Loaded dictionary', locale, 'from', fileLocation);
-    return provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
-  } catch (err) {
-    console.error('Could not load dictionary', err);
-  }
-}
-
-export async function switchDict(locale = DEFAULT_LOCALE) {
+export async function switchDict(locale) {
   try {
     debug('Trying to load dictionary', locale);
 
-    if (!provider) {
-      console.warn('SpellcheckProvider not initialized');
+    if (!handler) {
+      console.warn('SpellcheckHandler not initialized');
 
       return;
     }
@@ -41,11 +26,7 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
       return;
     }
 
-    if (currentDict) {
-      provider.unloadDictionary(locale);
-    }
-    await loadDictionary(locale);
-    await attached.switchLanguage(locale);
+    handler.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -56,34 +37,22 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
   }
 }
 
-export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
-  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
-
-  if (locales.length >= 1) {
-    return locales[0];
-  }
-
-  return null;
-}
-
-export default async function initialize(languageCode = DEFAULT_LOCALE) {
+export default async function initialize(languageCode = 'en-us') {
   try {
-    provider = new SpellCheckerProvider();
-    const locale = getSpellcheckerLocaleByFuzzyIdentifier(languageCode);
+    handler = new SpellCheckHandler();
+    handler.attachToInput();
+    const locale = languageCode.toLowerCase();
 
     debug('Init spellchecker');
-    await provider.initialize();
-
-    debug('Attaching spellcheck provider');
-    attached = await attachSpellCheckProvider(provider);
-
-    const availableDictionaries = await provider.getAvailableDictionaries();
 
-    debug('Available spellchecker dictionaries', availableDictionaries);
+    switchDict(locale);
 
-    await switchDict(locale);
+    contextMenuBuilder = new ContextMenuBuilder(handler);
+    new ContextMenuListener((info) => {
+      contextMenuBuilder.showPopupMenu(info);
+    });
 
-    return provider;
+    return handler;
   } catch (err) {
     console.error(err);
     return false;
@@ -96,8 +65,19 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
+    handler.unsubscribe();
     webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }
 }
+
+export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+
+  if (locales.length >= 1) {
+    return locales[0];
+  }
+
+  return null;
+}