From 48be65a14ff5d0b3f3b129cae620cd4f00cd507a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Fri, 15 Dec 2023 14:45:43 +0100
Subject: [PATCH] FIX: Use the correct container (#88)

---
 .../initializers/enable-user-notes.js         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/assets/javascripts/discourse/initializers/enable-user-notes.js b/assets/javascripts/discourse/initializers/enable-user-notes.js
index 4d6a21d..efa14e8 100644
--- a/assets/javascripts/discourse/initializers/enable-user-notes.js
+++ b/assets/javascripts/discourse/initializers/enable-user-notes.js
@@ -8,23 +8,20 @@ const PLUGIN_ID = "discourse-user-notes";
 export default {
   name: "enable-user-notes",
   initialize(container) {
-    const siteSettings = container.lookup("site-settings:main");
-    const currentUser = container.lookup("current-user:main");
+    const siteSettings = container.lookup("service:site-settings");
+    const currentUser = container.lookup("service:current-user");
     const appEvents = container.lookup("service:app-events");
 
-    if (
-      !siteSettings.user_notes_enabled ||
-      !currentUser ||
-      !currentUser.staff
-    ) {
+    if (!siteSettings.user_notes_enabled || !currentUser?.staff) {
       return;
     }
 
     const store = container.lookup("service:store");
+
     withPluginApi("0.8.15", (api) => {
-      function widgetshowUserNotes() {
+      function widgetShowUserNotes() {
         showUserNotes(
-          store,
+          this.store,
           this.attrs.user_id,
           (count) => {
             this.sendWidgetAction("refreshUserNotes", count);
@@ -63,7 +60,7 @@ export default {
         },
       });
 
-      const mobileView = api.container.lookup("site:main").mobileView;
+      const mobileView = api.container.lookup("service:site").mobileView;
       const loc = mobileView ? "before" : "after";
       api.decorateWidget(`poster-name:${loc}`, (dec) => {
         if (dec.widget.settings.hideNotes) {
@@ -121,14 +118,16 @@ export default {
         };
       });
 
-      api.attachWidgetAction("post", "showUserNotes", widgetshowUserNotes);
+      api.attachWidgetAction("post", "showUserNotes", widgetShowUserNotes);
 
       api.createWidget("user-notes-icon", {
+        services: ["site-settings"],
+
         tagName: "span.user-notes-icon",
-        click: widgetshowUserNotes,
+        click: widgetShowUserNotes,
 
         html() {
-          if (siteSettings.enable_emoji) {
+          if (this.siteSettings.enable_emoji) {
             return this.attach("emoji", { name: "pencil" });
           } else {
             return iconNode("sticky-note");