Unsubscribe from thread through link in email footer

8 files changed, 103 insertions, 84 deletions

diff --git a/app/controllers/sent_notifications_controller.rb b/app/controllers/sent_notifications_controller.rb
new file mode 100644
index 00000000000..93dcc16094f
--- /dev/null
+++ b/app/controllers/sent_notifications_controller.rb
@@ -0,0 +1,25 @@
+class SentNotificationsController < ApplicationController
+  skip_before_action :authenticate_user!
+
+  def unsubscribe
+    @sent_notification = SentNotification.for(params[:id])
+    return render_404 unless @sent_notification && !@sent_notification.for_commit?
+
+    noteable = @sent_notification.noteable
+    noteable.unsubscribe(@sent_notification.recipient)
+
+    flash[:notice] = "You have been unsubscribed from this thread."
+    if current_user
+      case @sent_notification.noteable
+      when Issue
+        redirect_to issue_path(noteable)
+      when MergeRequest
+        redirect_to merge_request_path(noteable)
+      else
+        redirect_to root_path
+      end
+    else
+      redirect_to new_user_session_path
+    end
+  end
+end
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index abdeefed5ef..4a88cb61132 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -1,31 +1,31 @@
 module Emails
   module Issues
     def new_issue_email(recipient_id, issue_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
-        mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id))
-      end
+      setup_issue_mail(issue_id, recipient_id)
+
+      mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id))
     end
 
     def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
-        @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
-        mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
-      end
+      setup_issue_mail(issue_id, recipient_id)
+
+      @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
+      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
     end
 
     def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
-        @updated_by = User.find updated_by_user_id
-        mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
-      end
+      setup_issue_mail(issue_id, recipient_id)
+
+      @updated_by = User.find updated_by_user_id
+      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
     end
 
     def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
-        @issue_status = status
-        @updated_by = User.find updated_by_user_id
-        mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
-      end
+      setup_issue_mail(issue_id, recipient_id)
+
+      @issue_status = status
+      @updated_by = User.find updated_by_user_id
+      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
     end
 
     private
@@ -38,14 +38,12 @@ module Emails
       }
     end
 
-    def issue_mail_with_notification(issue_id, recipient_id)
+    def setup_issue_mail(issue_id, recipient_id)
       @issue = Issue.find(issue_id)
       @project = @issue.project
       @target_url = namespace_project_issue_url(@project.namespace, @project, @issue)
 
-      yield
-
-      SentNotification.record(@issue, recipient_id, reply_key)
+      @sent_notification = SentNotification.record(@issue, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 7923fb770d0..325996e2e16 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -1,77 +1,64 @@
 module Emails
   module MergeRequests
     def new_merge_request_email(recipient_id, merge_request_id)
-      @merge_request = MergeRequest.find(merge_request_id)
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
       mail_new_thread(@merge_request,
                       from: sender(@merge_request.author_id),
                       to: recipient(recipient_id),
                       subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
-
-      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
       @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
-
-      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
       @updated_by = User.find updated_by_user_id
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
-
-      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
-      @merge_request = MergeRequest.find(merge_request_id)
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
-
-      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def merge_request_status_email(recipient_id, merge_request_id, status, updated_by_user_id)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
       @mr_status = status
-      @project = @merge_request.project
       @updated_by = User.find updated_by_user_id
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+    end
+
+    private
+
+    def setup_merge_request_mail(merge_request_id, recipient_id)
+      @merge_request = MergeRequest.find(merge_request_id)
+      @project = @merge_request.project
+      @target_url = namespace_project_merge_request_url(@project.namespace,
+                                                        @project,
+                                                        @merge_request)
 
-      SentNotification.record(@merge_request, recipient_id, reply_key)
+      @sent_notification = SentNotification.record(@merge_request, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index e1382d2da12..ccd33b880f7 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -1,31 +1,31 @@
 module Emails
   module Notes
     def note_commit_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
-        @commit = @note.noteable
-        @target_url = namespace_project_commit_url(*note_target_url_options)
-
-        mail_answer_thread(@commit,
-                           from: sender(@note.author_id),
-                           to: recipient(recipient_id),
-                           subject: subject("#{@commit.title} (#{@commit.short_id})"))
-      end
+      note_mail_with_notification(note_id, recipient_id)
+
+      @commit = @note.noteable
+      @target_url = namespace_project_commit_url(*note_target_url_options)
+
+      mail_answer_thread(@commit,
+                         from: sender(@note.author_id),
+                         to: recipient(recipient_id),
+                         subject: subject("#{@commit.title} (#{@commit.short_id})"))
     end
 
     def note_issue_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
-        @issue = @note.noteable
-        @target_url = namespace_project_issue_url(*note_target_url_options)
-        mail_answer_thread(@issue, note_thread_options(recipient_id))
-      end
+      note_mail_with_notification(note_id, recipient_id)
+
+      @issue = @note.noteable
+      @target_url = namespace_project_issue_url(*note_target_url_options)
+      mail_answer_thread(@issue, note_thread_options(recipient_id))
     end
 
     def note_merge_request_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
-        @merge_request = @note.noteable
-        @target_url = namespace_project_merge_request_url(*note_target_url_options)
-        mail_answer_thread(@merge_request, note_thread_options(recipient_id))
-      end
+      note_mail_with_notification(note_id, recipient_id)
+
+      @merge_request = @note.noteable
+      @target_url = namespace_project_merge_request_url(*note_target_url_options)
+      mail_answer_thread(@merge_request, note_thread_options(recipient_id))
     end
 
     private
@@ -46,9 +46,7 @@ module Emails
       @note = Note.find(note_id)
       @project = @note.project
 
-      yield
-
-      SentNotification.record_note(@note, recipient_id, reply_key)
+      @sent_notification = SentNotification.record_note(@note, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 3bbdd9cee76..e1cd075a978 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -107,10 +107,9 @@ class Notify < BaseMailer
     end
 
     headers["X-GitLab-#{model.class.name}-ID"] = model.id
+    headers['X-GitLab-Reply-Key'] = reply_key
 
-    if reply_key
-      headers['X-GitLab-Reply-Key'] = reply_key
-
+    if Gitlab::IncomingEmail.enabled?
       address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key))
       address.display_name = @project.name_with_namespace
 
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 18a00f95b48..04650a9e67a 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -119,6 +119,12 @@ module Issuable
       update(subscribed: !subscribed?(user))
   end
 
+  def unsubscribe(user)
+    subscriptions.
+      find_or_initialize_by(user_id: user.id).
+      update(subscribed: false)
+  end
+
   def to_hook_data(user)
     {
       object_kind: self.class.name.underscore,
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index f36eda1531b..fd12615717b 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -25,8 +25,6 @@ class SentNotification < ActiveRecord::Base
 
   class << self
     def reply_key
-      return nil unless Gitlab::IncomingEmail.enabled?
-
       SecureRandom.hex(16)
     end
 
@@ -59,7 +57,7 @@ class SentNotification < ActiveRecord::Base
 
     def record_note(note, recipient_id, reply_key, params = {})
       params[:line_code] = note.line_code
-      
+
       record(note.noteable, recipient_id, reply_key, params)
     end
   end
@@ -75,4 +73,8 @@ class SentNotification < ActiveRecord::Base
       super
     end
   end
+
+  def to_param
+    self.reply_key
+  end
 end
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 3ca4c340406..da7de41abad 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -44,6 +44,10 @@
           %br
           -# Don't link the host is the line below, one link in the email is easier to quickly click than two.
           You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
-          If you'd like to receive fewer emails, you can adjust your notification settings.
+          If you'd like to receive fewer emails, you can
+          - if @sent_notification && !@sent_notification.for_commit?
+            = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification)
+            from this thread or
+          adjust your notification settings.
 
-          = email_action @target_url
\ No newline at end of file
+          = email_action @target_url