discourse · megothss · Jun 10, 2025 · Jun 6, 2025 · Jun 9, 2025 · Jun 10, 2025
diff --git a/app/assets/javascripts/discourse/app/components/post/cooked-html.gjs b/app/assets/javascripts/discourse/app/components/post/cooked-html.gjs
@@ -6,6 +6,7 @@ import { htmlSafe } from "@ember/template";
 import curryComponent from "ember-curry-component";
 import DecoratedHtml from "discourse/components/decorated-html";
 import { bind } from "discourse/lib/decorators";
+import { isRailsTesting, isTesting } from "discourse/lib/environment";
 import { makeArray } from "discourse/lib/helpers";
 import decorateLinkCounts from "discourse/lib/post-cooked-html-decorators/link-counts";
 import decorateMentions from "discourse/lib/post-cooked-html-decorators/mentions";
@@ -47,48 +48,62 @@ export default class PostCookedHtml extends Component {
 
     [...POST_COOKED_DECORATORS, ...this.extraDecorators].forEach(
       (decorator) => {
-        if (!this.#decoratorState.has(decorator)) {
-          this.#decoratorState.set(decorator, {});
-        }
-
-        const owner = getOwner(this);
-        const decorationCleanup = decorator(element, {
-          data: {
-            post: this.args.post,
-            cooked: this.cooked,
-            highlightTerm: this.highlightTerm,
-            isIgnored: this.isIgnored,
-            ignoredUsers: this.ignoredUsers,
-          },
-          createDetachedElement: this.#createDetachedElement,
-          currentUser: this.currentUser,
-          helper,
-          renderNestedPostCookedHtml: (
-            nestedElement,
-            nestedPost,
-            extraDecorators
-          ) => {
-            const nestedArguments = {
-              post: nestedPost,
-              streamElement: false,
+        try {
+          if (!this.#decoratorState.has(decorator)) {
+            this.#decoratorState.set(decorator, {});
+          }
+
+          const owner = getOwner(this);
+          const decorationCleanup = decorator(element, {
+            data: {
+              post: this.args.post,
+              cooked: this.cooked,
               highlightTerm: this.highlightTerm,
-              extraDecorators: [
-                ...this.extraDecorators,
-                ...makeArray(extraDecorators),
-              ],
-            };
-
-            helper.renderGlimmer(
+              isIgnored: this.isIgnored,
+              ignoredUsers: this.ignoredUsers,
+            },
+            createDetachedElement: this.#createDetachedElement,
+            currentUser: this.currentUser,
+            helper,
+            renderNestedPostCookedHtml: (
               nestedElement,
-              curryComponent(PostCookedHtml, nestedArguments, owner)
-            );
-          },
-          owner,
-          state: this.#decoratorState.get(decorator),
-        });
-
-        if (typeof decorationCleanup === "function") {
-          this.#pendingDecoratorCleanup.push(decorationCleanup);
+              nestedPost,
+              extraDecorators,
+              extraArguments
+            ) => {
+              const nestedArguments = {
+                ...extraArguments,
+                post: nestedPost,
+                streamElement: false,
+                highlightTerm: this.highlightTerm,
+                extraDecorators: [
+                  ...this.extraDecorators,
+                  ...makeArray(extraDecorators),
+                ],
+              };
+
+              helper.renderGlimmer(
+                nestedElement,
+                curryComponent(PostCookedHtml, nestedArguments, owner)
+              );
+            },
+            owner,
+            state: this.#decoratorState.get(decorator),
+          });
+
+          if (typeof decorationCleanup === "function") {
+            this.#pendingDecoratorCleanup.push(decorationCleanup);
+          }
+        } catch (e) {
+          if (isRailsTesting() || isTesting()) {
+            throw e;
+          } else {
+            // in case one of the decorators throws an error we want to surface it to the console but prevent
+            // the application from crashing
+
+            // eslint-disable-next-line no-console
+            console.error(e);
+          }
         }
       }
     );

diff --git a/app/assets/javascripts/discourse/app/lib/post-cooked-html-decorators/quote-controls.js b/app/assets/javascripts/discourse/app/lib/post-cooked-html-decorators/quote-controls.js
@@ -1,5 +1,6 @@
 import { spinnerHTML } from "discourse/helpers/loading-spinner";
 import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
 import escape from "discourse/lib/escape";
 import highlightHTML from "discourse/lib/highlight-html";
 import { iconHTML } from "discourse/lib/icon-library";
@@ -72,7 +73,8 @@ function _updateQuoteElements(aside, desc, context) {
   if (
     topicNumber &&
     postNumber &&
-    topicNumber === data.post.topic_id?.toString()
+    topicNumber === data.post.topic_id?.toString() &&
+    data.post.topic
   ) {
     const topicId = data.post.topic_id;
     const slug = data.post.topic.slug;
@@ -117,8 +119,13 @@ function _updateQuoteElements(aside, desc, context) {
 }
 
 async function _toggleQuote(aside, context) {
-  const { createDetachedElement, data, renderNestedPostCookedHtml, state } =
-    context;
+  const {
+    createDetachedElement,
+    data,
+    renderNestedPostCookedHtml,
+    state,
+    owner,
+  } = context;
 
   if (state.expanding) {
     return;
@@ -155,12 +162,21 @@ async function _toggleQuote(aside, context) {
     const postId = parseInt(aside.dataset.post, 10);
 
     try {
-      const quotedPost = await ajax(`/posts/by_number/${topicId}/${postId}`);
-
       const post = data.post;
+      const quotedPost = owner
+        .lookup("service:store")
+        .createRecord(
+          "post",
+          await ajax(`/posts/by_number/${topicId}/${postId}`)
+        );
+
+      if (quotedPost.topic_id === post?.topic_id) {
+        quotedPost.topic = post.topic;
+      }
+
       const quotedPosts = post.quoted || {};
       quotedPosts[quotedPost.id] = quotedPost;
-      post.set("quoted", quotedPosts);
+      post.quoted = quotedPosts;
 
       const div = createDetachedElement("div");
       div.classList.add("expanded-quote");
@@ -177,9 +193,11 @@ async function _toggleQuote(aside, context) {
       blockQuote.innerHTML = "";
       blockQuote.appendChild(div);
     } catch (e) {
-      if ([403, 404].includes(e.jqXHR.status)) {
+      if (e.jqXHR && [403, 404].includes(e.jqXHR.status)) {
         const icon = iconHTML(e.jqXHR.status === 403 ? "lock" : "trash-can");
         blockQuote.innerHTML = `<div class='expanded-quote icon-only'>${icon}</div>`;
+      } else {
+        popupAjaxError(e);
       }
     }
   } else {

diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
@@ -192,12 +192,15 @@ export default class Post extends RestModel {
   @trackedPostProperty post_number;
   @trackedPostProperty post_type;
   @trackedPostProperty primary_group_name;
+  @trackedPostProperty quoted;
   @trackedPostProperty read;
   @trackedPostProperty reply_count;
   @trackedPostProperty reply_to_user;
   @trackedPostProperty staff;
   @trackedPostProperty staged;
   @trackedPostProperty title_is_group;
+  @trackedPostProperty topic_id;
+  @trackedPostProperty topic;
   @trackedPostProperty trust_level;
   @trackedPostProperty updated_at;
   @trackedPostProperty user;

diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -666,6 +666,12 @@ import { i18n } from "discourse-i18n";
             topicFixtures["/t/280/1.json"].post_stream.posts[2]
           )
         );
+        server.get("/posts/by_number/280/5", () =>
+          helper.response(
+            200,
+            topicFixtures["/t/280/1.json"].post_stream.posts[4]
+          )
+        );
       });
 
       test("The quoted content is toggled correclty", async function (assert) {
@@ -711,6 +717,98 @@ import { i18n } from "discourse-i18n";
           )
           .hasAttribute("aria-expanded", "false");
       });
+
+      // TODO (glimmer-post-stream): this test only works with the Glimmer Post Stream.
+      //  When the removing the legacy code we should remove the `if` and run it unconditionally.
+      if (postStreamMode === "enabled") {
+        test("Nesting quoted content works", async function (assert) {
+          await visit("/t/internationalization-localization/280");
+
+          // outer quote
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "false");
+
+          assert
+            .dom("#post_7 .quote[data-topic='280'][data-post='5']")
+            .includesText("The problem I see here")
+            .doesNotIncludeText("So you could replace that lookup table");
+
+          await click(
+            "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+          );
+
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] > .title .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "true");
+          assert
+            .dom("#post_7 .quote[data-topic='280'][data-post='5']")
+            .includesText("The problem I see here")
+            .includesText("So you could replace that lookup table");
+
+          // nested quote
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "false");
+          assert
+            .dom(
+              "#post_7 .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3']"
+            )
+            .includesText(
+              'So you could replace that lookup table with the "de" one to get German.'
+            )
+            .doesNotIncludeText(
+              "Yep, all strings are going through a lookup table.*"
+            );
+
+          await click(
+            "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+          );
+
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "true");
+          assert
+            .dom(
+              "#post_7 .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3']"
+            )
+            .includesText(
+              'So you could replace that lookup table with the "de" one to get German.'
+            )
+            .includesText(
+              "Yep, all strings are going through a lookup table.*"
+            );
+
+          await click(
+            "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+          );
+
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote[data-topic='280'][data-post='3'] .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "false");
+
+          // outer quote
+          await click(
+            "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote-controls .quote-toggle"
+          );
+
+          assert
+            .dom(
+              "#post_7 .cooked .quote[data-topic='280'][data-post='5'] .quote-controls .quote-toggle"
+            )
+            .hasAttribute("aria-expanded", "false");
+        });
+      }
     }
   );
 

diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -874,7 +874,7 @@ export default {
           uploaded_avatar_id: 5253,
           created_at: "2013-02-07T14:08:17.493Z",
           cooked:
-            '<p>Looks interesting, I\'ll take a peek.</p>\n\n<p>As said on dev, the best tool I can see in terms of giving translators a proper interface <em>and</em> quality control would be something like <a href="http://translate.wordpress.org/projects/bbpress/dev" rel="nofollow">GlotPress</a>. It\'s based on the PO messages format (is that somehow related to ICU?) but looks pretty great.</p>\n\n<p><aside class="quote" data-post="6" data-topic="280"><div class="title">\n<div class="quote-controls"></div>\n<img width="20" height="20" src="/user_avatar/meta.discourse.org/sam/40/5243.png" class="avatar">sam said:</div>\n<blockquote><p>fuzzy matching for localization</p></blockquote></aside></p>\n\n<p>I\'m not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like <code>message_error_nametooshort</code> ?)</p>',
+            '<aside class="quote" data-post="5" data-topic="280"><div class="title">\n<div class="quote-controls"></div>\n<img width="20" height="20" src="/user_avatar/meta.discourse.org/sam/40/5243.png" class="avatar">pekka said:</div>\n<blockquote><p>The problem I see here</p></blockquote></aside><p>Looks interesting, I\'ll take a peek.</p>\n\n<p>As said on dev, the best tool I can see in terms of giving translators a proper interface <em>and</em> quality control would be something like <a href="http://translate.wordpress.org/projects/bbpress/dev" rel="nofollow">GlotPress</a>. It\'s based on the PO messages format (is that somehow related to ICU?) but looks pretty great.</p>\n\n<p><aside class="quote" data-post="6" data-topic="280"><div class="title">\n<div class="quote-controls"></div>\n<img width="20" height="20" src="/user_avatar/meta.discourse.org/sam/40/5243.png" class="avatar">sam said:</div>\n<blockquote><p>fuzzy matching for localization</p></blockquote></aside></p>\n\n<p>I\'m not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like <code>message_error_nametooshort</code> ?)</p>',
           post_number: 7,
           post_type: 1,
           updated_at: "2013-02-07T14:12:02.965Z",