Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 08:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip inline onebox for domain only

Browse Source
This commit is contained in:
Sam 2017-08-02 17:27:41 -04:00
parent 65d5cd7239
commit 5942ad83c0
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
View File

@ -4,6 +4,12 @@ import { cachedInlineOnebox } from 'pretty-text/inline-oneboxer';
const ONEBOX = 1; const ONEBOX = 1;
const INLINE = 2; const INLINE = 2;
function isTopLevel(href) {
let split = href.split(/https?:\/\/[^\/]+[\/?]/i);
let hasExtra = split && split[1] && split[1].length > 0;
return !hasExtra;
}
function applyOnebox(state, silent) { function applyOnebox(state, silent) {
if (silent || !state.tokens) { if (silent || !state.tokens) {
return; return;
@ -87,17 +93,20 @@ function applyOnebox(state, silent) {
attrs.push(["target", "_blank"]); attrs.push(["target", "_blank"]);
} }
} else if (mode === INLINE) { } else if (mode === INLINE) {
let onebox = cachedInlineOnebox(href);
let options = state.md.options.discourse; if (!isTopLevel(href)) {
if (options.lookupInlineOnebox) { let onebox = cachedInlineOnebox(href);
onebox = options.lookupInlineOnebox(href);
}
if (onebox) { let options = state.md.options.discourse;
text.content = onebox.title; if (options.lookupInlineOnebox) {
} else if (state.md.options.discourse.previewing) { onebox = options.lookupInlineOnebox(href);
attrs.push(["class", "inline-onebox-loading"]); }
if (onebox) {
text.content = onebox.title;
} else if (state.md.options.discourse.previewing) {
attrs.push(["class", "inline-onebox-loading"]);
}
} }
} }

38
spec/components/pretty_text_spec.rb
View File

@ -840,15 +840,43 @@ HTML
it 'handles mini onebox' do it 'handles mini onebox' do
SiteSetting.enable_inline_onebox_on_all_domains = true SiteSetting.enable_inline_onebox_on_all_domains = true
InlineOneboxer.purge("http://cnn.com") InlineOneboxer.purge("http://cnn.com/a")
stub_request(:head, "http://cnn.com").to_return(status: 200) stub_request(:head, "http://cnn.com/a").to_return(status: 200)
stub_request(:get, "http://cnn.com"). stub_request(:get, "http://cnn.com/a").
to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {}) to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
expect(PrettyText.cook("- http://cnn.com\n- a http://cnn.com").split("news").length).to eq(3) expect(PrettyText.cook("- http://cnn.com/a\n- a http://cnn.com/a").split("news").length).to eq(3)
expect(PrettyText.cook("- http://cnn.com\n - a http://cnn.com").split("news").length).to eq(3) expect(PrettyText.cook("- http://cnn.com/a\n - a http://cnn.com/a").split("news").length).to eq(3)
end
it 'handles mini onebox with query param' do
SiteSetting.enable_inline_onebox_on_all_domains = true
InlineOneboxer.purge("http://cnn.com?a")
stub_request(:head, "http://cnn.com?a").to_return(status: 200)
stub_request(:get, "http://cnn.com?a").
to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
expect(PrettyText.cook("- http://cnn.com?a\n- a http://cnn.com?a").split("news").length).to eq(3)
expect(PrettyText.cook("- http://cnn.com?a\n - a http://cnn.com?a").split("news").length).to eq(3)
end
it 'skips mini onebox for primary domain' do
# we only include mini onebox if there is something in path or query params
SiteSetting.enable_inline_onebox_on_all_domains = true
InlineOneboxer.purge("http://cnn.com/")
stub_request(:head, "http://cnn.com/").to_return(status: 200)
stub_request(:get, "http://cnn.com/").
to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
expect(PrettyText.cook("- http://cnn.com/\n- a http://cnn.com/").split("news").length).to eq(1)
expect(PrettyText.cook("- cnn.com\n - a http://cnn.com/").split("news").length).to eq(1)
end end
it "can handle bbcode" do it "can handle bbcode" do