X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98a86836d27cead19b4024427ee33beed66cdb48..5275794aec3e4d06292db57afe6ee2e742be7b0b:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 2e5e09b45..6e0c717b5 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -12,22 +12,32 @@ class MessageController < ApplicationController # clicks send. # The display_name param is the display name of the user that the message is being sent to. def new - @title = t 'message.new.title' @to_user = User.find_by_display_name(params[:display_name]) if @to_user 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.getutc + 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 = @to_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::deliver_message_notification(@message) - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + 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] + if params[:title] + # ?title= is set when someone reponds to this user's diary + # entry. Then we pre-fill out the subject and the + @title = @subject = params[:title] + else + # The default /message/new/$user view + @title = t 'message.new.title' + end end else @title = t'message.no_such_user.title' @@ -37,25 +47,38 @@ class MessageController < ApplicationController # 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*/, '')}" - @to_user = User.find(message.from_user_id) - render :action => 'new' + 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*/, '')}" + @to_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 - @title = t'message.no_such_user.title' - 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 = t 'message.read.title' - @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 + @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 - @title = t'message.no_such_user.title' - 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. @@ -80,7 +103,7 @@ class MessageController < ApplicationController def mark if params[:message_id] id = params[:message_id] - message = Message.find_by_id(id) + message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first if params[:mark] == 'unread' message_read = false notice = t 'message.mark.as_unread' @@ -90,12 +113,42 @@ class MessageController < ApplicationController end message.message_read = message_read if message.save - flash[:notice] = notice - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + if request.xhr? + render :update do |page| + page.replace "inboxanchor", :partial => "layouts/inbox" + page.replace "inbox-count", :partial => "message_count" + page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message + end + else + flash[:notice] = notice + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name + end + end + 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 + if params[:message_id] + id = params[:message_id] + message = Message.where(:id => id).where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).first + 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 end rescue ActiveRecord::RecordNotFound - @title = t'message.no_such_user.title' - 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