From ff4eee25bc9ab87b5a615543530519b9cffa134e Mon Sep 17 00:00:00 2001
From: Sam Dodrill <xena@yolo-swag.com>
Date: Thu, 8 Jan 2015 13:21:26 -0800
Subject: [PATCH] Use a before_filter to simplify controller logic

---
 app.moon               | 9 +++++++++
 controllers/users.moon | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app.moon b/app.moon
index 97306ff..84da1f5 100644
--- a/app.moon
+++ b/app.moon
@@ -1,9 +1,18 @@
 lapis = require "lapis"
 
+require "models.user"
+
 class App extends lapis.Application
   @include "controllers.users"
   @include "controllers.freeswitch"
 
+  @before_filter =>
+    @current_user = Users\read_session @
+
+    if @session.flash
+      @flash = @session.flash
+      @session.flash = nil
+
   [index: "/"]: =>
     @user = @session.user
     render: true
diff --git a/controllers/users.moon b/controllers/users.moon
index 3c39723..93e4ec3 100644
--- a/controllers/users.moon
+++ b/controllers/users.moon
@@ -10,13 +10,9 @@ require "models.user"
 
 class User extends lapis.Application
   [list: "/list"]: =>
-    if @session.user
-      if not Users\find id: @session.user
-        @write redirect_to: @url_for "login"
-    else
+    if not @current_user
       @write redirect_to: @url_for "login"
 
-    user = Users\find id: @session.user
     @list = Users\select!
     render: true