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

Remove: #609 NGワード設定の２項目を削除 (#789)

Browse source 
* Remove: #609 NGワード設定の２項目を削除

* Fix test
This commit is contained in:
KMY（雪あすか） 2024-08-06 09:17:36 +09:00 • committed by GitHub
parent dd7a2a6bbf
commit b787b130a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 5 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/public_feed.rb
View file

@ -26,7 +26,7 @@ class PublicFeed
scope.merge!(without_replies_scope) unless with_replies?
scope.merge!(without_reblogs_scope) unless with_reblogs?
scope.merge!(local_only_scope) if local_only?
scope.merge!(remote_only_scope) if remote_only? || hide_local_users?
scope.merge!(remote_only_scope) if remote_only?
scope.merge!(account_filters_scope) if account?
scope.merge!(media_only_scope) if media_only?
scope.merge!(language_scope) if account&.chosen_languages.present?
@ -56,10 +56,6 @@ class PublicFeed
options[:remote] && !options[:local] && Setting.enable_local_timeline
end
def hide_local_users?
@account.nil? && Setting.hide_local_users_for_anonymous
end
def account?
account.present?
end