IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Display emojis in user stream.

Browse Source
This commit is contained in:
Guo Xiang Tan
2015-07-23 23:02:03 +08:00
parent 410ae47dd7
commit 7c1e16da54
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/user_action_serializer.rb
View File

@@ -32,7 +32,7 @@ class UserActionSerializer < ApplicationSerializer
def excerpt
cooked = object.cooked || PrettyText.cook(object.raw)
PrettyText.excerpt(cooked, 300) if cooked
PrettyText.excerpt(cooked, 300, { keep_emojis: true }) if cooked
end
def avatar_template

2
app/serializers/user_serializer.rb
View File

@@ -196,7 +196,7 @@ class UserSerializer < BasicUserSerializer
end
def bio_excerpt
object.user_profile.bio_excerpt(350 ,keep_newlines: true)
object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emojis: true })
end
def include_suspend_reason?