X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8ee1351049ef1bb4d7b50d071b2a96154266d1d..dd1ec4eb9bd23c2e7d93451b41f3eda99ffb9f08:/app/controllers/message_controller.rb?ds=sidebyside diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index c039fe636..c6a269a06 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -2,58 +2,78 @@ class MessageController < ApplicationController 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] - # Allow the user to write a new message to another user. This action also + # 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 user_id param is the id of the user that the message is being sent to. + # The display_name param is the display name of the user that the message is being sent to. def new - @title = 'send message' - @to_user = User.find(params[:user_id]) if params[:message] - @message = Message.new(params[:message]) - @message.to_user_id = @to_user.id - @message.from_user_id = @user.id - @message.sent_on = Time.now - - if @message.save - flash[:notice] = 'Message sent' - Notifier::deliver_message_notification(@message) - 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 = Message.new(params[:message]) + @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 + end end else - @title = params[:title] + @title = t 'message.new.title' end - rescue ActiveRecord::RecordNotFound - render :action => 'no_such_user', :status => :not_found end # Allow the user to reply to another message. def reply - message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) - @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" - @title = "Re: #{message.title.sub(/^Re:\s*/, '')}" - @user_id = message.from_user_id - @to_user = User.find(message.to_user_id) - render :action => 'new' + message = Message.find(params[:message_id]) + + if message.to_user_id == @user.id then + 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) + + 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 - render :action => 'no_such_user', :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 = 'read message' - @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) - @message.message_read = true if @message.to_user_id == @user.id - @message.save + @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 + @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 :action => 'no_such_user', :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' + @title = t 'message.inbox.title' if @user and params[:display_name] == @user.display_name else redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name @@ -62,7 +82,7 @@ class MessageController < ApplicationController # Display the list of messages that the user has sent to other users. def outbox - @title = 'outbox' + @title = t 'message.outbox.title' if @user and params[:display_name] == @user.display_name else redirect_to :controller => 'message', :action => 'outbox', :display_name => @user.display_name @@ -71,23 +91,42 @@ class MessageController < ApplicationController # 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 = false - mark_type = 'unread' - else - message_read = true - mark_type = 'read' + @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 + if not request.xhr? + flash[:notice] = notice + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end - message.message_read = message_read - if message.save - flash[:notice] = "Message marked as #{mark_type}" + 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 + 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 end end rescue ActiveRecord::RecordNotFound - render :action => 'no_such_user', :status => :not_found + @title = t'message.no_such_message.title' + render :action => 'no_such_message', :status => :not_found end end