github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-27 03:45:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: properly render emojis in local oneboxes

Browse Source
This commit is contained in:
Régis Hanol 2018-02-26 11:16:53 +01:00
parent c1f53e1ece
commit 7d7f6faf40
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/oneboxer.rb
View File

@ -206,7 +206,7 @@ module Oneboxer
original_url: url,
title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)),
category_html: CategoryBadge.html_for(topic.category),
quote: post.excerpt(SiteSetting.post_onebox_maxlength),
quote: PrettyText.unescape_emoji(post.excerpt(SiteSetting.post_onebox_maxlength)),
}
template = File.read("#{Rails.root}/lib/onebox/templates/discourse_topic_onebox.hbs")

6
spec/components/oneboxer_spec.rb
View File

@ -35,7 +35,7 @@ describe Oneboxer do
replier = Fabricate(:user)
public_post = Fabricate(:post)
public_post = Fabricate(:post, raw: "This post has an emoji :+1:")
public_topic = public_post.topic
public_reply = Fabricate(:post, topic: public_topic, post_number: 2, user: replier)
public_hidden = Fabricate(:post, topic: public_topic, post_number: 3, hidden: true)
@ -48,7 +48,9 @@ describe Oneboxer do
secured_reply = Fabricate(:post, user: staff, topic: secured_topic, post_number: 2)
expect(preview(public_topic.relative_url, user, public_category)).to include(public_topic.title)
expect(preview(public_post.url, user, public_category)).to include(public_topic.title)
onebox = preview(public_post.url, user, public_category)
expect(onebox).to include(public_topic.title)
expect(onebox).to include("/images/emoji/")
onebox = preview(public_reply.url, user, public_category)
expect(onebox).to include(public_reply.excerpt)