0
@@ -6,8 +6,12 @@ class MessagesController < ApplicationController
0
   skip_filter :update_online_at, :get_layout_vars, :only => [:create, :more, :refresh, :refresh_chatters]
0
   
0
   def index
0
-    @messages = Message.get(session[:online_at])
0
-    current_user.update_attribute('chatting_at', Time.now.utc) if logged_in?
0
+    if logged_in?
0
+      @messages = Message.get(current_user.chatting_at)
0
+      current_user.update_attribute('chatting_at', Time.now.utc)
0
+    else
0
+      @messages = Message.get
0
+    end
0
     @chatters = User.chatting
0
     unless @messages.empty?
0
       session[:message_id] = @messages.map(&:id).max

0
@@ -15,7 +15,14 @@ class MessagesControllerTest < ActionController::TestCase
0
     assert_response :success
0
     assert assigns(:messages)
0
   end
0
-
0
+  
0
+  def test_should_get_index_if_logged_in
0
+    login_as :trevor
0
+    get :index
0
+    assert_response :success
0
+    assert assigns(:messages)
0
+  end
0
+  
0
   def test_should_not_get_new_if_logged_in
0
     login_as :trevor
0
     get :new