Fix handling announcements with links (#16941)
Broken since #15827remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
parent
458830ee7c
commit
989c67d29d
|
@ -338,7 +338,7 @@ class Status < ApplicationRecord
|
|||
def from_text(text)
|
||||
return [] if text.blank?
|
||||
|
||||
text.scan(FetchLinkCardService::URL_PATTERN).map(&:first).uniq.filter_map do |url|
|
||||
text.scan(FetchLinkCardService::URL_PATTERN).map(&:second).uniq.filter_map do |url|
|
||||
status = begin
|
||||
if TagManager.instance.local_url?(url)
|
||||
ActivityPub::TagManager.instance.uri_to_resource(url, Status)
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
describe PublishScheduledAnnouncementWorker do
|
||||
subject { described_class.new }
|
||||
|
||||
let!(:remote_account) { Fabricate(:account, domain: 'domain.com', username: 'foo', uri: 'https://domain.com/users/foo') }
|
||||
let!(:remote_status) { Fabricate(:status, uri: 'https://domain.com/users/foo/12345', account: remote_account) }
|
||||
let!(:local_status) { Fabricate(:status) }
|
||||
let(:scheduled_announcement) { Fabricate(:announcement, text: "rebooting very soon, see #{ActivityPub::TagManager.instance.uri_for(remote_status)} and #{ActivityPub::TagManager.instance.uri_for(local_status)}") }
|
||||
|
||||
describe 'perform' do
|
||||
before do
|
||||
service = double
|
||||
allow(FetchRemoteStatusService).to receive(:new).and_return(service)
|
||||
allow(service).to receive(:call).with('https://domain.com/users/foo/12345') { remote_status.reload }
|
||||
|
||||
subject.perform(scheduled_announcement.id)
|
||||
end
|
||||
|
||||
it 'updates the linked statuses' do
|
||||
expect(scheduled_announcement.reload.status_ids).to eq [remote_status.id, local_status.id]
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue