From a64c123a8cf650912d224c1911d532af79670ef7 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sun, 9 Nov 2014 16:59:10 -0800
Subject: [PATCH 1/2] strengthen banning

---
 app.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app.rb b/app.rb
index 338c0dcd..999ac4cc 100644
--- a/app.rb
+++ b/app.rb
@@ -1546,8 +1546,9 @@ end
 
 def require_login
   redirect '/' unless signed_in?
-  if current_site.is_banned || parent_site.is_banned
+  if session[:banned] || current_site.is_banned || parent_site.is_banned
     session[:id] = nil
+    session[:banned] = true
     redirect '/'
   end
 end
@@ -1567,9 +1568,10 @@ def parent_site
 end
 
 def require_unbanned_ip
-  if Site.banned_ip?(request.ip)
+  if session[:banned] || Site.banned_ip?(request.ip)
     session[:id] = nil
-    flash[:error] = 'Your IP address has been banned due to misconduct/spam. '+
+    session[:banned] = true
+    flash[:error] = 'Site creation has been banned due to ToS violation/spam. '+
     'If you believe this to be in error, <a href="/contact">contact the site admin</a>.'
     return {result: 'error'}.to_json
   end

From 9d6e2566dd6ddffba522ab236e24f53c3b502dc9 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Sun, 9 Nov 2014 17:11:07 -0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=81=84=E3=81=8D=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=82=87=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/plan/_pricing.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb
index 4c761156..f5d1656f 100644
--- a/views/plan/_pricing.erb
+++ b/views/plan/_pricing.erb
@@ -82,7 +82,7 @@
 
       <div class="col col-25 catbus">
 
-        <div class="plan-image" data-original-title="VROOOOOOM!"></div>
+        <div class="plan-image" data-original-title="いきましょう"></div>
         <h3>Cat Bus</h3>
         <div class="price">$<%= Site::PLAN_FEATURES[:catbus][:price] %></div>
         <div class="interval">per month</div>