diff options
author | multiple creatures <dev@multiple-creature.party> | 2019-02-16 22:13:00 +0000 |
---|---|---|
committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:21 -0500 |
commit | 28c9b9ce6a56a06a4c6e2e5192b1984d99ee9047 (patch) | |
tree | a75da71366a322b544ef696e65487fce4a58fc01 /app/models | |
parent | 10b20607aced6ffe541b2d33af2b450fe6803992 (diff) |
improve filtering
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |