Whitelist fixes

master
Noiob 2018-08-22 18:20:31 -07:00
parent d8a41ae155
commit becd1521b5
6 changed files with 16 additions and 17 deletions

View File

@ -3,3 +3,6 @@
import 'font-awesome/css/font-awesome.css';
require.context('../images/', true);
//awoo customization
import 'styles/whitelist.scss';

View File

@ -24,5 +24,3 @@
@import 'mastodon/dashboard';
@import 'mastodon/rtl';
@import 'mastodon/accessibility';
@import 'whitelist.scss';

View File

@ -88,5 +88,3 @@
margin: 0 !important
}
}
@import 'whitelist.scss';

View File

@ -14,8 +14,7 @@ class DomainWhitelist < ApplicationRecord
end
def self.silenced?(domain)
whitelist = where(domain: domain)
whitelist.exists? && whitelist[0].severity == :silence
where(domain: domain, severity: silence).exists?
end
before_validation :normalize_domain

View File

@ -6,4 +6,5 @@
- @instance_presenter.whitelist.each do |site|
.whitelist-site
%li
= link_to site.domain + (DomainWhitelist.silenced?(site.domain) ? ' (silenced)' : ''), 'https://' + site.domain
= link_to site.domain, 'https://' + site.domain
= raw(AllowDomainService.silenced?(site.domain) ? ' (silenced)' : '')