A platform for community discussion. Free, open, simple.
FIX: Honor `silent=true` on internal links with other query params (#41365)
Régis Hanol38b482b4c5db
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rbindex 3093d291e91..228ccf0fe85 100644--- a/app/models/topic_link.rb+++ b/app/models/topic_link.rb@@ -339,7 +339,7 @@ class TopicLink < ActiveRecord::Baseelsif route = Discourse.route_for(parsed.to_s[...TopicLink.max_url_length])# this is a special case for the silent flag# in internal links- return nil if url && (url.split("?")[1] == "silent=true")+ return nil if parsed&.query&.split("&")&.include?("silent=true")internal = truediff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rbindex df8b8b8be6e..2d1558f8378 100644--- a/spec/models/topic_link_spec.rb+++ b/spec/models/topic_link_spec.rb@@ -81,6 +81,19 @@ RSpec.describe TopicLink doexpect(post.topic.topic_links.count).to eq(0)end+ it "can exclude links with silent=true combined with other query params" do+ url = topic.url++ ["#{url}?u=someuser&silent=true", "#{url}?silent=true&u=someuser"].each do |link_url|+ post = Fabricate(:post, user:, raw: "[silent link](#{link_url})")++ TopicLink.extract_from(post)++ expect(topic.topic_links.count).to eq(0)+ expect(post.topic.topic_links.count).to eq(0)+ end+ end+it "extracts onebox" doother_topic = Fabricate(:topic, user: user)Fabricate(:post, topic: other_topic, user: user, raw: "some content for the first post")