Fix most auto-correctable rubocop issues

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 38c9b2f3db05b2594a9fe43a100a1e0b6f3dc6c8..3cc80c190bee4b015df0e3d2148adadd3f649842 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -24,25 +24,30 @@ class MessageController < ApplicationController
 
         if @message.save
           flash[:notice] = t 'message.new.message_sent'
-          Notifier.message_notification(@message).deliver
+          Notifier.message_notification(@message).deliver_now
           redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
         end
       end
-    else
-      @title = t 'message.new.title'
     end
+
+    @message ||= Message.new(:recipient => @this_user)
+    @title = t 'message.new.title'
   end
 
   # Allow the user to reply to another message.
   def reply
     message = Message.find(params[:message_id])
 
-    if message.to_user_id == @user.id then
+    if message.to_user_id == @user.id
       message.update_attribute(:message_read, true)
 
-      @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
-      @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
-      @this_user = User.find(message.from_user_id)
+      @message = Message.new(
+        :recipient => message.sender,
+        :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
+        :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
+      )
+
+      @title = @message.title
 
       render :action => 'new'
     else
@@ -50,7 +55,7 @@ class MessageController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_message.title'
+    @title = t 'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
 
@@ -59,7 +64,7 @@ class MessageController < ApplicationController
     @title = t 'message.read.title'
     @message = Message.find(params[:message_id])
 
-    if @message.to_user_id == @user.id or @message.from_user_id == @user.id then
+    if @message.to_user_id == @user.id || @message.from_user_id == @user.id
       @message.message_read = true if @message.to_user_id == @user.id
       @message.save
     else
@@ -67,14 +72,14 @@ class MessageController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_message.title'
+    @title = t 'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
 
   # Display the list of messages that have been sent to the user.
   def inbox
     @title = t 'message.inbox.title'
-    if @user and params[:display_name] == @user.display_name
+    if @user && params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
     end
@@ -83,7 +88,7 @@ class MessageController < ApplicationController
   # Display the list of messages that the user has sent to other users.
   def outbox
     @title = t 'message.outbox.title'
-    if @user and params[:display_name] == @user.display_name
+    if @user && params[:display_name] == @user.display_name
     else
       redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name
     end
@@ -100,12 +105,12 @@ class MessageController < ApplicationController
       notice = t 'message.mark.as_read'
     end
     @message.message_read = message_read
-    if @message.save and not request.xhr?
+    if @message.save && !request.xhr?
       flash[:notice] = notice
       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_message.title'
+    @title = t 'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
 
@@ -114,7 +119,7 @@ class MessageController < ApplicationController
     @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id])
     @message.from_user_visible = false if @message.sender == @user
     @message.to_user_visible = false if @message.recipient == @user
-    if @message.save and not request.xhr?
+    if @message.save && !request.xhr?
       flash[:notice] = t 'message.delete.deleted'
 
       if params[:referer]
@@ -124,10 +129,12 @@ class MessageController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_message.title'
+    @title = t 'message.no_such_message.title'
     render :action => 'no_such_message', :status => :not_found
   end
-private
+
+  private
+
   ##
   # return permitted message parameters
   def message_params