Whitelist fixes

app/javascript/core/common.js

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

app/javascript/styles/application.scss

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

app/javascript/styles/custom.scss

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

app/javascript/styles/whitelist.scss

@@ -1,15 +1,15 @@
 #whitelist {
-    ul {
+  ul {
-      columns: 3 250px;
+    columns: 3 250px;
-    }
   }
+}
   
+#whitelist-column {
+  grid-row: 4;
+}
+  
+@media screen and (max-width: 415px) {
   #whitelist-column {
-    grid-row: 4;
+    grid-row: 5;
   }
-  
+}
-  @media screen and (max-width: 415px) {
-    #whitelist-column {
-      grid-row: 5;
-    }
-  }

app/models/domain_whitelist.rb

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

app/views/about/_whitelist.html.haml

@@ -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)' : '')