gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Revert "Add block from bot follow settings"

Browse source 
This reverts commit ff994d78fa.
This commit is contained in:
KMY 2023-09-18 21:33:05 +09:00
parent ff994d78fa
commit cfa250421e
12 changed files with 13 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/follow_service.rb
View file

@ -36,7 +36,7 @@ class FollowService < BaseService
# and the feeds are being merged
mark_home_feed_as_partial! if @source_account.not_following_anyone?
if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub? || (@source_account.bot? && @target_account.user&.setting_lock_follow_from_bot)
if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub?
request_follow!
elsif @target_account.local?
direct_follow!