X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/30c20855e3434fd296af9d1880e5246d038dd3e4..aba28ec9e0fef281d0228cfd6b5fc4986c8e2f18:/app/controllers/message_controller.rb?ds=inline diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index f52274cd0..97e892156 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -1,65 +1,143 @@ class MessageController < ApplicationController - layout 'site' + layout "site" - before_filter :authorize_web - before_filter :require_user + 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 - @title = 'send message' if params[:message] - to_user = User.find(params[:user_id]) - body = params[:message][:body] - title = params[:message][:title] - message = Message.new - message.body = body - message.title = title - message.to_user_id = params[:user_id] - message.from_user_id = @user.id - message.sent_on = Time.now - - if message.save - flash[:notice] = 'Message sent' - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR + flash[:error] = t "message.new.limit_exceeded" else - @message.errors.add("Sending message failed") + @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_now + redirect_to :action => "inbox", :display_name => @user.display_name + end end + 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 + message.update_attribute(: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 + render :action => "new" + else + 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 end + # Show a message def read - @title = 'read message' - @message = Message.find(params[:message_id], :conditions => ["to_user_id = ?", @user.id]) - @message.message_read = 1 - @message.save + @title = t "message.read.title" + @message = Message.find(params[:message_id]) + + 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 + redirect_to :controller => "user", :action => "login", :referer => request.fullpath + end rescue ActiveRecord::RecordNotFound - render :nothing => true, :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 = 'inbox' - 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 && params[:display_name] == @user.display_name + else + redirect_to :action => "outbox", :display_name => @user.display_name + end + end + + # Set the message as being read or unread. def mark - if params[:message_id] - id = params[:message_id] - message = Message.find_by_id(id) - if params[:mark] == 'unread' - message_read = 0 - mark_type = 'unread' + @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) + if params[:mark] == "unread" + message_read = false + notice = t "message.mark.as_unread" + else + message_read = true + notice = t "message.mark.as_read" + end + @message.message_read = message_read + 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 + 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 && !request.xhr? + flash[:notice] = t "message.delete.deleted" + + if params[:referer] + redirect_to params[:referer] else - message_read = 1 - mark_type = 'read' - end - message.message_read = message_read - if message.save - flash[:notice] = "Message marked as #{mark_type}" - 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 + end + + private + + ## + # return permitted message parameters + def message_params + params.require(:message).permit(:title, :body) end end