post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 14:02:02 +09:00
commit 9fa468a4bf
30 changed files with 239 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/domain_blocks_controller.rb
View file

@ -78,15 +78,15 @@ module Admin
end
def update_params
params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
end
def resource_params
params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
end
def form_domain_block_batch_params
params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous])
end
def action_from_button

4
app/controllers/api/v1/admin/domain_blocks_controller.rb
View file

@ -69,7 +69,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
end
def domain_block_params
params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reports, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
params.permit(:severity, :reject_media, :reject_favourite, :reject_reply, :reject_reports, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
end
def insert_pagination_headers
@ -101,6 +101,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
end
def resource_params
params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply, :reject_send_not_public_searchability, :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden, :hidden_anonymous)
end
end

4
app/javascript/mastodon/features/antenna_adder/components/account.jsx
View file

@ -18,8 +18,6 @@ const makeMapStateToProps = () => {
};
export default @connect(makeMapStateToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -41,3 +39,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Account));

4
app/javascript/mastodon/features/antenna_adder/components/antenna.jsx
View file

@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { antennaId }) => ({
onAdd: () => dispatch(addToAntennaAdder(antennaId)),
});
export default @connect(MapStateToProps, mapDispatchToProps)
@injectIntl
class Antenna extends ImmutablePureComponent {
static propTypes = {
@ -67,3 +65,5 @@ class Antenna extends ImmutablePureComponent {
}
}
export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(Antenna));

4
app/javascript/mastodon/features/antenna_adder/index.jsx
View file

@ -27,8 +27,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetAntennaAdder()),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class AntennaAdder extends ImmutablePureComponent {
static propTypes = {
@ -67,3 +65,5 @@ class AntennaAdder extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaAdder));

18
app/lib/activitypub/tag_manager.rb
View file

@ -124,6 +124,24 @@ class ActivityPub::TagManager
cc << COLLECTIONS[:public]
end
cc = cc + cc_private_visibility(status)
cc
end
def cc_for_misskey(status)
if (status.account.user&.setting_reject_unlisted_subscription && status.visibility == 'unlisted') || (status.account.user&.setting_reject_public_unlisted_subscription && status.visibility == 'public_unlisted')
cc = cc_private_visibility(status)
cc << uri_for(status.reblog.account) if status.reblog?
return cc
end
cc(status)
end
def cc_private_visibility(status)
cc = []
unless status.direct_visibility? || status.limited_visibility?
if status.account.silenced?
# Only notify followers if the account is locally silenced

65
app/lib/status_reach_finder.rb
View file

@ -13,6 +13,10 @@ class StatusReachFinder
(reached_account_inboxes + followers_inboxes + relay_inboxes).uniq
end
def inboxes_for_misskey
(reached_account_inboxes_for_misskey + followers_inboxes_for_misskey).uniq
end
private
def reached_account_inboxes
@ -26,6 +30,14 @@ class StatusReachFinder
end
end
def reached_account_inboxes_for_misskey
if @status.reblog?
[]
else
Account.where(id: reached_account_ids).where(domain: banned_domains_for_misskey).inboxes
end
end
def reached_account_ids
[
replied_to_account_id,
@ -70,7 +82,7 @@ class StatusReachFinder
def followers_inboxes
if @status.in_reply_to_local_account? && distributable?
@status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).inboxes
@status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where.not(domain: banned_domains).inboxes
elsif @status.direct_visibility? || @status.limited_visibility?
[]
else
@ -78,6 +90,16 @@ class StatusReachFinder
end
end
def followers_inboxes_for_misskey
if @status.in_reply_to_local_account? && distributable?
@status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where(domain: banned_domains_for_misskey).inboxes
elsif @status.direct_visibility? || @status.limited_visibility?
[]
else
@status.account.followers.where(domain: banned_domains_for_misskey).inboxes
end
end
def relay_inboxes
if @status.public_visibility?
Relay.enabled.pluck(:inbox_url)
@ -96,13 +118,38 @@ class StatusReachFinder
def banned_domains
return @banned_domains if @banned_domains
blocks = []
blocks << DomainBlock.where(reject_send_not_public_searchability: true).pluck(:domain) if @status.compute_searchability != 'public'
blocks << DomainBlock.where(reject_send_unlisted_dissubscribable: true).pluck(:domain) if @status.unlisted_visibility? && @status.account.dissubscribable
blocks << DomainBlock.where(reject_send_public_unlisted: true).pluck(:domain) if @status.public_unlisted_visibility?
blocks << DomainBlock.where(reject_send_dissubscribable: true).pluck(:domain) if @status.account.dissubscribable
blocks << DomainBlock.where(reject_send_media: true).pluck(:domain) if @status.with_media?
blocks << DomainBlock.where(reject_send_sensitive: true).pluck(:domain) if (@status.with_media? && @status.sensitive) || @status.spoiler_text
return @banned_domains = blocks.uniq
domains = banned_domains_of_status(@status)
domains = domains + banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
return @banned_domains = domains.uniq
end
def banned_domains_of_status(status)
blocks = DomainBlock.where(domain: nil)
unless status.account.user&.setting_send_without_domain_blocks
blocks = blocks.or(DomainBlock.where(reject_send_not_public_searchability: true)) if status.compute_searchability != 'public'
blocks = blocks.or(DomainBlock.where(reject_send_public_unlisted: true)) if status.public_unlisted_visibility?
blocks = blocks.or(DomainBlock.where(reject_send_dissubscribable: true)) if status.account.dissubscribable
blocks = blocks.or(DomainBlock.where(reject_send_media: true)) if status.with_media?
blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if (status.with_media? && status.sensitive) || status.spoiler_text?
end
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription
blocks.pluck(:domain).uniq
end
def banned_domains_for_misskey
return @banned_domains_for_misskey if @banned_domains_for_misskey
domains = banned_domains_for_misskey_of_status(@status)
domains = domains + banned_domains_for_misskey_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
return @banned_domains_for_misskey = domains.uniq
end
def banned_domains_for_misskey_of_status(status)
blocks = DomainBlock.where(domain: nil)
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription
blocks = blocks.or(DomainBlock.where(detect_invalid_subscription: true)) if status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription
blocks.pluck(:domain).uniq
end
end

1
app/models/account.rb
View file

@ -53,6 +53,7 @@
# group_allow_private_message :boolean
# searchability :integer default("private"), not null
# dissubscribable :boolean default(FALSE), not null
# stop_emoji_reaction_streaming :boolean default(FALSE)
#
class Account < ApplicationRecord

4
app/models/account_statuses_filter.rb
View file

@ -27,8 +27,8 @@ class AccountStatusesFilter
scope.merge!(hashtag_scope) if tagged?
scope.merge!(scope.where(searchability: :public)) if domain_block&.reject_send_not_public_searchability
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.reject_send_unlisted_dissubscribable && @account.dissubscribable
scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted
scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted || (domain_block&.detect_invalid_subscription && @account.user&.setting_reject_public_unlisted_subscription)
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.setting_reject_unlisted_subscription
scope.merge!(scope.where(spoiler_text: ['', nil])) if domain_block&.reject_send_sensitive
scope

12
app/models/concerns/has_user_settings.rb
View file

@ -31,6 +31,18 @@ module HasUserSettings
settings['public_post_to_unlisted']
end
def setting_reject_public_unlisted_subscription
settings['reject_public_unlisted_subscription']
end
def setting_reject_unlisted_subscription
settings['reject_unlisted_subscription']
end
def setting_send_without_domain_blocks
settings['send_without_domain_blocks']
end
def setting_unfollow_modal
settings['web.unfollow_modal']
end

4
app/models/domain_block.rb
View file

@ -17,7 +17,6 @@
# reject_favourite :boolean default(FALSE), not null
# reject_reply :boolean default(FALSE), not null
# reject_send_not_public_searchability :boolean default(FALSE), not null
# reject_send_unlisted_dissubscribable :boolean default(FALSE), not null
# reject_send_public_unlisted :boolean default(FALSE), not null
# reject_send_dissubscribable :boolean default(FALSE), not null
# reject_send_media :boolean default(FALSE), not null
@ -27,6 +26,7 @@
# reject_new_follow :boolean default(FALSE), not null
# hidden :boolean default(FALSE), not null
# hidden_anonymous :boolean default(FALSE), not null
# detect_invalid_subscription :boolean default(FALSE), not null
#
class DomainBlock < ApplicationRecord
@ -59,7 +59,6 @@ class DomainBlock < ApplicationRecord
reject_favourite? ? :reject_favourite : nil,
reject_reply? ? :reject_reply : nil,
reject_send_not_public_searchability? ? :reject_send_not_public_searchability : nil,
reject_send_unlisted_dissubscribable? ? :reject_send_unlisted_dissubscribable : nil,
reject_send_public_unlisted? ? :reject_send_public_unlisted : nil,
reject_send_dissubscribable? ? :reject_send_dissubscribable : nil,
reject_send_media? ? :reject_send_media : nil,
@ -67,6 +66,7 @@ class DomainBlock < ApplicationRecord
reject_hashtag? ? :reject_hashtag : nil,
reject_straight_follow? ? :reject_straight_follow : nil,
reject_new_follow? ? :reject_new_follow : nil,
detect_invalid_subscription? ? :detect_invalid_subscription : nil,
reject_reports? ? :reject_reports : nil
].reject { |policy| policy == :noop || policy.nil? }
end

3
app/models/user_settings.rb
View file

@ -17,6 +17,9 @@ class UserSettings
setting :default_privacy, default: nil
setting :default_searchability, default: :private
setting :public_post_to_unlisted, default: false
setting :reject_public_unlisted_subscription, default: false
setting :reject_unlisted_subscription, default: false
setting :send_without_domain_blocks, default: false
namespace :web do
setting :crop_images, default: true

28
app/policies/status_policy.rb
View file

@ -101,14 +101,28 @@ class StatusPolicy < ApplicationPolicy
end
def server_blocking_domain?
@domain_block = DomainBlock.find_by(domain: current_account&.domain)
if record.reblog? && record.reblog.local?
server_blocking_domain_of_status?(record) || server_blocking_domain_of_status?(record.reblog)
else
server_blocking_domain_of_status?(record)
end
end
def server_blocking_domain_of_status?(status)
@domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
if @domain_block
(@domain_block.reject_send_not_public_searchability && record.compute_searchability != 'public') ||
(@domain_block.reject_send_unlisted_dissubscribable && record.unlisted_visibility? && record.account.dissubscribable) ||
(@domain_block.reject_send_public_unlisted && record.public_unlisted_visibility?) ||
(@domain_block.reject_send_dissubscribable && record.account.dissubscribable) ||
(@domain_block.reject_send_media && record.with_media?) ||
(@domain_block.reject_send_sensitive && ((record.with_media? && record.sensitive) || record.spoiler_text))
unless status.account.user&.setting_send_without_domain_blocks
(@domain_block.reject_send_not_public_searchability && status.compute_searchability != 'public') ||
(@domain_block.reject_send_public_unlisted && status.public_unlisted_visibility?) ||
(@domain_block.reject_send_dissubscribable && status.account.dissubscribable) ||
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.setting_reject_unlisted_subscription) ||
(@domain_block.reject_send_media && status.with_media?) ||
(@domain_block.reject_send_sensitive && ((status.with_media? && status.sensitive) || status.spoiler_text?))
else
(@domain_block.detect_invalid_subscription && status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) ||
(@domain_block.detect_invalid_subscription && status.public_visibility? && status.account.user&.setting_reject_unlisted_subscription)
end
else
false
end

4
app/presenters/activitypub/activity_presenter.rb
View file

@ -4,14 +4,14 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
attributes :id, :type, :actor, :published, :to, :cc, :virtual_object
class << self
def from_status(status, allow_inlining: true)
def from_status(status, allow_inlining: true, for_misskey: false)
new.tap do |presenter|
presenter.id = ActivityPub::TagManager.instance.activity_uri_for(status)
presenter.type = status.reblog? ? 'Announce' : 'Create'
presenter.actor = ActivityPub::TagManager.instance.uri_for(status.account)
presenter.published = status.created_at
presenter.to = ActivityPub::TagManager.instance.to(status)
presenter.cc = ActivityPub::TagManager.instance.cc(status)
presenter.cc = for_misskey ? ActivityPub::TagManager.instance.cc_for_misskey(status) : ActivityPub::TagManager.instance.cc(status)
presenter.virtual_object = begin
if status.reblog?

22
app/serializers/activitypub/activity_for_misskey_serializer.rb Normal file
View file

@ -0,0 +1,22 @@
# frozen_string_literal: true
class ActivityPub::ActivityForMisskeySerializer < ActivityPub::Serializer
def self.serializer_for(model, options)
case model.class.name
when 'Status'
ActivityPub::NoteForMisskeySerializer
when 'DeliverToDeviceService::EncryptedMessage'
ActivityPub::EncryptedMessageSerializer
else
super
end
end
attributes :id, :type, :actor, :published, :to, :cc
has_one :virtual_object, key: :object
def published
object.published.iso8601
end
end

9
app/serializers/activitypub/note_for_misskey_serializer.rb Normal file
View file

@ -0,0 +1,9 @@
# frozen_string_literal: true
class ActivityPub::NoteForMisskeySerializer < ActivityPub::NoteSerializer
def cc
ActivityPub::TagManager.instance.cc_for_misskey(object)
end
end

4
app/serializers/rest/admin/domain_block_serializer.rb
View file

@ -3,9 +3,9 @@
class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
attributes :id, :domain, :created_at, :severity,
:reject_media, :reject_favourite, :reject_reply, :reject_reports,
:reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable,
:reject_send_not_public_searchability,
:reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive,
:reject_hashtag, :reject_straight_follow, :reject_new_follow,
:reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription,
:private_comment, :public_comment, :obfuscate
def id

6
app/views/admin/domain_blocks/edit.html.haml
View file

@ -26,9 +26,6 @@
.fields-group
= f.input :reject_send_not_public_searchability, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_not_public_searchability'), hint: I18n.t('admin.domain_blocks.reject_send_not_public_searchability_hint')
.fields-group
= f.input :reject_send_unlisted_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable_hint')
.fields-group
= f.input :reject_send_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_dissubscribable_hint')
@ -50,6 +47,9 @@
.fields-group
= f.input :reject_new_follow, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_new_follow'), hint: I18n.t('admin.domain_blocks.reject_new_follow_hint')
.fields-group
= f.input :detect_invalid_subscription, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.detect_invalid_subscription'), hint: I18n.t('admin.domain_blocks.detect_invalid_subscription_hint')
.fields-group
= f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')

6
app/views/admin/domain_blocks/new.html.haml
View file

@ -26,9 +26,6 @@
.fields-group
= f.input :reject_send_not_public_searchability, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_not_public_searchability'), hint: I18n.t('admin.domain_blocks.reject_send_not_public_searchability_hint')
.fields-group
= f.input :reject_send_unlisted_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_unlisted_dissubscribable_hint')
.fields-group
= f.input :reject_send_dissubscribable, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_dissubscribable'), hint: I18n.t('admin.domain_blocks.reject_send_dissubscribable_hint')
@ -50,6 +47,9 @@
.fields-group
= f.input :reject_new_follow, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_new_follow'), hint: I18n.t('admin.domain_blocks.reject_new_follow_hint')
.fields-group
= f.input :detect_invalid_subscription, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.detect_invalid_subscription'), hint: I18n.t('admin.domain_blocks.detect_invalid_subscription_hint')
.fields-group
= f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')

2
app/views/admin/export_domain_blocks/_domain_block.html.haml
View file

@ -13,7 +13,6 @@
= f.hidden_field :reject_favourite
= f.hidden_field :reject_reply
= f.hidden_field :reject_send_not_public_searchability
= f.hidden_field :reject_send_unlisted_dissubscribable
= f.hidden_field :reject_send_public_unlisted
= f.hidden_field :reject_send_dissubscribable
= f.hidden_field :reject_send_media
@ -21,6 +20,7 @@
= f.hidden_field :reject_hashtag
= f.hidden_field :reject_straight_follow
= f.hidden_field :reject_new_follow
= f.hidden_field :detect_invalid_subscription
= f.hidden_field :reject_reports
= f.hidden_field :obfuscate
= f.hidden_field :private_comment

9
app/views/settings/preferences/other/show.html.haml
View file

@ -35,6 +35,15 @@
.fields-group
= ff.input :show_application, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_show_application'), hint: I18n.t('simple_form.hints.defaults.setting_show_application')
.fields-group
= f.input :setting_send_without_domain_blocks, as: :boolean, wrapper: :with_label
.fields-group
= f.input :setting_reject_public_unlisted_subscription, as: :boolean, wrapper: :with_label
.fields-group
= f.input :setting_reject_unlisted_subscription, as: :boolean, wrapper: :with_label
%h4= t 'preferences.public_timelines'
.fields-group

18
app/workers/activitypub/distribution_worker.rb
View file

@ -15,17 +15,33 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
protected
def inboxes
@inboxes ||= StatusReachFinder.new(@status).inboxes
@inboxes ||= status_reach_finder.inboxes
end
def inboxes_for_misskey
@inboxes_for_misskey ||= status_reach_finder.inboxes_for_misskey
end
def status_reach_finder
@status_reach_finder ||= StatusReachFinder.new(@status)
end
def payload
@payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
end
def payload_for_misskey
@payload_for_misskey ||= Oj.dump(serialize_payload(activity_for_misskey, ActivityPub::ActivityForMisskeySerializer, signer: @account))
end
def activity
ActivityPub::ActivityPresenter.from_status(@status)
end
def activity_for_misskey
ActivityPub::ActivityPresenter.from_status(@status, for_misskey: true)
end
def options
{ 'synchronize_followers' => @status.private_visibility? }
end

20
app/workers/activitypub/raw_distribution_worker.rb
View file

@ -23,10 +23,16 @@ class ActivityPub::RawDistributionWorker
protected
def distribute!
return if inboxes.empty?
unless inboxes.empty?
ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
[payload, source_account_id, inbox_url, options]
end
end
ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
[payload, source_account_id, inbox_url, options]
unless inboxes_for_misskey.empty?
ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey, limit: 1_000) do |inbox_url|
[payload_for_misskey, source_account_id, inbox_url, options]
end
end
end
@ -34,6 +40,10 @@ class ActivityPub::RawDistributionWorker
@json
end
def payload_for_misskey
payload
end
def source_account_id
@account.id
end
@ -42,6 +52,10 @@ class ActivityPub::RawDistributionWorker
@inboxes ||= @account.followers.inboxes - @exclude_inboxes
end
def inboxes_for_misskey
[]
end
def options
{}
end