mastofe

commit: b8bae9664711f99bfb438687ff3b4b396db69924
parent: d37305c628c37aa16c1356c12aecd8de2105b80f
Author: Lex Alexander <l.alexander10@gmail.com>
Date:   Thu, 12 Oct 2017 14:52:09 -1000

Retoot count increases without reason (#5363)

* Retoot count increases without reason

-The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice.
-This calls it when the transaction is finished by using after_create_commit.
-Fixes #4916.

* Added test case for after_create_commit callback for checking reblog count.

* Rewrote test to keep original, but added one for only the after_create_commit callback.

Diffstat:
M
app/models/status.rb
2
+-
M
spec/services/reblog_service_spec.rb
6
++++++

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -134,7 +134,7 @@ class Status < ApplicationRecord
     CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain)
   end
 
-  after_create :store_uri, if: :local?
+  after_create_commit :store_uri, if: :local?
 
   around_create Mastodon::Snowflake::Callbacks
 
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
@@ -39,6 +39,12 @@ RSpec.describe ReblogService do
       expect(status.reblogs.count).to eq 1
     end
 
+    describe 'after_create_commit :store_uri' do
+      it 'keeps consistent reblog count' do
+        expect(status.reblogs.count).to eq 1
+      end
+    end
+
     it 'distributes to followers' do
       expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
     end