Merge remote-tracking branch 'upstream/pull/4732'

[rails.git] / app / controllers / messages_controller.rb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index fd8cf7cf95f94c7f7780497fd83d3e1a8b561db7..d231fddde32945eff8a7454e3d7a09d37318bfc6 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,4 +1,6 @@
 class MessagesController < ApplicationController
 class MessagesController < ApplicationController

+  include UserMethods
+

   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web


@@ -28,10 +30,7 @@ class MessagesController < ApplicationController
     render :action => "no_such_message", :status => :not_found
   end
 
     render :action => "no_such_message", :status => :not_found
   end
 

-  # 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.
+  # Allow the user to write a new message to another user.

   def new
     @message = Message.new(message_params.merge(:recipient => @user))
     @title = t ".title"
   def new
     @message = Message.new(message_params.merge(:recipient => @user))
     @title = t ".title"


@@ -48,7 +47,7 @@ class MessagesController < ApplicationController
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"

-      UserMailer.message_notification(@message).deliver_later
+      UserMailer.message_notification(@message).deliver_later if @message.notify_recipient?

       redirect_to :action => :inbox
     else
       @title = t "messages.new.title"
       redirect_to :action => :inbox
     else
       @title = t "messages.new.title"


@@ -58,15 +57,15 @@ class MessagesController < ApplicationController
 
   # Destroy the message.
   def destroy
 
   # Destroy the message.
   def destroy

-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
+    @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
     @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?
+    if @message.save

       flash[:notice] = t ".destroyed"
 
       referer = safe_referer(params[:referer]) if params[:referer]
 
       flash[:notice] = t ".destroyed"
 
       referer = safe_referer(params[:referer]) if params[:referer]
 

-      redirect_to referer || { :action => :inbox }
+      redirect_to referer || { :action => :inbox }, :status => :see_other

     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"


@@ -108,9 +107,16 @@ class MessagesController < ApplicationController
     @title = t ".title"
   end
 
     @title = t ".title"
   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
   # 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 = Message.where(:recipient => current_user).or(Message.where(:sender => current_user)).find(params[:message_id])

     if params[:mark] == "unread"
       message_read = false
       notice = t ".as_unread"
     if params[:mark] == "unread"
       message_read = false
       notice = t ".as_unread"


@@ -119,15 +125,32 @@ class MessagesController < ApplicationController
       notice = t ".as_read"
     end
     @message.message_read = message_read
       notice = t ".as_read"
     end
     @message.message_read = message_read

-    if @message.save && !request.xhr?
+    if @message.save

       flash[:notice] = notice
       flash[:notice] = notice

-      redirect_to :action => :inbox
+      redirect_back_or_to inbox_messages_path, :status => :see_other

     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
     end
   rescue ActiveRecord::RecordNotFound
     @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 

+  # Moves message into Inbox by unsetting the muted-flag
+  def unmute
+    message = current_user.muted_messages.find(params[:message_id])
+
+    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
+  end
+

   private
 
   ##
   private
 
   ##