diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index d93497521a..459278c413 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -85,6 +85,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity ApplicationRecord.transaction do @status = Status.create!(@params) attach_tags(@status) + attach_mentions(@status) end resolve_thread(@status) @@ -188,6 +189,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity # not a big deal Trends.tags.register(status) + # Update featured tags + return if @tags.empty? || !status.distributable? + + @account.featured_tags.where(tag_id: @tags.pluck(:id)).find_each do |featured_tag| + featured_tag.increment(status.created_at) + end + end + + def attach_mentions(status) @mentions.each do |mention| mention.status = status mention.save diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb index c4a5f5115b..91e297649c 100644 --- a/app/services/activitypub/process_status_update_service.rb +++ b/app/services/activitypub/process_status_update_service.rb @@ -186,7 +186,26 @@ class ActivityPub::ProcessStatusUpdateService < BaseService end def update_tags! - @status.tags = Tag.find_or_create_by_names(@raw_tags) + previous_tags = @status.tags.to_a + current_tags = @status.tags = Tag.find_or_create_by_names(@raw_tags) + + return unless @status.distributable? + + added_tags = current_tags - previous_tags + + unless added_tags.empty? + @account.featured_tags.where(tag_id: added_tags.pluck(:id)).find_each do |featured_tag| + featured_tag.increment(@status.created_at) + end + end + + removed_tags = previous_tags - current_tags + + return if removed_tags.empty? + + @account.featured_tags.where(tag_id: removed_tags.pluck(:id)).find_each do |featured_tag| + featured_tag.decrement(@status) + end end def update_mentions! diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb index 7594efd591..f905d894a0 100644 --- a/spec/lib/activitypub/activity/create_spec.rb +++ b/spec/lib/activitypub/activity/create_spec.rb @@ -130,10 +130,6 @@ RSpec.describe ActivityPub::Activity::Create do context 'when fetching' do subject { described_class.new(json, sender) } - before do - subject.perform - end - context 'when object publication date is below ISO8601 range' do let(:object_json) do { @@ -145,6 +141,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status with a valid creation date', :aggregate_failures do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -165,6 +163,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status with a valid creation date', :aggregate_failures do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -186,6 +186,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status with appropriate creation and edition dates', :aggregate_failures do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -209,17 +211,13 @@ RSpec.describe ActivityPub::Activity::Create do } end - it 'creates status' do + it 'creates status and does not mark it as edited' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil expect(status.text).to eq 'Lorem ipsum' - end - - it 'does not mark status as edited' do - status = sender.statuses.first - - expect(status).to_not be_nil expect(status.edited?).to be false end end @@ -234,7 +232,7 @@ RSpec.describe ActivityPub::Activity::Create do end it 'does not create a status' do - expect(sender.statuses.count).to be_zero + expect { subject.perform }.to_not change(sender.statuses, :count) end end @@ -248,6 +246,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -255,6 +255,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'missing to/cc defaults to direct privacy' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -273,6 +275,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -291,6 +295,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -309,6 +315,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -327,6 +335,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -345,6 +355,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -363,6 +375,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -381,6 +395,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -403,6 +419,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -422,15 +440,13 @@ RSpec.describe ActivityPub::Activity::Create do } end - it 'creates status' do + it 'creates status with a silent mention' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil expect(status.visibility).to eq 'limited' - end - - it 'creates silent mention' do - status = sender.statuses.first expect(status.mentions.first).to be_silent end end @@ -452,6 +468,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -472,6 +490,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -500,6 +520,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -522,6 +544,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -544,6 +568,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -569,6 +595,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -594,6 +622,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -619,6 +649,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -642,6 +674,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -664,6 +698,42 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + + status = sender.statuses.first + + expect(status).to_not be_nil + expect(status.tags.map(&:name)).to include('test') + end + end + + context 'with featured hashtags' do + let(:object_json) do + { + id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join, + type: 'Note', + content: 'Lorem ipsum', + to: 'https://www.w3.org/ns/activitystreams#Public', + tag: [ + { + type: 'Hashtag', + href: 'http://example.com/blah', + name: '#test', + }, + ], + } + end + + before do + sender.featured_tags.create!(name: 'test') + end + + it 'creates status and updates featured tag' do + expect { subject.perform } + .to change(sender.statuses, :count).by(1) + .and change { sender.featured_tags.first.reload.statuses_count }.by(1) + .and change { sender.featured_tags.first.reload.last_status_at }.from(nil).to(be_within(0.1).of(Time.now.utc)) + status = sender.statuses.first expect(status).to_not be_nil @@ -687,6 +757,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -709,6 +781,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -733,6 +807,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -759,6 +835,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil @@ -784,6 +862,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -805,6 +885,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'creates status' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil end @@ -835,13 +917,13 @@ RSpec.describe ActivityPub::Activity::Create do } end - it 'creates status' do + it 'creates status with a poll' do + expect { subject.perform }.to change(sender.statuses, :count).by(1) + status = sender.statuses.first expect(status).to_not be_nil expect(status.poll).to_not be_nil - end - it 'creates a poll' do poll = sender.polls.first expect(poll).to_not be_nil expect(poll.status).to_not be_nil @@ -864,6 +946,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'adds a vote to the poll with correct uri' do + expect { subject.perform }.to change(poll.votes, :count).by(1) + vote = poll.votes.first expect(vote).to_not be_nil expect(vote.uri).to eq object_json[:id] @@ -889,6 +973,8 @@ RSpec.describe ActivityPub::Activity::Create do end it 'does not add a vote to the poll' do + expect { subject.perform }.to_not change(poll.votes, :count) + expect(poll.votes.first).to be_nil end end diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb index 9d91f31cc5..9b4cecb40b 100644 --- a/spec/services/activitypub/process_status_update_service_spec.rb +++ b/spec/services/activitypub/process_status_update_service_spec.rb @@ -292,16 +292,22 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do updated: '2021-09-08T22:39:25Z', tag: [ { type: 'Hashtag', name: 'foo' }, + { type: 'Hashtag', name: 'bar' }, ], } end before do - subject.call(status, json, json) + status.account.featured_tags.create!(name: 'bar') + status.account.featured_tags.create!(name: 'test') end - it 'updates tags' do - expect(status.tags.reload.map(&:name)).to eq %w(foo) + it 'updates tags and featured tags' do + expect { subject.call(status, json, json) } + .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar)) + .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1) + .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1) + .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_within(0.1).of(Time.now.utc)) end end