From 28c9b9ce6a56a06a4c6e2e5192b1984d99ee9047 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sat, 16 Feb 2019 22:13:00 +0000
Subject: improve filtering

---
 app/models/status.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/status.rb b/app/models/status.rb
index 157986e24..80a3c8208 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -295,7 +295,7 @@ class Status < ApplicationRecord
 
   after_create :set_poll_id
 
-  after_find :limit_visibility
+  after_find :limit_domain_visibility
 
   class << self
     def selectable_visibilities
@@ -551,11 +551,11 @@ class Status < ApplicationRecord
     self.sensitive  = false if sensitive.nil?
   end
 
-  def limit_visibility
+  def limit_domain_visibility
     return unless has_attribute?(:uri) && !uri.nil?
     domain = Addressable::URI.parse(uri).host
     self.sensitive = true if domain.in?(FORCE_SENSITIVE)
-    self.visibility = :unlisted if domain.in?(FORCE_UNLISTED)
+    self.visibility = :unlisted if public_visibility? && domain.in?(FORCE_UNLISTED)
   end
 
   def set_locality
-- 
cgit