localize create tag filter context menus; create constant for tag URL…

… REGEX; better implementation of dynamic context menu functionality
rthaut · Sep 18, 2021 · a47774a · a47774a
1 parent 2b2e7d0
commit a47774a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -345,5 +345,16 @@
   },
   "CreateFiltersFromDeviation_Error_Instructions_HasError": {
     "message": "Please refresh the page and try again. If the problem persists, please report it with the following information:"
+  },
+  "CreateKeywordFilterFromTag_ContextMenuLabel": {
+    "message": "Create Keyword Filter for this Tag"
+  },
+  "CreateKeywordFilterForTag_ContextMenuLabel": {
+    "message": "Create Keyword Filter for \"$TAG$\"",
+    "placeholders": {
+      "tag": {
+        "content": "$1"
+      }
+    }
   }
-}
+}
diff --git a/app/scripts/background/menus.js b/app/scripts/background/menus.js
@@ -1,10 +1,13 @@
 import { AddFilter } from "./filters";
 import { SHOW_FILTER_DEVIATION_MODAL } from "../constants/messages";
+import { TAG_URL_REGEX } from "../constants/url";
 
 export const MENUS = [
   {
     id: "filter-tag",
-    title: "Create Keyword Filter for this Tag",
+    title: browser.i18n.getMessage(
+      "CreateKeywordFilterFromTag_ContextMenuLabel"
+    ),
     contexts: ["link"],
     targetUrlPatterns: ["*://*.deviantart.com/tag/*"],
   },
@@ -14,7 +17,10 @@ export const MENUS = [
       "CreateFiltersFromDeviation_ContextMenuLabel"
     ),
     contexts: ["link"],
-    targetUrlPatterns: ["*://*.deviantart.com/*/art/*"],
+    targetUrlPatterns: [
+      "*://*.deviantart.com/*/art/*",
+      "*://*.deviantart.com/*/journal/*",
+    ],
   },
 ];
 
@@ -30,11 +36,12 @@ export const InitMenus = async () => {
     console.error("Failed to setup context menus", ex);
   }
 
-  try {
-    browser.contextMenus.onShown.addListener(OnMenuShown);
-  } catch (ex) {
-    // chrome doesn't support the onShown event, but we don't use it for major functionality, so just ignore it
-    void ex;
+  if (typeof browser.contextMenus.onShown !== "undefined") {
+    try {
+      browser.contextMenus.onShown.addListener(OnMenuShown);
+    } catch (ex) {
+      void ex;
+    }
   }
 };
 
@@ -46,9 +53,9 @@ export const InitMenus = async () => {
 export const OnMenuClicked = (info, tab) => {
   switch (info.menuItemId) {
     case "filter-tag":
-      if (/\/tag\/([^\/]+)/i.test(info.linkUrl)) {
+      if (TAG_URL_REGEX.test(info.linkUrl)) {
         // eslint-disable-next-line no-case-declarations
-        const keyword = /\/tag\/([^\/]+)/i.exec(info.linkUrl)[1];
+        const keyword = TAG_URL_REGEX.exec(info.linkUrl)[1];
         AddFilter("keywords", { keyword, wildcard: false });
       }
       break;
@@ -74,11 +81,14 @@ export const OnMenuClicked = (info, tab) => {
  */
 // TODO: match linkUrl RegExps used here to items in MENUS array? or derive the RegExp from the targetUrlPatterns?
 export const OnMenuShown = (info, tab) => {
-  if (/\/tag\/([^\/]+)/i.test(info.linkUrl)) {
+  if (TAG_URL_REGEX.test(info.linkUrl)) {
     // filter-tag menu
-    const keyword = /\/tag\/([^\/]+)/i.exec(info.linkUrl)[1];
+    const keyword = TAG_URL_REGEX.exec(info.linkUrl)[1];
     UpdateMenuItem("filter-tag", {
-      title: `Create Keyword Filter for "${keyword}"`,
+      title: browser.i18n.getMessage(
+        "CreateKeywordFilterForTag_ContextMenuLabel",
+        keyword
+      ),
     });
   }
 };

diff --git a/app/scripts/constants/url.js b/app/scripts/constants/url.js
@@ -24,8 +24,11 @@ export const PAGES = {
   },
 };
 
+export const TAG_URL_REGEX = /\/tag\/([^\/]+)/i;
+
 export default {
   WILDCARD,
   REGEX,
   PAGES,
+  TAG_URL_REGEX,
 };