2 files changed, 36 insertions, 5 deletions

diff --git a/recipes/instagram/package.json b/recipes/instagram/package.json
index 5c798f3..9bdc70b 100644
--- a/recipes/instagram/package.json
+++ b/recipes/instagram/package.json
@@ -1,7 +1,7 @@
 {
   "id": "instagram",
   "name": "Instagram",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "MIT",
   "config": {
     "serviceURL": "https://instagram.com/direct/inbox",
diff --git a/recipes/instagram/webview.js b/recipes/instagram/webview.js
index a4a5a8a..1b35c37 100644
--- a/recipes/instagram/webview.js
+++ b/recipes/instagram/webview.js
@@ -4,12 +4,43 @@ function _interopRequireDefault(obj) {
 
 const _path = _interopRequireDefault(require('path'));
 
-module.exports = Ferdium => {
+module.exports = (Ferdium, settings) => {
+  // adapted from the franz-custom-website recipe, for opening
+  // links according to  the user's preference (Ferdium/ext.browser)
+  document.addEventListener(
+    'click',
+    event => {
+      const link = event.target.closest('a');
+      const button = event.target.closest('button');
+
+      if (link || button) {
+        const url = link
+          ? link.getAttribute('href')
+          : button.getAttribute('title');
+
+        // check if we have a valid URL that is not a script nor an image:
+        if (url && url !== '#' && !Ferdium.isImage(link)) {
+          event.preventDefault();
+          event.stopPropagation();
+
+          if (settings.trapLinkClicks === true) {
+            window.location.href = url;
+          } else {
+            Ferdium.openNewWindow(url);
+          }
+        }
+      }
+    },
+    true,
+  );
+
   const getMessages = () => {
     const element = document.querySelector('a[href^="/direct/inbox"]');
-    Ferdium.setBadge(
-      element.textContent ? Ferdium.safeParseInt(element.textContent) : 0,
-    );
+    if (element) {
+      Ferdium.setBadge(
+        element.textContent ? Ferdium.safeParseInt(element.textContent) : 0,
+      );
+    }
   };
 
   Ferdium.loop(getMessages);