Handle 404 more responsibly

sigids · Apr 28, 2017 · a2af065 · a2af065
1 parent 1c85d7e
commit a2af065
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -15,5 +15,11 @@ def configure_permitted_parameters
     devise_parameter_sanitizer.permit(:sign_in, keys: [:email, :remember_me])
   end
 
+  def render_404
+    respond_to do |format|
+      format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found }
+    end
+  end
+
   include PublicActivity::StoreController
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -47,7 +47,8 @@ def event_params
   end
 
   def set_event
-    @event = Event.find(params[:id])
+    @event = Event.find_by(id: params[:id])
+    render_404 and return unless @event && User.find_by(id: @event.user_id)
   end
 
   def set_user

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -37,7 +37,8 @@ def destroy
 
   private
   def set_post
-    @post = Post.find(params[:id])
+    @post = Post.find_by(id: params[:id])
+    render_404 and return unless @post && User.find_by(id: @post.user_id)
   end
 
   def post_params