X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b625eefdeb55822c7d4a4dafa6473c8ac537ef48..7d4cc85a312cb79fd1c4b0f22626722bea1d736d:/app/controllers/messages_controller.rb?ds=inline diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 111a31f96..7d86796b1 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -11,7 +11,8 @@ class MessagesController < ApplicationController before_action :lookup_user, :only => [:new, :create] before_action :check_database_readable before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy] - before_action :allow_thirdparty_images, :only => [:new, :create, :show] + + allow_thirdparty_images :only => [:new, :create, :show] # Show a message def show @@ -42,7 +43,7 @@ class MessagesController < ApplicationController @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 + 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 @@ -87,6 +88,16 @@ class MessagesController < ApplicationController @title = @message.title + render :action => "new" + 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(/^/, '> ')}" + ) + + @title = @message.title + render :action => "new" else flash[:notice] = t ".wrong_user", :user => current_user.display_name @@ -116,7 +127,7 @@ class MessagesController < ApplicationController # Set the message as being read or unread. def mark - @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user)).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" @@ -127,7 +138,11 @@ class MessagesController < ApplicationController @message.message_read = message_read if @message.save flash[:notice] = notice - redirect_to inbox_messages_path, :status => :see_other + 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 "messages.no_such_message.title"