Add remove from followers api (#16864)
* Add followed_by? to account_interactions * Add RemoveFromFollowersService * Fix AccountBatch to use RemoveFromFollowersService * Add remove from followers APIlocal
parent
766a361b86
commit
17f4e457b3
8 changed files with 113 additions and 13 deletions
@ -0,0 +1,25 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
class RemoveFromFollowersService < BaseService |
||||||
|
include Payloadable |
||||||
|
|
||||||
|
def call(source_account, target_accounts) |
||||||
|
source_account.passive_relationships.where(account_id: target_accounts).find_each do |follow| |
||||||
|
follow.destroy |
||||||
|
|
||||||
|
if source_account.local? && !follow.account.local? && follow.account.activitypub? |
||||||
|
create_notification(follow) |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def create_notification(follow) |
||||||
|
ActivityPub::DeliveryWorker.perform_async(build_json(follow), follow.target_account_id, follow.account.inbox_url) |
||||||
|
end |
||||||
|
|
||||||
|
def build_json(follow) |
||||||
|
Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)) |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,38 @@ |
|||||||
|
require 'rails_helper' |
||||||
|
|
||||||
|
RSpec.describe RemoveFromFollowersService, type: :service do |
||||||
|
let(:bob) { Fabricate(:account, username: 'bob') } |
||||||
|
|
||||||
|
subject { RemoveFromFollowersService.new } |
||||||
|
|
||||||
|
describe 'local' do |
||||||
|
let(:sender) { Fabricate(:account, username: 'alice') } |
||||||
|
|
||||||
|
before do |
||||||
|
Follow.create(account: sender, target_account: bob) |
||||||
|
subject.call(bob, sender) |
||||||
|
end |
||||||
|
|
||||||
|
it 'does not create follow relation' do |
||||||
|
expect(bob.followed_by?(sender)).to be false |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
describe 'remote ActivityPub' do |
||||||
|
let(:sender) { Fabricate(:account, username: 'alice', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') } |
||||||
|
|
||||||
|
before do |
||||||
|
Follow.create(account: sender, target_account: bob) |
||||||
|
stub_request(:post, sender.inbox_url).to_return(status: 200) |
||||||
|
subject.call(bob, sender) |
||||||
|
end |
||||||
|
|
||||||
|
it 'does not create follow relation' do |
||||||
|
expect(bob.followed_by?(sender)).to be false |
||||||
|
end |
||||||
|
|
||||||
|
it 'sends a reject activity' do |
||||||
|
expect(a_request(:post, sender.inbox_url)).to have_been_made.once |
||||||
|
end |
||||||
|
end |
||||||
|
end |
Loading…
Reference in new issue