X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c79240a6ab23e4103826dd1cec7a12a19e948db..eac7348ad2793cb3ad72c68bef84ff863af92d5f:/app/controllers/message_controller.rb?ds=sidebyside diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 9b678e274..435c3fa78 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -2,65 +2,139 @@ class MessageController < ApplicationController layout 'site' before_filter :authorize_web + before_filter :set_locale before_filter :require_user + 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 + # 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 + @to_user = User.find_by_display_name(params[:display_name]) + if @to_user + if params[:message] + if @user.sent_messages.count(:conditions => ["sent_on >= ?", Time.now.getutc - 1.hour]) >= APP_CONFIG['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 + end + end else - @message.errors.add("Sending message failed") + 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' + render :action => 'no_such_user', :status => :not_found end 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 = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}" + @to_user = User.find(message.from_user_id) + render :action => 'new' + rescue ActiveRecord::RecordNotFound + @title = t'message.no_such_user.title' + render :action => 'no_such_user', :status => :not_found + end + + # Show a message def read - @title = 'read message' - if params[:message_id] - id = params[:message_id] - @message = Message.find_by_id(id) - @message.message_read = 1 - @message.save - end + @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 + rescue ActiveRecord::RecordNotFound + @title = t'message.no_such_user.title' + render :action => 'no_such_user', :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 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 + else + redirect_to :controller => 'message', :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_read = false + notice = t 'message.mark.as_unread' else - message_read = 1 - mark_type = 'read' + message_read = true + notice = t 'message.mark.as_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 + if request.xhr? + render :update do |page| + 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_user.title' + render :action => 'no_such_user', :status => :not_found + end + + # Delete the message. + def delete + if params[:message_id] + id = params[:message_id] + message = Message.find_by_id(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 end + rescue ActiveRecord::RecordNotFound + @title = t'message.no_such_user.title' + render :action => 'no_such_user', :status => :not_found end end