From 91b140904f8c06a3a1543b7219494b40130d954e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 16 Nov 2023 22:45:32 +0000
Subject: [PATCH] FEATURE: Apply category filters when filtered by tag

Also takes the opportunity to convert the service to native class syntax, and lean on the new 'discovery' service for finding the active category/tag in a safe way.
---
 .discourse-compatibility                      |  2 +-
 .../initializers/topic-thumbnails-init.js     | 13 +---
 .../discourse/services/topic-thumbnails.js    | 72 ++++++++-----------
 3 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/.discourse-compatibility b/.discourse-compatibility
index e95ad8c..fe14581 100644
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@@ -1,2 +1,2 @@
+< 3.2.0.beta4-dev: b3c727286bdad3661d6cb2b83e369588e91b458f
 3.1.999: a69770189aa2146d29ee57465ffb1c7d7e84795f
-
diff --git a/javascripts/discourse/initializers/topic-thumbnails-init.js b/javascripts/discourse/initializers/topic-thumbnails-init.js
index 97585c5..74cea92 100644
--- a/javascripts/discourse/initializers/topic-thumbnails-init.js
+++ b/javascripts/discourse/initializers/topic-thumbnails-init.js
@@ -12,20 +12,9 @@ import { htmlSafe } from "@ember/template";
 export default {
   name: "topic-thumbnails-init",
   initialize() {
-    this.applyViewClassWorkaround();
     withPluginApi("0.8.7", (api) => this.initWithApi(api));
   },
 
-  applyViewClassWorkaround() {
-    // Workaround for https://github.com/discourse/discourse/pull/12685
-    // Can be removed once that has been merged, and sites have had time to update
-    const viewClassKey = Object.keys(requirejs.entries).find((k) =>
-      k.endsWith("raw-views/topic-list-thumbnail")
-    );
-    requirejs.entries["discourse/raw-views/topic-list-thumbnail"] =
-      requirejs.entries[viewClassKey];
-  },
-
   initWithApi(api) {
     api.modifyClass("component:topic-list", {
       pluginId: "topic-thumbnails",
@@ -44,7 +33,7 @@ export default {
       isBlogStyleGrid: readOnly("topicThumbnailsService.displayBlogStyle"),
     });
 
-    const siteSettings = api.container.lookup("site-settings:main");
+    const siteSettings = api.container.lookup("service:site-settings");
 
     if (settings.docs_thumbnail_mode !== "none" && siteSettings.docs_enabled) {
       api.modifyClass("component:docs-topic-list", {
diff --git a/javascripts/discourse/services/topic-thumbnails.js b/javascripts/discourse/services/topic-thumbnails.js
index 655597f..1fd9b28 100644
--- a/javascripts/discourse/services/topic-thumbnails.js
+++ b/javascripts/discourse/services/topic-thumbnails.js
@@ -1,6 +1,7 @@
 import Service, { inject as service } from "@ember/service";
 import discourseComputed from "discourse-common/utils/decorators";
 import Site from "discourse/models/site";
+import { dependentKeyCompat } from "@ember/object/compat";
 
 const minimalGridCategories = settings.minimal_grid_categories
   .split("|")
@@ -28,49 +29,34 @@ const gridTags = settings.grid_tags.split("|");
 const masonryTags = settings.masonry_tags.split("|");
 const blogStyleTags = settings.blog_style_tags.split("|");
 
-export default Service.extend({
-  router: service("router"),
+export default class TopicThumbnailService extends Service {
+  @service router;
+  @service discovery;
 
-  @discourseComputed("router.currentRouteName")
-  isTopicListRoute(currentRouteName) {
-    return (
-      currentRouteName.match(/^discovery\./) ||
-      currentRouteName.match(/^tags?\.show/)
-    );
-  },
+  @dependentKeyCompat
+  get isTopicListRoute() {
+    return this.discovery.onDiscoveryRoute;
+  }
 
   @discourseComputed("router.currentRouteName")
   isTopicRoute(currentRouteName) {
     return currentRouteName.match(/^topic\./);
-  },
+  }
 
   @discourseComputed("router.currentRouteName")
   isDocsRoute(currentRouteName) {
     return currentRouteName.match(/^docs\./);
-  },
+  }
 
-  @discourseComputed(
-    "router.currentRouteName",
-    "router.currentRoute.attributes.category.id"
-  )
-  viewingCategoryId(currentRouteName, categoryId) {
-    if (!currentRouteName.match(/^discovery\./)) {
-      return;
-    }
-    return categoryId;
-  },
+  @dependentKeyCompat
+  get viewingCategoryId() {
+    return this.discovery.category?.id;
+  }
 
-  @discourseComputed(
-    "router.currentRouteName",
-    "router.currentRoute.attributes.id", // For discourse instances earlier than https://github.com/discourse/discourse/commit/f7b5ff39cf
-    "router.currentRoute.attributes.tag.id"
-  )
-  viewingTagId(currentRouteName, legacyTagId, tagId) {
-    if (!currentRouteName.match(/^tags?\.show/)) {
-      return;
-    }
-    return tagId || legacyTagId;
-  },
+  @dependentKeyCompat
+  get viewingTagId() {
+    return this.discovery.tag?.id;
+  }
 
   @discourseComputed(
     "viewingCategoryId",
@@ -120,50 +106,50 @@ export default Service.extend({
     } else {
       return "none";
     }
-  },
+  }
 
   @discourseComputed("displayMode")
   enabledForRoute(displayMode) {
     return displayMode !== "none";
-  },
+  }
 
   @discourseComputed()
   enabledForDevice() {
     return Site.current().mobileView ? settings.mobile_thumbnails : true;
-  },
+  }
 
   @discourseComputed("enabledForRoute", "enabledForDevice")
   shouldDisplay(enabledForRoute, enabledForDevice) {
     return enabledForRoute && enabledForDevice;
-  },
+  }
 
   @discourseComputed("shouldDisplay", "displayMode")
   displayMinimalGrid(shouldDisplay, displayMode) {
     return shouldDisplay && displayMode === "minimal-grid";
-  },
+  }
 
   @discourseComputed("shouldDisplay", "displayMode")
   displayList(shouldDisplay, displayMode) {
     return shouldDisplay && displayMode === "list";
-  },
+  }
 
   @discourseComputed("shouldDisplay", "displayMode")
   displayGrid(shouldDisplay, displayMode) {
     return shouldDisplay && displayMode === "grid";
-  },
+  }
 
   @discourseComputed("shouldDisplay", "displayMode")
   displayMasonry(shouldDisplay, displayMode) {
     return shouldDisplay && displayMode === "masonry";
-  },
+  }
 
   @discourseComputed("shouldDisplay", "displayMode")
   displayBlogStyle(shouldDisplay, displayMode) {
     return shouldDisplay && displayMode === "blog-style";
-  },
+  }
 
   @discourseComputed("displayMinimalGrid", "displayBlogStyle")
   showLikes(isMinimalGrid) {
     return isMinimalGrid;
-  },
-});
+  }
+}