try again

gkiely · Nov 4, 2018 · 091da1b · 091da1b
1 parent a0cf361
commit 091da1b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/app/controllers/i/posts_controller.rb b/app/controllers/i/posts_controller.rb
@@ -1,7 +1,12 @@
 class I::PostsController < ApplicationController
   def index
+    logger.debug "---------"
+    logger.debug "---------"
+    logger.debug request.host
+    logger.debug "---------"
+    logger.debug "---------"
     redirect_to google_drive_authorize_path if current_user && current_user.google_auth_token.nil?
-    @user = User.find_by(username: subdomain_or_param)
+    @user = User.find_by(username: host_or_param)
     return redirect_to root_path unless @user
 
     if params[:drafts]
@@ -12,7 +17,7 @@ def index
   end
 
   def show
-    @user = User.find_by(username: subdomain_or_param)
+    @user = User.find_by(username: host_or_param)
     return redirect_to root_path unless @user
 
     @post = @user.posts.friendly.find(params[:post_id])
@@ -27,16 +32,11 @@ def show
   private
 
   def subdomain_or_param
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    logger.debug request.host
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    logger.debug "-----------------"
-    (request.subdomain.present? && request.subdomain != "www") ? User::DOMAIN_MAPPING[request.subdomain] : params[:username]
+    (request.subdomain.present? && request.subdomain != "www") ? request.subdomain : params[:username]
+  end
+
+  def host_or_param
+    (request.host.present? && request.host != "localhost" && request.host != "youdontneedwp.com" && request.host != "www.youdontneedwp.com") ? User::DOMAIN_MAPPING[request.host] : params[:username]
   end
 
   def parse_links(doc)

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,11 +1,16 @@
 Rails.application.routes.draw do
   devise_for :users
 
-  constraints(subdomain: 'patwalls.co') do
+  constraints(subdomain: 'patwalls') do
     root "i/posts#index", as: 'subdomain_blog_index'
     get '/:post_id', to: 'i/posts#show', as: 'subdomain_blog_show'
   end
 
+  constraints(host: 'patwalls.co') do
+    root "i/posts#index", as: 'host_blog_index'
+    get '/:post_id', to: 'i/posts#show', as: 'host_blog_show'
+  end
+
   root 'welcome#index'
 
   resource :profile, only: [:show], controller: 'profile'