Merge remote-tracking branch 'parent/main' into kb_migration

2023-08-24 09:58:54 +09:00 · 2023-08-24 09:58:54 +09:00 · adfa3524fc
commit adfa3524fc
parent 3742720b5d 9a8190da4a
38 changed files with 294 additions and 184 deletions
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@ -46,11 +46,11 @@ class PublicFeed
  end

  def local_only?
-    options[:local]
+    options[:local] && !options[:remote]
  end

  def remote_only?
-    options[:remote]
+    options[:remote] && !options[:local]
  end

  def hide_local_users?