IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:26:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Should be able to recover a user deleted post if raw didn't change

Browse Source
This commit is contained in:
Robin Ward 2019-04-10 13:10:21 -04:00
parent fe9c271d44
commit abf4ca9774
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/post_destroyer.rb
View File

@ -188,7 +188,9 @@ class PostDestroyer
# has internal transactions, if we nest then there are some very high risk deadlocks
last_revision = @post.revisions.last
@post.revise(@user, { raw: last_revision.modifications["raw"][0] }, force_new_version: true) if last_revision.present?
if last_revision.present? && last_revision.modifications['raw'].present?
@post.revise(@user, { raw: last_revision.modifications["raw"][0] }, force_new_version: true)
end
end
private

10
spec/components/post_destroyer_spec.rb
View File

@ -189,6 +189,16 @@ describe PostDestroyer do
end
context "recovered by user" do
it "doesn't raise an error when the raw doesn't change" do
PostRevisor.new(@reply).revise!(
@user,
{ edit_reason: 'made a change' },
force_new_version: true
)
PostDestroyer.new(@user, @reply.reload).recover
end
it "should increment the user's post count" do
PostDestroyer.new(@user, @reply).destroy
expect(@user.user_stat.topic_count).to eq(1)