Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream

app/models/form/admin_settings.rb

@@ -109,7 +109,7 @@ class Form::AdminSettings
   REGISTRATION_MODES = %w(open approved none).freeze
   FEED_ACCESS_MODES = %w(public authenticated disabled).freeze
   ALTERNATE_FEED_ACCESS_MODES = %w(public authenticated).freeze
-  LANDING_PAGE = %w(trends about local_feed).freeze
+  LANDING_PAGE = %w(trends overview local_feed about).freeze
 
   attr_accessor(*KEYS)
 

app/models/report_filter.rb

@@ -3,6 +3,7 @@
 class ReportFilter
   KEYS = %i(
     resolved
+    unresolved
     account_id
     target_account_id
     by_target_domain
@@ -16,7 +17,7 @@ class ReportFilter
   end
 
   def results
-    scope = Report.unresolved
+    scope = status_scope
 
     relevant_params.each do |key, value|
       scope = scope.merge scope_for(key, value)
@@ -28,7 +29,7 @@ class ReportFilter
   private
 
   def relevant_params
-    params.tap do |args|
+    params.except(:resolved, :unresolved).tap do |args|
       args.delete(:target_origin) if origin_is_remote_and_domain_present?
     end
   end
@@ -37,12 +38,20 @@ class ReportFilter
     params[:target_origin] == 'remote' && params[:by_target_domain].present?
   end
 
+  def status_scope
+    resolved = params.key?(:resolved)
+    unresolved = params.key?(:unresolved)
+
+    return Report.all if resolved && unresolved
+    return Report.resolved if resolved
+
+    Report.unresolved
+  end
+
   def scope_for(key, value)
     case key.to_sym
     when :by_target_domain
       Report.where(target_account: Account.where(domain: value))
-    when :resolved
-      Report.resolved
     when :account_id
       Report.where(account_id: value)
     when :target_account_id