From becd1521b5cd186e68ea2992e8ca2972fb5bca59 Mon Sep 17 00:00:00 2001
From: Noiob <noiob@users.noreply.github.con>
Date: Wed, 22 Aug 2018 18:20:31 -0700
Subject: [PATCH] Whitelist fixes

---
 app/javascript/core/common.js          |  3 +++
 app/javascript/styles/application.scss |  2 --
 app/javascript/styles/custom.scss      |  2 --
 app/javascript/styles/whitelist.scss   | 20 ++++++++++----------
 app/models/domain_whitelist.rb         |  3 +--
 app/views/about/_whitelist.html.haml   |  3 ++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/javascript/core/common.js b/app/javascript/core/common.js
index 3b038ca40..2e284b781 100644
--- a/app/javascript/core/common.js
+++ b/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';
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index baab8a49a..0990a4f25 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -24,5 +24,3 @@
 @import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
-
-@import 'whitelist.scss';
\ No newline at end of file
diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/custom.scss
index bd04ca1f1..56afeb1b7 100644
--- a/app/javascript/styles/custom.scss
+++ b/app/javascript/styles/custom.scss
@@ -88,5 +88,3 @@
     margin: 0 !important
     }
 }
-
-@import 'whitelist.scss';
\ No newline at end of file
diff --git a/app/javascript/styles/whitelist.scss b/app/javascript/styles/whitelist.scss
index 4320dce7c..121e76878 100644
--- a/app/javascript/styles/whitelist.scss
+++ b/app/javascript/styles/whitelist.scss
@@ -1,15 +1,15 @@
 #whitelist {
-    ul {
-      columns: 3 250px;
-    }
+  ul {
+    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;
-    }
-  }
\ No newline at end of file
+}
diff --git a/app/models/domain_whitelist.rb b/app/models/domain_whitelist.rb
index 4229f5495..db68c4d3e 100644
--- a/app/models/domain_whitelist.rb
+++ b/app/models/domain_whitelist.rb
@@ -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
diff --git a/app/views/about/_whitelist.html.haml b/app/views/about/_whitelist.html.haml
index a0422fb2c..08895cf7e 100644
--- a/app/views/about/_whitelist.html.haml
+++ b/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)' : '')