codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Don't count emojis within quotes

Browse source
This commit is contained in:
Robin Ward 2016-04-06 12:02:18 -04:00
parent 56c870cca2
commit 189d70661e
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/cooked_post_processor.rb
View file

@ -32,12 +32,16 @@ class CookedPostProcessor
end end
end end
def has_emoji?
(@doc.css("img.emoji") - @doc.css(".quote img")).size > 0
end
def create_firsts def create_firsts
return unless Guardian.new.can_see?(@post) return unless Guardian.new.can_see?(@post)
created = false created = false
if @doc.css("img.emoji").size > 0 if has_emoji?
created |= UserFirst.create_for(@post.user_id, :used_emoji, @post.id) created |= UserFirst.create_for(@post.user_id, :used_emoji, @post.id)
end end

32
spec/models/user_firsts_spec.rb
View file

@ -11,12 +11,24 @@ describe UserFirst do
end end
end end
it "creates one the first time a user posts an emoji" do context "emoji" do
post = PostCreator.create(user, title: "this topic is about candy", raw: "time to eat some sweet :candy: mmmm") it "logs a user first" do
post = PostCreator.create(user, title: "this topic is about candy", raw: "time to eat some sweet :candy: mmmm")
uf = UserFirst.where(user_id: user.id, first_type: UserFirst.types[:used_emoji]).first
expect(uf).to be_present
expect(uf.post_id).to eq(post.id)
end
it "doesn't log a user first when in a quote" do
PostCreator.create(user,
title: "this topic is about candy",
raw: "time to eat some sweet [quote]:candy:[/quote] mmmm")
uf = UserFirst.where(user_id: user.id, first_type: UserFirst.types[:used_emoji]).first
expect(uf).to be_blank
end
uf = UserFirst.where(user_id: user.id, first_type: UserFirst.types[:used_emoji]).first
expect(uf).to be_present
expect(uf.post_id).to eq(post.id)
end end
context 'mentioning' do context 'mentioning' do
@ -34,11 +46,11 @@ describe UserFirst do
let(:codinghorror) { Fabricate(:codinghorror) } let(:codinghorror) { Fabricate(:codinghorror) }
it "doesn't create the userfirst on private posts" do it "doesn't create the userfirst on private posts" do
post = PostCreator.create(user, PostCreator.create(user,
archetype: Archetype.private_message, archetype: Archetype.private_message,
target_usernames: ['codinghorror'], target_usernames: ['codinghorror'],
title: "this topic is about candy", title: "this topic is about candy",
raw: "time to eat some sweet :candy: mmmm") raw: "time to eat some sweet :candy: mmmm")
uf = UserFirst.where(user_id: user.id, first_type: UserFirst.types[:used_emoji]).first uf = UserFirst.where(user_id: user.id, first_type: UserFirst.types[:used_emoji]).first
expect(uf).to be_blank expect(uf).to be_blank