X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88ff81b694a238fa6b4a75612c45e75eb5241e89..4c7279ba1f55d059ecba3be9f059ee073d09e9e4:/app/controllers/messages_controller.rb?ds=sidebyside

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 651a67036..54850d403 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -4,37 +4,38 @@ class MessagesController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :require_user
-  before_action :lookup_user, :only => [:new]
+  before_action :lookup_user, :only => [:new, :create]
   before_action :check_database_readable
-  before_action :check_database_writable, :only => [:new, :reply, :mark, :destroy]
-  before_action :allow_thirdparty_images, :only => [:new, :show]
+  before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy]
+  before_action :allow_thirdparty_images, :only => [:new, :create, :show]
 
   # Allow the user to write a new message to another user. This action also
   # deals with the sending of that message to the other user when the user
   # clicks send.
   # The display_name param is the display name of the user that the message is being sent to.
   def new
-    if request.post?
-      if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
-        flash[:error] = t ".limit_exceeded"
-      else
-        @message = Message.new(message_params)
-        @message.recipient = @user
-        @message.sender = current_user
-        @message.sent_on = Time.now.getutc
-
-        if @message.save
-          flash[:notice] = t ".message_sent"
-          Notifier.message_notification(@message).deliver_now
-          redirect_to :action => :inbox
-        end
-      end
-    end
-
-    @message ||= Message.new(message_params.merge(:recipient => @user))
+    @message = Message.new(message_params.merge(:recipient => @user))
     @title = t ".title"
   end
 
+  def create
+    @message = Message.new(message_params)
+    @message.recipient = @user
+    @message.sender = current_user
+    @message.sent_on = Time.now.getutc
+
+    if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
+      flash[:error] = t ".limit_exceeded"
+      render :action => "new"
+    elsif @message.save
+      flash[:notice] = t ".message_sent"
+      Notifier.message_notification(@message).deliver_now
+      redirect_to :action => :inbox
+    else
+      render :action => "new"
+    end
+  end
+
   # Allow the user to reply to another message.
   def reply
     message = Message.find(params[:message_id])
@@ -56,7 +57,7 @@ class MessagesController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
@@ -73,7 +74,7 @@ class MessagesController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
@@ -103,7 +104,7 @@ class MessagesController < ApplicationController
       redirect_to :action => :inbox
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
@@ -122,7 +123,7 @@ class MessagesController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end