Skip to content

Commit 3facc1d

Browse files
committed
Fix test
1 parent 55252ef commit 3facc1d

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

app/lib/activitypub/activity/create.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,9 @@ def process_quote
291291

292292
@quote_approval_uri = @status_parser.quote_approval_uri
293293
@quote_approval_uri = 'http://kmy.blue/ns#LegacyQuote' if @quote_approval_uri == 'kmyblue:LegacyQuote'
294-
@quote_approval_uri = nil if unsupported_uri_scheme?(@quote_approval_uri) || (@quote_approval_uri != 'http://kmy.blue/ns#LegacyQuote' && TagManager.instance.local_url?(@quote_approval_uri))
294+
@quote_approval_uri = nil if
295+
unsupported_uri_scheme?(@quote_approval_uri) ||
296+
(@quote_approval_uri != 'http://kmy.blue/ns#LegacyQuote' && TagManager.instance.local_url?(@quote_approval_uri))
295297
@quote = Quote.new(account: @account, approval_uri: nil, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
296298
end
297299

app/models/quote.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ def accept!(approval_uri: nil)
5555
reset_parent_cache! if attribute_previously_changed?(:state)
5656
end
5757

58+
def pend_legacy!
59+
update!(approval_uri: 'http://kmy.blue/ns#LegacyQuote')
60+
end
61+
5862
def reject!
5963
if accepted?
6064
update!(state: :revoked, approval_uri: nil)

app/services/activitypub/verify_quote_service.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ def call(quote, approval_uri, fetchable_quoted_uri: nil, prefetched_quoted_objec
1515

1616
fetch_quoted_post_if_needed!(fetchable_quoted_uri, prefetched_body: prefetched_quoted_object)
1717

18-
return quote.accept! if Setting.auto_accept_legacy_quotes && (quote.legacy || (legacy_quote_available? && quote.approval_uri == 'http://kmy.blue/ns#LegacyQuote'))
18+
return quote.accept!(legacy: legacy_quote_available?) if Setting.auto_accept_legacy_quotes && (quote.legacy || (legacy_quote_available? && @approval_uri == 'http://kmy.blue/ns#LegacyQuote'))
1919

20-
return if quote.approval_uri == 'http://kmy.blue/ns#LegacyQuote'
20+
return quote.pend_legacy! if @approval_uri == 'http://kmy.blue/ns#LegacyQuote'
2121
return if quote.quoted_account&.local?
2222
return if fast_track_approval! || @approval_uri.blank?
2323

0 commit comments

Comments
 (0)