Add FASP follow recommendation support (#34964)

This commit is contained in:
David Roetzel 2025-06-16 12:43:27 +02:00 committed by GitHub
parent ad32834ccd
commit b2506478ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 136 additions and 0 deletions

View File

@ -2,11 +2,13 @@
class Api::V2::SuggestionsController < Api::BaseController
include Authorization
include AsyncRefreshesConcern
before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
before_action :require_user!
before_action :set_suggestions
before_action :schedule_fasp_retrieval
def index
render json: @suggestions.get(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:offset].to_i), each_serializer: REST::SuggestionSerializer
@ -22,4 +24,18 @@ class Api::V2::SuggestionsController < Api::BaseController
def set_suggestions
@suggestions = AccountSuggestions.new(current_account)
end
def schedule_fasp_retrieval
return unless Mastodon::Feature.fasp_enabled?
# Do not schedule a new retrieval if the request is a follow-up
# to an earlier retrieval
return if request.headers['Mastodon-Async-Refresh-Id'].present?
refresh_key = "fasp:follow_recommendation:#{current_account.id}"
return if AsyncRefresh.new(refresh_key).running?
add_async_refresh_header(AsyncRefresh.create(refresh_key))
Fasp::FollowRecommendationWorker.perform_async(current_account.id)
end
end

View File

@ -22,6 +22,10 @@ class AsyncRefresh
new(redis_key)
end
def self.exists?(redis_key)
redis.exists?(redis_key)
end
attr_reader :status, :result_count
def initialize(redis_key)
@ -49,6 +53,11 @@ class AsyncRefresh
@status = 'finished'
end
def increment_result_count(by: 1)
redis.hincrby(@redis_key, 'result_count', by)
fetch_data_from_redis
end
def reload
fetch_data_from_redis
self

View File

@ -34,6 +34,10 @@ class Fasp::Provider < ApplicationRecord
before_create :create_keypair
after_commit :update_remote_capabilities
scope :with_capability, lambda { |capability_name|
where('fasp_providers.capabilities @> ?::jsonb', "[{\"id\": \"#{capability_name}\", \"enabled\": true}]")
}
def capabilities
read_attribute(:capabilities).map do |attributes|
Fasp::Capability.new(attributes)

View File

@ -0,0 +1,35 @@
# frozen_string_literal: true
class Fasp::FollowRecommendationWorker
include Sidekiq::Worker
sidekiq_options queue: 'fasp', retry: 0
def perform(account_id)
return unless Mastodon::Feature.fasp_enabled?
async_refresh = AsyncRefresh.new("fasp:follow_recommendation:#{account_id}")
account = Account.find(account_id)
follow_recommendation_providers = Fasp::Provider.with_capability('follow_recommendation')
return if follow_recommendation_providers.none?
account_uri = ActivityPub::TagManager.instance.uri_for(account)
params = { accountUri: account_uri }.to_query
fetch_service = ActivityPub::FetchRemoteActorService.new
follow_recommendation_providers.each do |provider|
Fasp::Request.new(provider).get("/follow_recommendation/v0/accounts?#{params}").each do |uri|
next if Account.where(uri:).any?
account = fetch_service.call(uri)
async_refresh.increment_result_count(by: 1) if account.present?
end
end
rescue ActiveRecord::RecordNotFound
# Nothing to be done
ensure
async_refresh.finish!
end
end

View File

@ -29,3 +29,15 @@ Fabricator(:debug_fasp, from: :fasp_provider) do
def fasp.update_remote_capabilities = true
end
end
Fabricator(:follow_recommendation_fasp, from: :fasp_provider) do
confirmed true
capabilities [
{ id: 'follow_recommendation', version: '0.1', enabled: true },
]
after_build do |fasp|
# Prevent fabrication from attempting an HTTP call to the provider
def fasp.update_remote_capabilities = true
end
end

View File

@ -34,5 +34,14 @@ RSpec.describe 'Suggestions API' do
end
)
end
context 'when `follow_recommendation` FASP is enabled', feature: :fasp do
it 'enqueues a retrieval job and adds a header to inform the client' do
get '/api/v2/suggestions', headers: headers
expect(Fasp::FollowRecommendationWorker).to have_enqueued_sidekiq_job
expect(response.headers['Mastodon-Async-Refresh']).to be_present
end
end
end
end

View File

@ -0,0 +1,51 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe Fasp::FollowRecommendationWorker, feature: :fasp do
include ProviderRequestHelper
let(:provider) { Fabricate(:follow_recommendation_fasp) }
let(:account) { Fabricate(:account) }
let(:fetch_service) { instance_double(ActivityPub::FetchRemoteActorService, call: true) }
let!(:stubbed_request) do
account_uri = ActivityPub::TagManager.instance.uri_for(account)
path = "/follow_recommendation/v0/accounts?accountUri=#{URI.encode_uri_component(account_uri)}"
stub_provider_request(provider,
method: :get,
path:,
response_body: [
'https://fedi.example.com/accounts/1',
'https://fedi.example.com/accounts/7',
])
end
before do
allow(ActivityPub::FetchRemoteActorService).to receive(:new).and_return(fetch_service)
end
it "sends the requesting account's uri to provider and fetches received account uris" do
described_class.new.perform(account.id)
expect(stubbed_request).to have_been_made
expect(fetch_service).to have_received(:call).with('https://fedi.example.com/accounts/1')
expect(fetch_service).to have_received(:call).with('https://fedi.example.com/accounts/7')
end
it 'marks a running async refresh as finished' do
async_refresh = AsyncRefresh.create("fasp:follow_recommendation:#{account.id}", count_results: true)
described_class.new.perform(account.id)
expect(async_refresh.reload).to be_finished
end
it 'tracks the number of fetched accounts in the async refresh' do
async_refresh = AsyncRefresh.create("fasp:follow_recommendation:#{account.id}", count_results: true)
described_class.new.perform(account.id)
expect(async_refresh.reload.result_count).to eq 2
end
end