FIX: url escaping on rich editor when autolink/linkify

renato · renato · commit a3dc3563e2e5 · 2025-08-08T00:19:29.000-03:00
diff --git a/app/assets/javascripts/discourse/app/static/prosemirror/extensions/link.js b/app/assets/javascripts/discourse/app/static/prosemirror/extensions/link.js
@@ -76,16 +76,20 @@ const extension = {
         state.linkMarkup = mark.attrs.markup;
 
         if (state.linkMarkup === "autolink") {
+          state.inAutolink = true;
           return "<";
         }
 
         if (state.linkMarkup === "linkify") {
+          state.inAutolink = true;
           return "";
         }
 
         return "[";
       },
       close(state, mark) {
+        state.inAutolink = false;
+
         const { linkMarkup } = state;
         state.linkMarkup = undefined;
 
diff --git a/app/assets/javascripts/discourse/tests/integration/components/prosemirror-editor/link-test.js b/app/assets/javascripts/discourse/tests/integration/components/prosemirror-editor/link-test.js
@@ -23,6 +23,11 @@ module(
         '<p><a href="https://example.com" data-markup="autolink">https://example.com</a></p>',
         "<https://example.com>",
       ],
+      "auto links with ~": [
+        "<https://example.com/~user> https://example.com/~user",
+        '<p><a href="https://example.com/~user" data-markup="autolink">https://example.com/~user</a> <a href="https://example.com/~user" data-markup="linkify">https://example.com/~user</a></p>',
+        "<https://example.com/~user> https://example.com/~user",
+      ],
       "attachment link": [
         "[File|attachment](https://example.com/file.pdf)",
         '<p><a href="https://example.com/file.pdf" class="attachment">File</a></p>',
