From b8bae9664711f99bfb438687ff3b4b396db69924 Mon Sep 17 00:00:00 2001 From: Lex Alexander Date: Thu, 12 Oct 2017 14:52:09 -1000 Subject: 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. --- spec/services/reblog_service_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec') diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb index 0ad5c5f6b..19d3bb6cb 100644 --- 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 -- cgit From 3283868e28794d7abe217c525aadf5e7b9e2fa66 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 13 Oct 2017 11:00:11 +0200 Subject: Improve spec of Feed and UserTrackingConcern (#5367) --- .../concerns/user_tracking_concern_spec.rb | 2 ++ spec/models/feed_spec.rb | 40 +++++++++++++++++----- 2 files changed, 34 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb index 6bd29f887..168d44ba6 100644 --- a/spec/controllers/concerns/user_tracking_concern_spec.rb +++ b/spec/controllers/concerns/user_tracking_concern_spec.rb @@ -5,6 +5,7 @@ require 'rails_helper' describe ApplicationController, type: :controller do controller do include UserTrackingConcern + def show render plain: 'show' end @@ -49,6 +50,7 @@ describe ApplicationController, type: :controller do get :show expect_updated_sign_in_at(user) + expect(Redis.current.get("account:#{user.account_id}:regeneration")).to eq 'true' expect(RegenerationWorker).to have_received(:perform_async) end diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb index 5433f44bd..8719369db 100644 --- a/spec/models/feed_spec.rb +++ b/spec/models/feed_spec.rb @@ -1,21 +1,45 @@ require 'rails_helper' RSpec.describe Feed, type: :model do + let(:account) { Fabricate(:account) } + + subject { described_class.new(:home, account) } + describe '#get' do - it 'gets statuses with ids in the range' do - account = Fabricate(:account) + before do Fabricate(:status, account: account, id: 1) Fabricate(:status, account: account, id: 2) Fabricate(:status, account: account, id: 3) Fabricate(:status, account: account, id: 10) - Redis.current.zadd(FeedManager.instance.key(:home, account.id), - [[4, 4], [3, 3], [2, 2], [1, 1]]) + end + + context 'when feed is generated' do + before do + Redis.current.zadd( + FeedManager.instance.key(:home, account.id), + [[4, 4], [3, 3], [2, 2], [1, 1]] + ) + end + + it 'gets statuses with ids in the range from redis' do + results = subject.get(3) + + expect(results.map(&:id)).to eq [3, 2] + expect(results.first.attributes.keys).to eq %w(id updated_at) + end + end + + context 'when feed is being generated' do + before do + Redis.current.set("account:#{account.id}:regeneration", true) + end - feed = Feed.new(:home, account) - results = feed.get(3) + it 'gets statuses with ids in the range from database' do + results = subject.get(3) - expect(results.map(&:id)).to eq [3, 2] - expect(results.first.attributes.keys).to eq %w(id updated_at) + expect(results.map(&:id)).to eq [10, 3, 2] + expect(results.first.attributes.keys).to include('id', 'updated_at') + end end end end -- cgit From 8125fdc19f310a22fdd1395365c2f02d6887b389 Mon Sep 17 00:00:00 2001 From: unarist Date: Sat, 14 Oct 2017 21:42:09 +0900 Subject: Use atomUri in Undo activity of Announce (#5376) This allows deletion of reblogs which delivered before with OStatus URI. --- app/lib/activitypub/activity/undo.rb | 3 ++- app/serializers/activitypub/activity_serializer.rb | 5 +++++ spec/lib/activitypub/activity/undo_spec.rb | 24 +++++++++++++++++----- 3 files changed, 26 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index 4b0905de2..cbed417c4 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -17,7 +17,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity private def undo_announce - status = Status.find_by(uri: object_uri, account: @account) + status = Status.find_by(uri: object_uri, account: @account) + status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present? if status.nil? delete_later!(object_uri) diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index df399211c..50c4f6a04 100644 --- a/app/serializers/activitypub/activity_serializer.rb +++ b/app/serializers/activitypub/activity_serializer.rb @@ -5,6 +5,7 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce? attribute :proper_uri, key: :object, if: :announce? + attribute :atom_uri, if: :announce? def id ActivityPub::TagManager.instance.activity_uri_for(object) @@ -34,6 +35,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer ActivityPub::TagManager.instance.uri_for(object.proper) end + def atom_uri + OStatus::TagManager.instance.uri_for(object) + end + def announce? object.reblog? end diff --git a/spec/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb index 14c68efe5..e01c5e03e 100644 --- a/spec/lib/activitypub/activity/undo_spec.rb +++ b/spec/lib/activitypub/activity/undo_spec.rb @@ -25,16 +25,30 @@ RSpec.describe ActivityPub::Activity::Undo do type: 'Announce', actor: ActivityPub::TagManager.instance.uri_for(sender), object: ActivityPub::TagManager.instance.uri_for(status), + atomUri: 'barbar', } end - before do - Fabricate(:status, reblog: status, account: sender, uri: 'bar') + context do + before do + Fabricate(:status, reblog: status, account: sender, uri: 'bar') + end + + it 'deletes the reblog' do + subject.perform + expect(sender.reblogged?(status)).to be false + end end - it 'deletes the reblog' do - subject.perform - expect(sender.reblogged?(status)).to be false + context 'with atomUri' do + before do + Fabricate(:status, reblog: status, account: sender, uri: 'barbar') + end + + it 'deletes the reblog by atomUri' do + subject.perform + expect(sender.reblogged?(status)).to be false + end end end -- cgit