X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..refs/heads/master:/app/controllers/messages_controller.rb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 13a395da8..1979c9edc 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,65 +1,18 @@
 class MessagesController < ApplicationController
+  include UserMethods
+
   layout "site"
 
   before_action :authorize_web
   before_action :set_locale
-  before_action :require_user
-  before_action :lookup_user, :only => [:new, :create]
-  before_action :check_database_readable
-  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
-    @message = Message.new(message_params.merge(:recipient => @user))
-    @title = t ".title"
-  end
+  authorize_resource
 
-  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])
-
-    if message.recipient == current_user
-      message.update(:message_read => true)
-
-      @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
+  before_action :lookup_user, :only => [:new, :create]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:new, :create, :destroy]
 
-      render :action => "new"
-    else
-      flash[:notice] = t ".wrong_user", :user => current_user.display_name
-      redirect_to :controller => "users", :action => "login", :referer => request.fullpath
-    end
-  rescue ActiveRecord::RecordNotFound
-    @title = t "messages.no_such_message.title"
-    render :action => "no_such_message", :status => :not_found
-  end
+  allow_thirdparty_images :only => [:new, :create, :show]
 
   # Show a message
   def show
@@ -71,56 +24,49 @@ class MessagesController < ApplicationController
       @message.save
     else
       flash[:notice] = t ".wrong_user", :user => current_user.display_name
-      redirect_to :controller => "users", :action => "login", :referer => request.fullpath
+      redirect_to login_path(:referer => request.fullpath)
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.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
+  # Allow the user to write a new message to another user.
+  def new
+    @message = Message.new(message_params.merge(:recipient => @user))
     @title = t ".title"
   end
 
-  # Display the list of messages that the user has sent to other users.
-  def outbox
-    @title = t ".title"
-  end
+  def create
+    @message = Message.new(message_params)
+    @message.recipient = @user
+    @message.sender = current_user
+    @message.sent_on = Time.now.utc
 
-  # Set the message as being read or unread.
-  def mark
-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
-    if params[:mark] == "unread"
-      message_read = false
-      notice = t ".as_unread"
+    if current_user.sent_messages.where(:sent_on => Time.now.utc - 1.hour..).count >= current_user.max_messages_per_hour
+      flash.now[:error] = t ".limit_exceeded"
+      render :action => "new"
+    elsif @message.save
+      flash[:notice] = t ".message_sent"
+      UserMailer.message_notification(@message).deliver_later if @message.notify_recipient?
+      redirect_to messages_outbox_path
     else
-      message_read = true
-      notice = t ".as_read"
-    end
-    @message.message_read = message_read
-    if @message.save && !request.xhr?
-      flash[:notice] = notice
-      redirect_to :action => :inbox
+      @title = t "messages.new.title"
+      render :action => "new"
     end
-  rescue ActiveRecord::RecordNotFound
-    @title = t "messages.no_such_message.title"
-    render :action => "no_such_message", :status => :not_found
   end
 
   # Destroy the message.
   def destroy
-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
+    @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user.id)).find(params[:id])
     @message.from_user_visible = false if @message.sender == current_user
     @message.to_user_visible = false if @message.recipient == current_user
-    if @message.save && !request.xhr?
+    if @message.save
       flash[:notice] = t ".destroyed"
 
-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :action => :inbox
-      end
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      redirect_to referer || messages_inbox_path, :status => :see_other
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"