Change: 時限投稿はフォロワー以外にはActivityを発行しない (#250)
* Change: 時限投稿はフォロワー以外にはActivityを発行しない * Fix: ドメイン単位の認証になるように * Add test and fix * Fix lint * Fix test * Fix test * Revert "Fix test" This reverts commit22f1114b7f
. * Revert "Fix lint" This reverts commita828efa9be
. * Revert "Revert "Fix lint"" This reverts commit6a2d68f28a
. * Revert "Revert "Fix test"" This reverts commita21c0b9d3e
.
This commit is contained in:
parent
faf791c602
commit
789afccf9b
5 changed files with 66 additions and 1 deletions
|
@ -29,7 +29,7 @@ class StatusesController < ApplicationController
|
|||
end
|
||||
|
||||
format.json do
|
||||
expires_in 3.minutes, public: true if @status.distributable? && public_fetch_mode? && !misskey_software?
|
||||
expires_in 3.minutes, public: true if @status.distributable? && public_fetch_mode? && !misskey_software? && !@status.expires?
|
||||
render_with_cache json: @status, content_type: 'application/activity+json', serializer: status_activity_serializer, adapter: ActivityPub::Adapter, cancel_cache: misskey_software?
|
||||
end
|
||||
end
|
||||
|
@ -64,6 +64,8 @@ class StatusesController < ApplicationController
|
|||
|
||||
if request.authorization.present? && request.authorization.match(/^Bearer /i)
|
||||
raise Mastodon::NotPermittedError unless @status.capability_tokens.find_by(token: request.authorization.gsub(/^Bearer /i, ''))
|
||||
elsif request.format == :json && @status.expires?
|
||||
raise Mastodon::NotPermittedError unless StatusPolicy.new(signed_request_account, @status).show_activity?
|
||||
else
|
||||
authorize @status, :show?
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue