Add new service-level option 'trapLinkUrls' (#154)

This option can be used to allow the user to choose how to handle links
(whether to open in the default browser or within the Ferdium service itself)

Co-authored-by: André Oliveira <oliveira.andrerodrigues95@gmail.com>

8 files changed, 43 insertions, 4 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 42e21dbc8..e426d2d73 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -108,6 +108,10 @@ const messages = defineMessages({
     id: 'settings.service.form.headlineGeneral',
     defaultMessage: 'General',
   },
+  headlineAppearance: {
+    id: 'settings.service.form.headlineAppearance',
+    defaultMessage: 'Appearance',
+  },
   headlineDarkReaderSettings: {
     id: 'settings.service.form.headlineDarkReaderSettings',
     defaultMessage: 'Dark Reader Settings',
@@ -133,6 +137,10 @@ const messages = defineMessages({
     defaultMessage:
       'Proxy settings will not be synchronized with the Ferdium servers.',
   },
+  serviceReloadRequired: {
+    id: 'settings.service.reloadRequired',
+    defaultMessage: 'Changes require reload of the service',
+  },
 });
 
 class EditServiceForm extends Component {
@@ -360,6 +368,15 @@ class EditServiceForm extends Component {
                     {intl.formatMessage(messages.isHibernationEnabledInfo)}
                   </p>
                   <Toggle field={form.$('isWakeUpEnabled')} />
+                  <Toggle field={form.$('trapLinkClicks')} />
+                  {/* TODO: Need to figure out how to effect this change without a reload of the recipe */}
+                  <p className="settings__help indented__help">
+                    {intl.formatMessage(messages.serviceReloadRequired)}
+                  </p>
+                </div>
+
+                <div className="settings__settings-group">
+                  <H3>{intl.formatMessage(messages.headlineAppearance)}</H3>
                   <Toggle field={form.$('isDarkModeEnabled')} />
                   {form.$('isDarkModeEnabled').value && (
                     <>
diff --git a/src/config.ts b/src/config.ts
index c72edb012..f602f473b 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -272,6 +272,7 @@ export const DEFAULT_SERVICE_SETTINGS = {
   isWakeUpEnabled: true,
   isNotificationEnabled: true,
   isBadgeEnabled: true,
+  trapLinkClicks: false,
   isMuted: false,
   customIcon: false,
   isDarkModeEnabled: false,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 24b827993..db8602c10 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -85,6 +85,10 @@ const messages = defineMessages({
     id: 'settings.service.form.darkReaderSepia',
     defaultMessage: 'Dark Reader Sepia',
   },
+  trapLinkClicks: {
+    id: 'settings.service.form.trapLinkClicks',
+    defaultMessage: 'Open URLs within Ferdium',
+  },
   onlyShowFavoritesInUnreadCount: {
     id: 'settings.service.form.onlyShowFavoritesInUnreadCount',
     defaultMessage: 'Only show Favorites in unread count',
@@ -198,6 +202,11 @@ class EditServiceScreen extends Component {
           value: service.isBadgeEnabled,
           default: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
         },
+        trapLinkClicks: {
+          label: intl.formatMessage(messages.trapLinkClicks),
+          value: service.trapLinkClicks,
+          default: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
+        },
         isMuted: {
           label: intl.formatMessage(messages.enableAudio),
           value: !service.isMuted,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 8a971cb6a..b4460c28e 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -323,6 +323,7 @@
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.headlineAppearance": "Appearance",
   "settings.service.form.headlineBadges": "Unread message badges",
   "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
@@ -352,8 +353,10 @@
   "settings.service.form.tabHosted": "Hosted",
   "settings.service.form.tabOnPremise": "Self hosted ⭐️",
   "settings.service.form.team": "Team",
+  "settings.service.form.trapLinkClicks": "Open URLs within Ferdium",
   "settings.service.form.useHostedService": "Use the hosted {name} service.",
   "settings.service.form.yourServices": "Your services",
+  "settings.service.reloadRequired": "Changes require reload of the service",
   "settings.services.deletedInfo": "Service has been deleted",
   "settings.services.discoverServices": "Discover services",
   "settings.services.headline": "Your services",
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index 8be5aa9c5..4b26f4747 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -48,6 +48,7 @@ class ServiceController {
         isEnabled: DEFAULT_SERVICE_SETTINGS.isEnabled,
         isNotificationEnabled: DEFAULT_SERVICE_SETTINGS.isNotificationEnabled,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
+        trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
         isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         spellcheckerLanguage: '',
@@ -76,6 +77,7 @@ class ServiceController {
         customRecipe: false,
         hasCustomIcon: false,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
+        trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         isEnabled: DEFAULT_SERVICE_SETTINGS.isEnabled,
         isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
@@ -219,6 +221,7 @@ class ServiceController {
         customRecipe: false,
         hasCustomIcon: DEFAULT_SERVICE_SETTINGS.customIcon,
         isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
+        trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
         isDarkModeEnabled: '', // TODO: This should ideally be a boolean (false). But, changing it caused the sidebar toggle to not work.
         isEnabled: DEFAULT_SERVICE_SETTINGS.isEnabled,
         isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
diff --git a/src/models/Service.js b/src/models/Service.js
index af42f9548..e2b9ae7c6 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -54,6 +54,8 @@ export default class Service {
 
   @observable isBadgeEnabled = true;
 
+  @observable trapLinkClicks = false;
+
   @observable isIndirectMessageBadgeEnabled = true;
 
   @observable iconUrl = '';
@@ -134,6 +136,10 @@ export default class Service {
       data.isBadgeEnabled,
       this.isBadgeEnabled,
     );
+    this.trapLinkClicks = ifUndefinedBoolean(
+      data.trapLinkClicks,
+      this.trapLinkClicks,
+    );
     this.isIndirectMessageBadgeEnabled = ifUndefinedBoolean(
       data.isIndirectMessageBadgeEnabled,
       this.isIndirectMessageBadgeEnabled,
@@ -207,6 +213,7 @@ export default class Service {
       url: this.url,
       hasCustomIcon: this.hasCustomIcon,
       onlyShowFavoritesInUnreadCount: this.onlyShowFavoritesInUnreadCount,
+      trapLinkClicks: this.trapLinkClicks,
     };
   }
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 3f551eddb..6b1ceb51f 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -410,6 +410,7 @@ export default class ServicesStore extends Store {
       isWakeUpEnabled: DEFAULT_SERVICE_SETTINGS.isWakeUpEnabled,
       isNotificationEnabled: DEFAULT_SERVICE_SETTINGS.isNotificationEnabled,
       isBadgeEnabled: DEFAULT_SERVICE_SETTINGS.isBadgeEnabled,
+      trapLinkClicks: DEFAULT_SERVICE_SETTINGS.trapLinkClicks,
       isMuted: DEFAULT_SERVICE_SETTINGS.isMuted,
       customIcon: DEFAULT_SERVICE_SETTINGS.customIcon,
       isDarkModeEnabled: DEFAULT_SERVICE_SETTINGS.isDarkModeEnabled,
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index eff20c2d3..a14c01b68 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -49,6 +49,7 @@ import {
 } from './spellchecker';
 
 import { DEFAULT_APP_SETTINGS } from '../config';
+import { ifUndefinedString } from '../jsUtils';
 
 const debug = require('../preload-safe-debug')('Ferdium:Plugin');
 
@@ -157,10 +158,7 @@ class RecipeController {
   }
 
   @computed get spellcheckerLanguage() {
-    const selected =
-      this.settings.service.spellcheckerLanguage ||
-      this.settings.app.spellcheckerLanguage;
-    return selected;
+    return ifUndefinedString(this.settings.service.spellcheckerLanguage, this.settings.app.spellcheckerLanguage);
   }
 
   cldIdentifier = null;