X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00bd64c7fb86d598eb9406e39f99fc711f58bf9b..325deabc916acab952089a4b093fa6bafa66083c:/app/controllers/messages_controller.rb?ds=sidebyside diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 11a71c3ee..7d86796b1 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -1,40 +1,78 @@ class MessagesController < ApplicationController + include UserMethods + layout "site" before_action :authorize_web before_action :set_locale - before_action :require_user - before_action :lookup_user, :only => [:new] + + authorize_resource + + before_action :lookup_user, :only => [:new, :create] before_action :check_database_readable - before_action :check_database_writable, :only => [:new, :reply, :mark] - before_action :allow_thirdparty_images, :only => [:new, :read] + before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy] - # 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 - if request.post? - if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR - flash[:error] = t ".limit_exceeded" - else - @message = Message.new(message_params) - @message.recipient = @user - @message.sender = current_user - @message.sent_on = Time.now.getutc - - if @message.save - flash[:notice] = t ".message_sent" - Notifier.message_notification(@message).deliver_now - redirect_to :action => "inbox", :display_name => current_user.display_name - end - end + allow_thirdparty_images :only => [:new, :create, :show] + + # Show a message + def show + @title = t ".title" + @message = Message.find(params[:id]) + + if @message.recipient == current_user || @message.sender == current_user + @message.message_read = true if @message.recipient == current_user + @message.save + else + flash[:notice] = t ".wrong_user", :user => current_user.display_name + redirect_to login_path(:referer => request.fullpath) end + rescue ActiveRecord::RecordNotFound + @title = t "messages.no_such_message.title" + render :action => "no_such_message", :status => :not_found + end - @message ||= Message.new(message_params.merge(:recipient => @user)) + # Allow the user to write a new message to another user. + def new + @message = Message.new(message_params.merge(:recipient => @user)) @title = t ".title" end + def create + @message = Message.new(message_params) + @message.recipient = @user + @message.sender = current_user + @message.sent_on = Time.now.utc + + if current_user.sent_messages.where(:sent_on => Time.now.utc - 1.hour..).count >= current_user.max_messages_per_hour + flash.now[:error] = t ".limit_exceeded" + render :action => "new" + elsif @message.save + flash[:notice] = t ".message_sent" + UserMailer.message_notification(@message).deliver_later if @message.notify_recipient? + redirect_to :action => :inbox + else + @title = t "messages.new.title" + render :action => "new" + end + end + + # Destroy the message. + def destroy + @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user.id)).find(params[:id]) + @message.from_user_visible = false if @message.sender == current_user + @message.to_user_visible = false if @message.recipient == current_user + if @message.save + flash[:notice] = t ".destroyed" + + referer = safe_referer(params[:referer]) if params[:referer] + + redirect_to referer || { :action => :inbox }, :status => :see_other + end + rescue ActiveRecord::RecordNotFound + @title = t "messages.no_such_message.title" + render :action => "no_such_message", :status => :not_found + end + # Allow the user to reply to another message. def reply message = Message.find(params[:message_id]) @@ -51,53 +89,45 @@ class MessagesController < ApplicationController @title = @message.title render :action => "new" - else - flash[:notice] = t ".wrong_user", :user => current_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 + elsif message.sender == current_user + @message = Message.new( + :recipient => message.recipient, + :title => "Re: #{message.title.sub(/^Re:\s*/, '')}", + :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" + ) - # Show a message - def read - @title = t ".title" - @message = Message.find(params[:message_id]) + @title = @message.title - if @message.recipient == current_user || @message.sender == current_user - @message.message_read = true if @message.recipient == current_user - @message.save + render :action => "new" else flash[:notice] = t ".wrong_user", :user => current_user.display_name - redirect_to :controller => "user", :action => "login", :referer => request.fullpath + redirect_to login_path(:referer => request.fullpath) end rescue ActiveRecord::RecordNotFound - @title = t "message.no_such_message.title" + @title = t "messages.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 = t ".title" - if current_user && params[:display_name] == current_user.display_name - else - redirect_to :action => "inbox", :display_name => current_user.display_name - end end # Display the list of messages that the user has sent to other users. def outbox @title = t ".title" - if current_user && params[:display_name] == current_user.display_name - else - redirect_to :action => "outbox", :display_name => current_user.display_name - end + end + + # Display the list of muted messages received by the user. + def muted + @title = t ".title" + + redirect_to inbox_messages_path if current_user.muted_messages.none? end # Set the message as being read or unread. def mark - @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id]) + @message = current_user.messages.unscope(:where => :muted).find(params[:message_id]) if params[:mark] == "unread" message_read = false notice = t ".as_unread" @@ -106,32 +136,34 @@ class MessagesController < ApplicationController notice = t ".as_read" end @message.message_read = message_read - if @message.save && !request.xhr? + if @message.save flash[:notice] = notice - redirect_to :action => "inbox", :display_name => current_user.display_name + if @message.muted? + redirect_to muted_messages_path, :status => :see_other + else + redirect_to inbox_messages_path, :status => :see_other + end end rescue ActiveRecord::RecordNotFound - @title = t "message.no_such_message.title" + @title = t "messages.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 = ?", current_user.id, current_user.id).find(params[:message_id]) - @message.from_user_visible = false if @message.sender == current_user - @message.to_user_visible = false if @message.recipient == current_user - if @message.save && !request.xhr? - flash[:notice] = t ".deleted" + # Moves message into Inbox by unsetting the muted-flag + def unmute + message = current_user.muted_messages.find(params[:message_id]) - if params[:referer] - redirect_to params[:referer] - else - redirect_to :action => "inbox", :display_name => current_user.display_name - end + if message.unmute + flash[:notice] = t(".notice") + else + flash[:error] = t(".error") + end + + if current_user.muted_messages.none? + redirect_to inbox_messages_path + else + redirect_to muted_messages_path end - rescue ActiveRecord::RecordNotFound - @title = t "message.no_such_message.title" - render :action => "no_such_message", :status => :not_found end private