X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..4709d90594c3cc35b4bb4f8db259abf9f89c2fe6:/app/controllers/message_controller.rb?ds=sidebyside diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 94bee5d35..f4c465c93 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -1,35 +1,36 @@ class MessageController < ApplicationController - layout 'site' + layout "site" - before_filter :authorize_web - before_filter :set_locale - before_filter :require_user - before_filter :lookup_this_user, :only => [:new] - before_filter :check_database_readable - before_filter :check_database_writable, :only => [:new, :reply, :mark] + before_action :authorize_web + before_action :set_locale + before_action :require_user + before_action :lookup_this_user, :only => [:new] + before_action :check_database_readable + before_action :check_database_writable, :only => [:new, :reply, :mark] # 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 params[:message] + if request.post? if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR - flash[:error] = t 'message.new.limit_exceeded' + flash[:error] = t "message.new.limit_exceeded" else - @message = Message.new(params[:message]) + @message = Message.new(message_params) @message.to_user_id = @this_user.id @message.from_user_id = @user.id @message.sent_on = Time.now.getutc if @message.save - flash[:notice] = t 'message.new.message_sent' - Notifier.message_notification(@message).deliver - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + flash[:notice] = t "message.new.message_sent" + Notifier.message_notification(@message).deliver_now + redirect_to :action => "inbox", :display_name => @user.display_name end end else - @title = t 'message.new.title' + @message ||= Message.new(message_params.merge(:recipient => @this_user)) + @title = t "message.new.title" end end @@ -37,94 +38,108 @@ class MessageController < ApplicationController def reply message = Message.find(params[:message_id]) - if message.to_user_id == @user.id then - @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) + if message.to_user_id == @user.id + message.update(:message_read => true) - render :action => 'new' + @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 - flash[:notice] = t 'message.reply.wrong_user', :user => @user.display_name + flash[:notice] = t "message.reply.wrong_user", :user => @user.display_name redirect_to :controller => "user", :action => "login", :referer => request.fullpath end rescue ActiveRecord::RecordNotFound - @title = t'message.no_such_message.title' - render :action => 'no_such_message', :status => :not_found + @title = t "message.no_such_message.title" + render :action => "no_such_message", :status => :not_found end # Show a message def read - @title = t 'message.read.title' + @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 - flash[:notice] = t 'message.read.wrong_user', :user => @user.display_name + flash[:notice] = t "message.read.wrong_user", :user => @user.display_name redirect_to :controller => "user", :action => "login", :referer => request.fullpath end rescue ActiveRecord::RecordNotFound - @title = t'message.no_such_message.title' - render :action => 'no_such_message', :status => :not_found + @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 + @title = t "message.inbox.title" + if @user && params[:display_name] == @user.display_name else - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + redirect_to :action => "inbox", :display_name => @user.display_name end end # 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 + @title = t "message.outbox.title" + if @user && params[:display_name] == @user.display_name else - redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name + redirect_to :action => "outbox", :display_name => @user.display_name end end # Set the message as being read or unread. def mark @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) - if params[:mark] == 'unread' + if params[:mark] == "unread" message_read = false - notice = t 'message.mark.as_unread' + notice = t "message.mark.as_unread" else message_read = true - notice = t 'message.mark.as_read' + notice = t "message.mark.as_read" end @message.message_read = message_read - if @message.save - if not request.xhr? - flash[:notice] = notice - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end + if @message.save && !request.xhr? + flash[:notice] = notice + redirect_to :action => "inbox", :display_name => @user.display_name end rescue ActiveRecord::RecordNotFound - @title = t'message.no_such_message.title' - render :action => 'no_such_message', :status => :not_found + @title = t "message.no_such_message.title" + render :action => "no_such_message", :status => :not_found end # Delete the message. def delete - 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 - flash[:notice] = t 'message.delete.deleted' + @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 && !request.xhr? + flash[:notice] = t "message.delete.deleted" if params[:referer] redirect_to params[:referer] else - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + redirect_to :action => "inbox", :display_name => @user.display_name end end rescue ActiveRecord::RecordNotFound - @title = t'message.no_such_message.title' - render :action => 'no_such_message', :status => :not_found + @title = t "message.no_such_message.title" + render :action => "no_such_message", :status => :not_found + end + + private + + ## + # return permitted message parameters + def message_params + params.require(:message).permit(:title, :body) + rescue ActionController::ParameterMissing + ActionController::Parameters.new.permit(:title, :body) end end