Skip to content

Commit f41aa93

Browse files
committed
Fix test
1 parent eb5e65a commit f41aa93

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

app/lib/activitypub/activity/create.rb

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

303303
@quote_approval_uri = @status_parser.quote_approval_uri
304304
@quote_approval_uri = 'http://kmy.blue/ns#LegacyQuote' if @quote_approval_uri == 'kmyblue:LegacyQuote'
305-
@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))
305+
@quote_approval_uri = nil if
306+
unsupported_uri_scheme?(@quote_approval_uri) ||
307+
(@quote_approval_uri != 'http://kmy.blue/ns#LegacyQuote' && TagManager.instance.local_url?(@quote_approval_uri))
306308
@quote = Quote.new(account: @account, approval_uri: nil, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
307309
end
308310

app/models/quote.rb

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

60+
def pend_legacy!
61+
update!(approval_uri: 'http://kmy.blue/ns#LegacyQuote')
62+
end
63+
6064
def reject!
6165
if accepted?
6266
update!(state: :revoked, approval_uri: nil)

app/services/activitypub/verify_quote_service.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +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!(legacy: true) if Setting.auto_accept_legacy_quotes && (quote.legacy || (legacy_quote_available? && 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 quote.pend_legacy! if @approval_uri == 'http://kmy.blue/ns#LegacyQuote'
2021
return if quote.quoted_account&.local?
2122
return if fast_track_approval! || @approval_uri.blank?
2223

0 commit comments

Comments
 (0)