From bf50087d725c9c958d2f58bf205a8badf9fd8acf Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 30 Jan 2020 14:24:56 +0200 Subject: [PATCH] Revert "FIX: Create post notices only for public posts (#8708)" This reverts commit c2d051315d0e05d9d60e1ab163c2e941e29fccc2. --- lib/post_creator.rb | 6 +----- spec/components/post_creator_spec.rb | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/post_creator.rb b/lib/post_creator.rb index d96250d9ec6..816132475eb 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -542,12 +542,8 @@ class PostCreator def create_post_notice return if @opts[:import_mode] || @user.anonymous? || @user.bot? || @user.staged - return if @post.topic.archetype != Archetype.default - last_post_time = Post - .joins("JOIN topics ON topics.id = posts.topic_id") - .where(user_id: @user.id) - .where(topics: { archetype: Archetype.default }) + last_post_time = Post.where(user_id: @user.id) .order(created_at: :desc) .limit(1) .pluck(:created_at) diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index d3715bd537c..779c829ed43 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -1359,9 +1359,6 @@ describe PostCreator do fab!(:anonymous) { Fabricate(:anonymous) } it "generates post notices for new users" do - post = PostCreator.create!(user, title: "private message topic", raw: "private message post", archetype: Archetype.private_message, target_usernames: user.username) - expect(post.custom_fields[Post::NOTICE_TYPE]).to eq(nil) - post = PostCreator.create!(user, title: "one of my first topics", raw: "one of my first posts") expect(post.custom_fields[Post::NOTICE_TYPE]).to eq(Post.notices[:new_user]) @@ -1373,9 +1370,6 @@ describe PostCreator do SiteSetting.returning_users_days = 30 old_post = Fabricate(:post, user: user, created_at: 31.days.ago) - post = PostCreator.create!(user, title: "private message topic", raw: "private message post", archetype: Archetype.private_message, target_usernames: user.username) - expect(post.custom_fields[Post::NOTICE_TYPE]).to eq(nil) - post = PostCreator.create!(user, title: "this is a returning topic", raw: "this is a post") expect(post.custom_fields[Post::NOTICE_TYPE]).to eq(Post.notices[:returning_user]) expect(post.custom_fields[Post::NOTICE_ARGS]).to eq(old_post.created_at.iso8601)