From fdf38335ab69957bd4ab37810ee8c940383be169 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 8 May 2023 10:48:56 +0200
Subject: [PATCH] DEV: Correct the app-events service injections (#21413)

---
 app/assets/javascripts/discourse/app/models/rest.js           | 2 +-
 .../javascripts/discourse/tests/helpers/qunit-helpers.js      | 2 +-
 .../assets/javascripts/discourse/initializers/chat-setup.js   | 2 +-
 .../test/javascripts/components/chat-composer-uploads-test.js | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js
index 8e9cd09f9b4..3c5e3060071 100644
--- a/app/assets/javascripts/discourse/app/models/rest.js
+++ b/app/assets/javascripts/discourse/app/models/rest.js
@@ -113,7 +113,7 @@ RestModel.reopenClass({
       args.siteSettings = owner.lookup("service:site-settings");
     }
     if (!args.appEvents) {
-      args.appEvents = owner.lookup("service:appEvents");
+      args.appEvents = owner.lookup("service:app-events");
     }
 
     args.__munge = this.munge;
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 3f3bd8b358f..e523090c521 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -326,7 +326,7 @@ export function acceptance(name, optionsOrCallback) {
           updateCurrentUser(userChanges);
         }
 
-        User.current().appEvents = getOwner(this).lookup("service:appEvents");
+        User.current().appEvents = getOwner(this).lookup("service:app-events");
         User.current().trackStatus();
       }
 
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
index 1f335138743..4c81da24112 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js
@@ -19,7 +19,7 @@ export default {
   initialize(container) {
     this.chatService = container.lookup("service:chat");
     this.siteSettings = container.lookup("service:site-settings");
-    this.appEvents = container.lookup("service:appEvents");
+    this.appEvents = container.lookup("service:app-events");
     this.appEvents.on("discourse:focus-changed", this, "_handleFocusChanged");
 
     if (!this.chatService.userCanChat) {
diff --git a/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js b/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
index 6d119715028..ecfc95fb1f3 100644
--- a/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
+++ b/plugins/chat/test/javascripts/components/chat-composer-uploads-test.js
@@ -66,7 +66,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
     `);
 
     const done = assert.async();
-    this.appEvents = this.container.lookup("service:appEvents");
+    this.appEvents = this.container.lookup("service:app-events");
     this.appEvents.on(
       "upload-mixin:chat-composer-uploader:upload-success",
       (fileName, upload) => {
@@ -116,7 +116,7 @@ module("Discourse Chat | Component | chat-composer-uploads", function (hooks) {
 
     const image = createFile("avatar.png");
     const done = assert.async();
-    this.appEvents = this.container.lookup("service:appEvents");
+    this.appEvents = this.container.lookup("service:app-events");
 
     this.appEvents.on(
       `upload-mixin:chat-composer-uploader:upload-cancelled`,