X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0f111aced146d78b4c31a6175c0150bc6497c50..291350850de00bb32080c70e06599bf41eabd782:/app/controllers/message_controller.rb diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 155e619d7..e1062bc9f 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -10,36 +10,46 @@ class MessageController < ApplicationController # 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 = t 'message.new.title' - @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.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 + @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 @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 + end + else + if params[:title] + # ?title= is set when someone reponds to this user's diary + # entry. Then we pre-fill out the subject and the